From 46185fa1dc85072f8d080ba6aff810295b5e0972 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Fri, 11 Sep 2026 16:27:30 -0600 Subject: [PATCH 001/175] docs(start): add TanStack Form mutation workflow --- docs/start/config.json | 4 + .../framework/react/guide/tanstack-form.md | 87 ++++++++++ examples/react/start-form/.gitignore | 5 + examples/react/start-form/README.md | 23 +++ examples/react/start-form/package.json | 30 ++++ .../react/start-form/playwright.config.ts | 13 ++ .../react/start-form/src/routeTree.gen.ts | 87 ++++++++++ examples/react/start-form/src/router.tsx | 5 + .../react/start-form/src/routes/__root.tsx | 28 ++++ .../react/start-form/src/routes/index.tsx | 103 ++++++++++++ .../react/start-form/src/routes/saved.tsx | 17 ++ examples/react/start-form/src/server/goal.ts | 38 +++++ examples/react/start-form/src/start.ts | 8 + examples/react/start-form/tests/form.spec.ts | 114 +++++++++++++ examples/react/start-form/tsconfig.json | 17 ++ examples/react/start-form/vite.config.ts | 7 + pnpm-lock.yaml | 157 ++++++++++++++++++ 17 files changed, 743 insertions(+) create mode 100644 docs/start/framework/react/guide/tanstack-form.md create mode 100644 examples/react/start-form/.gitignore create mode 100644 examples/react/start-form/README.md create mode 100644 examples/react/start-form/package.json create mode 100644 examples/react/start-form/playwright.config.ts create mode 100644 examples/react/start-form/src/routeTree.gen.ts create mode 100644 examples/react/start-form/src/router.tsx create mode 100644 examples/react/start-form/src/routes/__root.tsx create mode 100644 examples/react/start-form/src/routes/index.tsx create mode 100644 examples/react/start-form/src/routes/saved.tsx create mode 100644 examples/react/start-form/src/server/goal.ts create mode 100644 examples/react/start-form/src/start.ts create mode 100644 examples/react/start-form/tests/form.spec.ts create mode 100644 examples/react/start-form/tsconfig.json create mode 100644 examples/react/start-form/vite.config.ts diff --git a/docs/start/config.json b/docs/start/config.json index 57703aad89..a3a42e6ed8 100644 --- a/docs/start/config.json +++ b/docs/start/config.json @@ -94,6 +94,10 @@ "label": "Server Functions", "to": "framework/react/guide/server-functions" }, + { + "label": "Forms and Mutations", + "to": "framework/react/guide/tanstack-form" + }, { "label": "Streaming Data from Server Functions", "to": "framework/react/guide/streaming-data-from-server-functions" diff --git a/docs/start/framework/react/guide/tanstack-form.md b/docs/start/framework/react/guide/tanstack-form.md new file mode 100644 index 0000000000..40c9fe4f21 --- /dev/null +++ b/docs/start/framework/react/guide/tanstack-form.md @@ -0,0 +1,87 @@ +--- +id: tanstack-form +title: Forms and Mutations with TanStack Form +description: Use TanStack Form with Start server functions for field errors, pending state, optimistic updates, loader refresh, and navigation after saving. +--- + +TanStack Form owns field state and submission feedback. Start server functions validate and save the submitted values, and Router loaders read the saved result. The [working example](https://github.com/TanStack/router/tree/main/examples/react/start-form) connects those pieces in a small reading-goal form. + +The example saves a non-sensitive preference in a per-browser cookie. It needs no database or account, and does not treat that cookie as authentication. For application records, authorize the caller and write through your database before reporting success. + +## Choose a submission path + +This guide uses `@tanstack/react-form` with `useServerFn`. The form requires JavaScript and disables its controls until hydration. Its HTML method is POST so a native submission cannot put entered values in the URL. + +If you need a native form action that works without JavaScript, use the [Form Start integration](/form/latest/docs/framework/react/guides/ssr#using-tanstack-form-in-tanstack-start). That guide covers `@tanstack/react-form-start`, server validation state, and native submission. Do not mix its redirect-and-cookie validation flow into a client RPC handler without deciding how the response should be consumed. + +## Validate at the write endpoint + +`saveGoal` accepts a string, then validates its trimmed value before setting the cookie. The server rejects empty or overlong goals even when a caller bypasses the form. Known validation failures return a field message. Unexpected failures reach the client's failure handler. + +Client validation makes the form easier to use, but does not authorize or validate a network request. The example deliberately checks only an empty string on the client so whitespace-only input demonstrates server validation. + +The handler uses `private, no-store`, and the cookie is HTTP-only, SameSite Lax, and Secure on HTTPS. The example also enables Start's CSRF middleware for server-function requests. CSRF checks and account authorization solve separate problems; an application with accounts needs both. + +## Put server errors next to their field + +The form calls the server through `useServerFn(saveGoal)`. A validation result becomes a Form error: + +```tsx +const result = await save({ data: value }) +if (result.error) { + formApi.setErrorMap({ + onSubmit: { fields: { goal: result.error } }, + }) + return +} +``` + +The input reads `field.state.meta.errors` and connects the error container with `aria-describedby`. Its entered value remains available for correction. See Form's [validation guide](/form/latest/docs/framework/react/guides/validation) for validator types and field-error APIs. + +## Keep pending state through the refresh + +`onSubmit` is async. `form.Subscribe` observes `isSubmitting` and disables the whole fieldset until the save, loader refresh, and optional navigation finish. Both save buttons share that state, so another submission cannot race the first one. + +After a successful write, the example awaits `router.invalidate()`. This makes the loader read the newly saved cookie before the form reports **Saved.** A completed server request alone does not replace Router's loaded data. + +The final page also reads its value through a loader. Reloading that page checks persistence independently of the form's local state. + +## Make optimistic state temporary + +Before the request, the component places the candidate goal in `optimisticGoal`. The preview renders that value while the request is pending, with the saved loader value underneath it. + +On success, the loader refresh completes before the temporary value is cleared. On a validation or HTTP failure, `finally` clears the preview and shows the previously loaded goal. It preserves the input so the user can correct or retry it. + +A failed response does not always mean a write failed. The server might have committed a write before the connection broke. The failure message therefore asks the user to reload and check, rather than claiming that storage is unchanged. Important or non-idempotent mutations need their own retry and idempotency policy. + +## Navigate only after saving + +The two buttons use Form's submission metadata. **Save** keeps the user on the form. **Save and continue** calls: + +```tsx +void form.handleSubmit({ redirect: true }) +``` + +`onSubmit` reads `meta.redirect` and navigates to `/saved` only after the server reports success and Router refreshes. Validation failures stay on the form. This is client navigation after an RPC submission; a native POST flow should return an appropriate redirect response instead. + +See [Form submission handling](/form/latest/docs/framework/react/guides/submission-handling) for the metadata API and [Start server functions](./server-functions) for request and response behavior. + +## Run the example and its checks + +After the Router repository's dependency and framework build setup: + +```sh +cd examples/react/start-form +pnpm dev +``` + +Open http://localhost:3150. Stop that server before running Playwright: + +```sh +pnpm exec playwright install chromium +pnpm test:e2e +pnpm build +FORM_PRODUCTION=1 pnpm test:e2e +``` + +The tests cover server field errors, a pending optimistic preview, persisted loader data, a second browser's separate preference, redirect after saving, and cross-site rejection. A test intercepts a submission with an HTTP 500 response to check rollback, preserved input, and retry. That failure fixture tests client behavior; it does not claim to exercise a database outage. Both runs check for uncaught browser errors. diff --git a/examples/react/start-form/.gitignore b/examples/react/start-form/.gitignore new file mode 100644 index 0000000000..4bbad8098f --- /dev/null +++ b/examples/react/start-form/.gitignore @@ -0,0 +1,5 @@ +node_modules +.output +.tanstack +test-results +playwright-report diff --git a/examples/react/start-form/README.md b/examples/react/start-form/README.md new file mode 100644 index 0000000000..4754a56fd5 --- /dev/null +++ b/examples/react/start-form/README.md @@ -0,0 +1,23 @@ +# TanStack Form with Start + +A reading-goal form with server validation, field errors, pending controls, an optimistic preview, loader refresh, and navigation after saving. The [Start form guide](https://tanstack.com/start/latest/docs/framework/react/guide/tanstack-form) explains the workflow. + +Follow the Router repository's dependency and framework build setup, then run: + +```sh +cd examples/react/start-form +pnpm dev +``` + +Open http://localhost:3150. The example stores a non-sensitive preference in a per-browser cookie. No database or account is required. It uses client RPC submission and requires JavaScript. The Form docs separately cover native form actions. + +After stopping the dev server: + +```sh +pnpm exec playwright install chromium +pnpm test:e2e +pnpm build +FORM_PRODUCTION=1 pnpm test:e2e +``` + +Tests check server validation, pending preview, persistence, redirect, separate browser state, and CSRF. An intercepted HTTP 500 response verifies client rollback and retry. A failed response can leave a real write's result uncertain, so the UI asks the user to reload and check. diff --git a/examples/react/start-form/package.json b/examples/react/start-form/package.json new file mode 100644 index 0000000000..4bdd281eae --- /dev/null +++ b/examples/react/start-form/package.json @@ -0,0 +1,30 @@ +{ + "name": "tanstack-start-example-form", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "vite --port 3150", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", + "test:e2e": "playwright test" + }, + "dependencies": { + "@tanstack/react-router": "workspace:^", + "@tanstack/react-start": "workspace:^", + "@tanstack/react-form": "1.33.5", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "zod": "^4.4.3" + }, + "devDependencies": { + "@types/node": "^22.5.4", + "@types/react": "^19.0.8", + "@types/react-dom": "^19.0.3", + "@vitejs/plugin-react": "^6.0.1", + "nitro": "^3.0.260311-beta", + "typescript": "npm:@typescript/typescript6@^6.0.2", + "vite": "^8.0.14", + "@playwright/test": "^1.61.0" + } +} diff --git a/examples/react/start-form/playwright.config.ts b/examples/react/start-form/playwright.config.ts new file mode 100644 index 0000000000..4b212c946b --- /dev/null +++ b/examples/react/start-form/playwright.config.ts @@ -0,0 +1,13 @@ +import { defineConfig } from '@playwright/test' +export default defineConfig({ + testDir: './tests', + use: { browserName: 'chromium', baseURL: 'http://localhost:3150' }, + webServer: { + command: + process.env.FORM_PRODUCTION === '1' + ? 'PORT=3150 node .output/server/index.mjs' + : 'pnpm dev', + url: 'http://localhost:3150', + timeout: 120_000, + }, +}) diff --git a/examples/react/start-form/src/routeTree.gen.ts b/examples/react/start-form/src/routeTree.gen.ts new file mode 100644 index 0000000000..bbe280cda9 --- /dev/null +++ b/examples/react/start-form/src/routeTree.gen.ts @@ -0,0 +1,87 @@ +/* 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 IndexRouteImport } from './routes/index' +import { Route as SavedRouteImport } from './routes/saved' + +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) +const SavedRoute = SavedRouteImport.update({ + id: '/saved', + path: '/saved', + getParentRoute: () => rootRouteImport, +} as any) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/saved': typeof SavedRoute +} +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/saved': typeof SavedRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/': typeof IndexRoute + '/saved': typeof SavedRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/' | '/saved' + fileRoutesByTo: FileRoutesByTo + to: '/' | '/saved' + id: '__root__' | '/' | '/saved' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + SavedRoute: typeof SavedRoute +} + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + '/saved': { + id: '/saved' + path: '/saved' + fullPath: '/saved' + preLoaderRoute: typeof SavedRouteImport + parentRoute: typeof rootRouteImport + } + } +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + SavedRoute: SavedRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +import type { getRouter } from './router.tsx' +import type { startInstance } from './start.ts' +declare module '@tanstack/react-start' { + interface Register { + ssr: true + router: Awaited> + config: Awaited> + } +} diff --git a/examples/react/start-form/src/router.tsx b/examples/react/start-form/src/router.tsx new file mode 100644 index 0000000000..bb899b1fdf --- /dev/null +++ b/examples/react/start-form/src/router.tsx @@ -0,0 +1,5 @@ +import { createRouter } from '@tanstack/react-router' +import { routeTree } from './routeTree.gen' +export function getRouter() { + return createRouter({ routeTree }) +} diff --git a/examples/react/start-form/src/routes/__root.tsx b/examples/react/start-form/src/routes/__root.tsx new file mode 100644 index 0000000000..08aab343b4 --- /dev/null +++ b/examples/react/start-form/src/routes/__root.tsx @@ -0,0 +1,28 @@ +import { HeadContent, Scripts, createRootRoute } from '@tanstack/react-router' +import type { ReactNode } from 'react' +export const Route = createRootRoute({ + head: () => ({ + meta: [ + { charSet: 'utf-8' }, + { name: 'viewport', content: 'width=device-width, initial-scale=1' }, + { title: 'Reading goal | TanStack Form' }, + ], + }), + shellComponent: ({ children }: { children: ReactNode }) => ( + + + + + + {children} + + + + ), + notFoundComponent: () => ( +
+

Page not found

+ Home +
+ ), +}) diff --git a/examples/react/start-form/src/routes/index.tsx b/examples/react/start-form/src/routes/index.tsx new file mode 100644 index 0000000000..a4677942a4 --- /dev/null +++ b/examples/react/start-form/src/routes/index.tsx @@ -0,0 +1,103 @@ +import { createFileRoute, useHydrated, useRouter } from '@tanstack/react-router' +import { useForm } from '@tanstack/react-form' +import { useServerFn } from '@tanstack/react-start' +import { useState } from 'react' +import { readGoal, saveGoal } from '../server/goal' +export const Route = createFileRoute('/')({ + loader: () => readGoal(), + headers: () => ({ 'Cache-Control': 'private, no-store' }), + component: Home, +}) +function Home() { + const goal = Route.useLoaderData() + const router = useRouter() + const hydrated = useHydrated() + const save = useServerFn(saveGoal) + const [optimisticGoal, setOptimisticGoal] = useState(null) + const [message, setMessage] = useState('') + const form = useForm({ + defaultValues: { goal }, + onSubmitMeta: { redirect: false }, + validators: { + onSubmit: ({ value }) => + value.goal.length === 0 + ? { fields: { goal: 'Enter a reading goal.' } } + : undefined, + }, + onSubmit: async ({ value, formApi, meta }) => { + setMessage('') + setOptimisticGoal(value.goal.trim()) + try { + const result = await save({ data: value }) + if (result.error) { + formApi.setErrorMap({ onSubmit: { fields: { goal: result.error } } }) + return + } + await router.invalidate() + setMessage('Saved.') + if (meta.redirect) { + await router.navigate({ to: '/saved' }) + } + } catch { + setMessage( + 'Could not confirm the save. Reload to check your saved goal.', + ) + } finally { + setOptimisticGoal(null) + } + }, + }) + return ( +
+

Reading goal

+

Current goal: {optimisticGoal ?? goal}

+
{ + event.preventDefault() + void form.handleSubmit() + }} + > + state.isSubmitting}> + {(isSubmitting) => ( +
+ + {(field) => ( +
+ + + field.handleChange(event.target.value) + } + onBlur={field.handleBlur} + aria-describedby="goal-error" + aria-invalid={field.state.meta.errors.length > 0} + /> + +
+ )} +
+ + +
+ )} +
+
+

{message}

+
+ ) +} diff --git a/examples/react/start-form/src/routes/saved.tsx b/examples/react/start-form/src/routes/saved.tsx new file mode 100644 index 0000000000..400298dbe7 --- /dev/null +++ b/examples/react/start-form/src/routes/saved.tsx @@ -0,0 +1,17 @@ +import { createFileRoute, Link } from '@tanstack/react-router' +import { readGoal } from '../server/goal' +export const Route = createFileRoute('/saved')({ + loader: () => readGoal(), + headers: () => ({ 'Cache-Control': 'private, no-store' }), + component: Saved, +}) +function Saved() { + const goal = Route.useLoaderData() + return ( +
+

Goal saved

+

{goal}

+ Edit your goal +
+ ) +} diff --git a/examples/react/start-form/src/server/goal.ts b/examples/react/start-form/src/server/goal.ts new file mode 100644 index 0000000000..fb98e96db3 --- /dev/null +++ b/examples/react/start-form/src/server/goal.ts @@ -0,0 +1,38 @@ +import { createServerFn } from '@tanstack/react-start' +import { + getCookie, + getRequestUrl, + setCookie, + setResponseHeader, +} from '@tanstack/react-start/server' +import { z } from 'zod' +const schema = z.object({ + goal: z + .string() + .trim() + .min(1, 'Enter a reading goal.') + .max(80, 'Use 80 characters or fewer.'), +}) +export const readGoal = createServerFn({ method: 'GET' }).handler(() => { + setResponseHeader('Cache-Control', 'private, no-store') + return getCookie('reading_goal') ?? 'Read one chapter' +}) +export const saveGoal = createServerFn({ method: 'POST' }) + .validator(z.object({ goal: z.string() })) + .handler(({ data }) => { + setResponseHeader('Cache-Control', 'private, no-store') + const result = schema.safeParse(data) + if (!result.success) { + return { + error: result.error.issues[0]?.message ?? 'Check your reading goal.', + } + } + setCookie('reading_goal', result.data.goal, { + httpOnly: true, + sameSite: 'lax', + secure: getRequestUrl().protocol === 'https:', + path: '/', + maxAge: 60 * 60 * 24 * 30, + }) + return { error: '' } + }) diff --git a/examples/react/start-form/src/start.ts b/examples/react/start-form/src/start.ts new file mode 100644 index 0000000000..4c97030fc8 --- /dev/null +++ b/examples/react/start-form/src/start.ts @@ -0,0 +1,8 @@ +import { createCsrfMiddleware, createStart } from '@tanstack/react-start' +export const startInstance = createStart(() => ({ + requestMiddleware: [ + createCsrfMiddleware({ + filter: ({ handlerType }) => handlerType === 'serverFn', + }), + ], +})) diff --git a/examples/react/start-form/tests/form.spec.ts b/examples/react/start-form/tests/form.spec.ts new file mode 100644 index 0000000000..8394602a59 --- /dev/null +++ b/examples/react/start-form/tests/form.spec.ts @@ -0,0 +1,114 @@ +import { expect, test } from '@playwright/test' +let browserErrors: Array = [] +test.beforeEach(({ page }) => { + browserErrors = [] + page.on('pageerror', (error) => browserErrors.push(error.message)) +}) +test.afterEach(() => { + expect(browserErrors).toEqual([]) +}) + +test('server field errors, pending preview, persistence, redirect and CSRF', async ({ + page, + request, +}) => { + await page.goto('/') + await page.getByLabel('Your goal').fill(' ') + await page.getByRole('button', { name: 'Save', exact: true }).click() + await expect(page.getByRole('alert')).toHaveText('Enter a reading goal.') + await expect( + page.getByText('Current goal: Read one chapter', { exact: true }), + ).toBeVisible() + await page.getByLabel('Your goal').fill('x'.repeat(81)) + await page.getByRole('button', { name: 'Save', exact: true }).click() + await expect(page.getByRole('alert')).toHaveText( + 'Use 80 characters or fewer.', + ) + await page.getByLabel('Your goal').fill('Read two chapters') + let release = () => {} + const gate = new Promise((resolve) => { + release = resolve + }) + await page.route('**/_serverFn/**', async (route) => { + if (route.request().method() === 'POST') { + await gate + } + await route.continue() + }) + const submitted = page.waitForRequest( + (r) => + r.method() === 'POST' && + new URL(r.url()).pathname.startsWith('/_serverFn/'), + ) + await page.getByRole('button', { name: 'Save', exact: true }).click() + const write = await submitted + try { + await expect(page.getByRole('button', { name: 'Saving...' })).toBeDisabled() + await expect( + page.getByRole('button', { name: 'Save and continue' }), + ).toBeDisabled() + await expect( + page.getByText('Current goal: Read two chapters', { exact: true }), + ).toBeVisible() + } finally { + release() + } + await expect(page.getByRole('status')).toHaveText('Saved.') + await page.unroute('**/_serverFn/**') + await page.reload() + await expect(page.getByLabel('Your goal')).toHaveValue('Read two chapters') + expect(await (await request.get('/')).text()).toContain('Read one chapter') + const headers = await write.allHeaders() + delete headers.cookie + delete headers['content-length'] + const crossSite = await page.request.post(write.url(), { + headers: { + ...headers, + origin: 'https://untrusted.example', + 'sec-fetch-site': 'cross-site', + }, + data: write.postData() ?? '', + }) + expect(crossSite.status()).toBe(403) + await page.getByLabel('Your goal').fill('Finish a book') + await page.getByRole('button', { name: 'Save and continue' }).click() + await expect(page).toHaveURL(/\/saved$/) + await expect(page.getByText('Finish a book', { exact: true })).toBeVisible() + const response = await page.reload() + expect(response?.headers()['cache-control']).toContain('no-store') + await expect(page.getByText('Finish a book', { exact: true })).toBeVisible() +}) + +test('HTTP failure rolls back the preview, preserves input, and permits retry', async ({ + page, +}) => { + await page.goto('/') + await page.getByLabel('Your goal').fill('A new goal') + await page.route('**/_serverFn/**', async (route) => { + if (route.request().method() === 'POST') { + await route.fulfill({ + status: 500, + contentType: 'application/json', + body: '{"error":"test server failure"}', + }) + } else { + await route.continue() + } + }) + await page.getByRole('button', { name: 'Save', exact: true }).click() + await expect(page.getByRole('status')).toHaveText( + 'Could not confirm the save. Reload to check your saved goal.', + ) + await expect( + page.getByText('Current goal: Read one chapter', { exact: true }), + ).toBeVisible() + await expect(page.getByLabel('Your goal')).toHaveValue('A new goal') + await expect( + page.getByRole('button', { name: 'Save', exact: true }), + ).toBeEnabled() + await page.unroute('**/_serverFn/**') + await page.getByRole('button', { name: 'Save', exact: true }).click() + await expect(page.getByRole('status')).toHaveText('Saved.') + await page.reload() + await expect(page.getByLabel('Your goal')).toHaveValue('A new goal') +}) diff --git a/examples/react/start-form/tsconfig.json b/examples/react/start-form/tsconfig.json new file mode 100644 index 0000000000..1d0362ff0c --- /dev/null +++ b/examples/react/start-form/tsconfig.json @@ -0,0 +1,17 @@ +{ + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "react-jsx", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2024"], + "isolatedModules": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "target": "ES2024", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "noEmit": true + } +} diff --git a/examples/react/start-form/vite.config.ts b/examples/react/start-form/vite.config.ts new file mode 100644 index 0000000000..195c5224e2 --- /dev/null +++ b/examples/react/start-form/vite.config.ts @@ -0,0 +1,7 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import viteReact from '@vitejs/plugin-react' +import { nitro } from 'nitro/vite' +export default defineConfig({ + plugins: [tanstackStart(), viteReact(), nitro()], +}) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fe6d5f7342..cb0ce3464a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15579,6 +15579,52 @@ importers: specifier: ^3.24.2 version: 3.25.57 + examples/react/start-form: + dependencies: + '@tanstack/react-form': + specifier: 1.33.5 + version: 1.33.5(@tanstack/react-start@packages+react-start)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + '@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) + zod: + specifier: ^4.4.3 + version: 4.5.4 + devDependencies: + '@playwright/test': + specifier: ^1.61.0 + version: 1.61.1 + '@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) + '@vitejs/plugin-react': + specifier: ^6.0.1 + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + nitro: + specifier: ^3.0.260311-beta + version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + typescript: + specifier: npm:@typescript/typescript6@^6.0.2 + version: '@typescript/typescript6@6.0.2' + vite: + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + packages: '@adobe/css-tools@4.4.1': @@ -29453,6 +29499,27 @@ packages: use-sync-external-store: optional: true + '@tanstack/react-form@1.33.5': + resolution: {integrity: sha512-LlRB28qJwO/QCGaHvWnbdh4haBgTFiZVmzA2uzxSBS3YA7/IqrQ6HOBK70CkFQ+DbflZ7NawsmSln13h5iIdTA==} + peerDependencies: + '@tanstack/react-start': '*' + react: ^19.2.3 + peerDependenciesMeta: + '@tanstack/react-start': + optional: true + + '@tanstack/form-core@1.33.5': + resolution: {integrity: sha512-3dfx9MBP0aq5sXKteikG629X9oviptrQj0IFRk9YGcb+lB7Kv5x8S17oOSk1wUWgjQZ4xVJEMbKwOAODymocgA==} + + '@tanstack/devtools-event-client@0.4.4': + resolution: {integrity: sha512-6T5Yop/793YI+H+5J8Hsyj4kCih9sl4t3ElLgKioW5hk3ocn+ZdSJ94tT7vL7uabxSugWYBZlOTMPzEw2puvQw==} + engines: {node: '>=18'} + hasBin: true + + '@tanstack/pacer-lite@0.1.1': + resolution: {integrity: sha512-y/xtNPNt/YeyoVxE/JCx+T7yjEzpezmbb+toK8DDD1P4m7Kzs5YR956+7OKexG3f8aXgC3rLZl7b1V+yNUSy5w==} + engines: {node: '>=18'} + snapshots: '@adobe/css-tools@4.4.1': {} @@ -45433,3 +45500,93 @@ snapshots: immer: 10.1.1 react: 19.2.3 use-sync-external-store: 1.6.0(react@19.2.3) + '@tanstack/react-form@1.33.5(@tanstack/react-start@packages+react-start)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + dependencies: + '@tanstack/form-core': 1.33.5 + '@tanstack/react-store': 0.11.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + react: 19.2.3 + optionalDependencies: + '@tanstack/react-start': link:packages/react-start + transitivePeerDependencies: + - react-dom + + '@tanstack/form-core@1.33.5': + dependencies: + '@tanstack/devtools-event-client': 0.4.4 + '@tanstack/pacer-lite': 0.1.1 + '@tanstack/store': 0.11.1 + + '@tanstack/devtools-event-client@0.4.4': {} + + '@tanstack/pacer-lite@0.1.1': {} + + '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + dependencies: + '@rolldown/pluginutils': 1.0.0-rc.7 + vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + optionalDependencies: + '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + babel-plugin-react-compiler: 1.0.0 + + '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + dependencies: + '@babel/core': 7.29.7(supports-color@10.2.2) + picomatch: 4.0.7 + rolldown: 1.0.2 + optionalDependencies: + vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + optional: true + + nitro@3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + consola: 3.4.2 + crossws: 0.4.4(srvx@0.11.22) + db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) + env-runner: 0.1.6(miniflare@4.20260317.0) + h3: 2.0.1-rc.16(crossws@0.4.4(srvx@0.11.22)) + hookable: 6.1.0 + nf3: 0.3.11 + ocache: 0.1.2 + ofetch: 2.0.0-alpha.3 + ohash: 2.0.11 + rolldown: 1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) + srvx: 0.11.22 + unenv: 2.0.0-rc.24 + unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) + optionalDependencies: + dotenv: 17.4.2 + giget: 3.3.1 + jiti: 2.7.0 + rollup: 4.63.1 + vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + transitivePeerDependencies: + - '@azure/app-configuration' + - '@azure/cosmos' + - '@azure/data-tables' + - '@azure/identity' + - '@azure/keyvault-secrets' + - '@azure/storage-blob' + - '@capacitor/preferences' + - '@deno/kv' + - '@electric-sql/pglite' + - '@emnapi/core' + - '@emnapi/runtime' + - '@libsql/client' + - '@netlify/blobs' + - '@planetscale/database' + - '@upstash/redis' + - '@vercel/blob' + - '@vercel/functions' + - '@vercel/kv' + - aws4fetch + - better-sqlite3 + - chokidar + - drizzle-orm + - idb-keyval + - ioredis + - lru-cache + - miniflare + - mongodb + - mysql2 + - sqlite3 + - uploadthing From 6586ed34a27538cd64db8084aa5ad105e52120ee Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Fri, 11 Sep 2026 17:42:37 -0600 Subject: [PATCH 002/175] test(start): catch cold Form hydration hook errors --- examples/react/start-form/playwright.config.ts | 2 +- examples/react/start-form/tests/form.spec.ts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/examples/react/start-form/playwright.config.ts b/examples/react/start-form/playwright.config.ts index 4b212c946b..4524e6de26 100644 --- a/examples/react/start-form/playwright.config.ts +++ b/examples/react/start-form/playwright.config.ts @@ -6,7 +6,7 @@ export default defineConfig({ command: process.env.FORM_PRODUCTION === '1' ? 'PORT=3150 node .output/server/index.mjs' - : 'pnpm dev', + : 'pnpm dev --force', url: 'http://localhost:3150', timeout: 120_000, }, diff --git a/examples/react/start-form/tests/form.spec.ts b/examples/react/start-form/tests/form.spec.ts index 8394602a59..264a1f0a7b 100644 --- a/examples/react/start-form/tests/form.spec.ts +++ b/examples/react/start-form/tests/form.spec.ts @@ -3,6 +3,14 @@ let browserErrors: Array = [] test.beforeEach(({ page }) => { browserErrors = [] page.on('pageerror', (error) => browserErrors.push(error.message)) + page.on('console', (message) => { + if ( + message.type() === 'error' && + message.text().includes('Invalid hook call') + ) { + browserErrors.push(message.text()) + } + }) }) test.afterEach(() => { expect(browserErrors).toEqual([]) From 8fff7fa1f2e6f061916b0bf5e0ec486b2e732f94 Mon Sep 17 00:00:00 2001 From: Flo Date: Sat, 12 Sep 2026 21:57:33 +0200 Subject: [PATCH 003/175] fix(history): normalize memory history hrefs (#8359) --- .changeset/happy-turkeys-write.md | 5 ++++ packages/history/src/index.ts | 2 +- .../history/tests/createMemoryHistory.test.ts | 29 +++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 .changeset/happy-turkeys-write.md diff --git a/.changeset/happy-turkeys-write.md b/.changeset/happy-turkeys-write.md new file mode 100644 index 0000000000..b40a832c1b --- /dev/null +++ b/.changeset/happy-turkeys-write.md @@ -0,0 +1,5 @@ +--- +'@tanstack/history': patch +--- + +Normalize memory history hrefs consistently with browser and server history, including protocol-relative paths and control characters. diff --git a/packages/history/src/index.ts b/packages/history/src/index.ts index 43a808e452..b8fd3f016c 100644 --- a/packages/history/src/index.ts +++ b/packages/history/src/index.ts @@ -684,7 +684,7 @@ export function createMemoryHistory( go: (n) => { index = Math.min(Math.max(index + n, 0), entries.length - 1) }, - createHref: (path) => path, + createHref: normalizeHref, getBlockers: _getBlockers, setBlockers: _setBlockers, }) diff --git a/packages/history/tests/createMemoryHistory.test.ts b/packages/history/tests/createMemoryHistory.test.ts index c3162ab7de..c0f565115e 100644 --- a/packages/history/tests/createMemoryHistory.test.ts +++ b/packages/history/tests/createMemoryHistory.test.ts @@ -2,6 +2,35 @@ import { describe, expect, test, vi } from 'vitest' import { createMemoryHistory } from '../src' describe('createMemoryHistory', () => { + test.each([ + ['//example.com/path', '/example.com/path'], + ['/\\example.com/path', '/example.com/path'], + ['\\/example.com/path', '/example.com/path'], + ['\\\\example.com/path', '/example.com/path'], + [' \t/\r\\example.com/path', '/example.com/path'], + ['/\t/example.com/path', '/example.com/path'], + ['/a\tb?q=a\nb#section\r', '/ab?q=ab#section'], + ['/a\u0000b?q=a\u0001b#section\u007f', '/a%00b?q=a%01b#section%7F'], + ['/', '/'], + ['/posts/123?sort=new#comments', '/posts/123?sort=new#comments'], + ['/caf%C3%A9?q=%2F#//section', '/caf%C3%A9?q=%2F#//section'], + ['/a//b?q=//value#\\/section', '/a//b?q=//value#\\/section'], + ['/%2Fexample.com/path', '/%2Fexample.com/path'], + ])('creates href %j consistent with navigation', (href, expected) => { + const history = createMemoryHistory() + const location = history.location + const createdHref = history.createHref(href) + + expect(createdHref).toBe(expected) + expect(history.location).toBe(location) + expect(new URL(createdHref, 'https://app.example').origin).toBe( + 'https://app.example', + ) + + history.push(href) + expect(history.location.href).toBe(createdHref) + }) + test('exposes the current blocker registry after registration and removal', () => { const history = createMemoryHistory() const first = { blockerFn: vi.fn(() => true) } From ae68535929043607d4ee9438f8ae401f3a064862 Mon Sep 17 00:00:00 2001 From: Sarah Gerrard Date: Sat, 12 Sep 2026 13:19:37 -0700 Subject: [PATCH 004/175] perf(history): avoid generating unused location keys (#8349) --- .changeset/lazy-locations-listen.md | 5 +++++ packages/history/src/index.ts | 11 +++++------ packages/history/tests/parseHref.test.ts | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 .changeset/lazy-locations-listen.md diff --git a/.changeset/lazy-locations-listen.md b/.changeset/lazy-locations-listen.md new file mode 100644 index 0000000000..d048bbebe4 --- /dev/null +++ b/.changeset/lazy-locations-listen.md @@ -0,0 +1,5 @@ +--- +'@tanstack/history': patch +--- + +Avoid generating unused history keys for locations with existing state. diff --git a/packages/history/src/index.ts b/packages/history/src/index.ts index b8fd3f016c..1c9bd5ed18 100644 --- a/packages/history/src/index.ts +++ b/packages/history/src/index.ts @@ -281,9 +281,6 @@ export function createHistory(opts: { } function assignKeyAndIndex(index: number, state: HistoryState | undefined) { - if (!state) { - state = {} - } const key = createRandomKey() return { ...state, @@ -749,8 +746,10 @@ export function parseHref( const sanitizedHref = normalizeHref(href) const hashIndex = sanitizedHref.indexOf('#') const searchIndex = sanitizedHref.indexOf('?') - - const addedKey = createRandomKey() + if (!state) { + const key = createRandomKey() + state = { [stateIndexKey]: 0, key, __TSR_key: key } + } return { href: sanitizedHref, @@ -772,7 +771,7 @@ export function parseHref( hashIndex === -1 ? undefined : hashIndex, ) : '', - state: state || { [stateIndexKey]: 0, key: addedKey, __TSR_key: addedKey }, + state, } } diff --git a/packages/history/tests/parseHref.test.ts b/packages/history/tests/parseHref.test.ts index e1a95fafa4..10df49d330 100644 --- a/packages/history/tests/parseHref.test.ts +++ b/packages/history/tests/parseHref.test.ts @@ -21,6 +21,30 @@ describe('parseHref', () => { expect(parsed.hash).toEqual('#qux') }) + test.each([ + { __TSR_index: 2 }, + { __TSR_index: 2, key: 'legacy-key', __TSR_key: 'current-key' }, + ])('preserves supplied state %j', (state) => { + Object.freeze(state) + expect(parseHref('/foo', state).state).toBe(state) + }) + + test('creates independent initial states with matching history keys', () => { + const first = parseHref('/foo', undefined) + const second = parseHref('/bar', undefined) + + for (const location of [first, second]) { + expect(location.state).toEqual({ + __TSR_index: 0, + key: expect.any(String), + __TSR_key: location.state.key, + }) + } + + first.state.__TSR_index = 1 + expect(second.state.__TSR_index).toBe(0) + }) + describe('open redirect prevention', () => { test('strips CR characters to prevent open redirect', () => { // If \r (CR) is in the href, it should be stripped From 7e349c3071ef7a346698d320fc0989998ad55734 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:01 +0200 Subject: [PATCH 005/175] perf(router): share Link pathname interpolation (#8252) * perf(router-core): share pathname interpolation across Links Reuse the existing segment parser to prepare parameter-name lists. Share pure interpolated path strings through bounded router-scoped SIEVE caches (32 templates, 128 paths per template). Avoid compound-key allocation for single-parameter templates and reuse the current template plan. Parameter callbacks still run before interpolation. Search, hash, state, masks, rewrites, and active-state handling remain independent. Decoder changes clear the caches. No per-Link result cache, descriptor checks, new route matcher, or public API change. React Link rendering benchmark, measured separately for this commit and its parent using exact production builds: - Workload: benchmarks/client-nav/scenarios/links/react/speed.bench.ts (200 persistent Links, eight navigations per measured batch). - Apple M4, Node 24.20.0, Vitest 4.1.4, NODE_ENV=production. - 8 fresh parent processes and 4 fresh processes for this commit, each with warmupIterations=50 and time=10000 ms; counterbalanced run order. - Parent mean times (ms): 3.8767, 3.8900, 4.5507, 4.0116, 3.8297, 3.8582, 3.8879, 4.0157. - This commit mean times (ms): 2.8824, 2.8625, 2.9597, 2.9673. - Median run means: 3.8889 -> 2.9211 ms. - Incremental effect: 24.89% less time; throughput change +33.13%. - Largest within-run RME for this revision: 1.15%. Incremental minimal/full React gzip impact: +251/+265 bytes. Benchmark sources and commit implementation trees are unchanged. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * test(router-core): cover shared interpolation cache workloads Cover missing optional parameters that become present, canonical splat keys, and the public usedParams shape. Add focused hit, eviction, and mixed-input benchmarks before simplifying cache metadata collection. Current cache baseline on Node 24.20.0: repeated single-param batches average 0.0050 ms, repeated multi-param batches 0.0305 ms, result eviction 0.1568 ms, template eviction 0.0809 ms, and mixed inputs 0.0370 ms. Miss-heavy runs show outliers and require narrower comparisons. Production cache remains unchanged. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(router-core): reuse interpolation pass for cache keys Collect cache parameter names during the existing interpolation pass instead of parsing each new template twice. Reuse the first interpolated result, compact template plans, and share required/optional/splat path assembly. Preserve public interpolation metadata, missing-param behavior, decoder invalidation, and bounded router-local caches. Fresh existing React Link benchmark against parent cd4010d9cb, Apple M4 / Node 24.20.0 / Vitest 4.1.4 / production: - 200 persistent Links and eight navigations per batch. Four separate processes per version, counterbalanced order, warmupIterations=50, time=10000 ms. - Parent means: 3.0527, 2.8610, 2.8329, 2.8729 ms. - This commit means: 3.1291, 2.8745, 2.8849, 2.8552 ms. - Median run means: 2.8670 -> 2.8797 ms (+0.44% time, effectively flat; no incremental Link speedup claimed). Within-run RME below 1%. - Fresh original-baseline comparisons: 4.2143 -> 2.9825 ms (-29.23%) and 4.0561 -> 2.9909 ms (-26.26%). The complete series still exceeds the original 20% target. Focused interpolation benchmarks, same files/inputs before and after: - Client uncached single-param batches: 90.51 -> 79.91 us (-11.7%). - Client cached template eviction: 72.33 -> 49.74 us (-31.2%; 4-6% RME, p75 also improves). - Client uncached mixed batches: 71.10 -> 52.41 us (-26.3%). - Server uncached mixed batches: 61.42 -> 38.11 us (-38.0%). Bundle size: React minimal/full -414 raw bytes each and -55/-68 gzip bytes. All 18 Router/Start fixtures shrink by 48-75 gzip bytes. Independent hunk attribution confirmed reductions for every retained group. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(router): meet the original Link bundle budgets Move the bounded pathname cache onto RouterCore and reuse one interpolation traversal for pathname generation, cache keys, and optional public metadata. Remove the factory and per-parameter metadata callbacks, preserve decoder invalidation and development server/client overrides, and simplify React Link active-state and state-prop assembly. Public APIs and routing features remain unchanged. Official gzip measurements against parent 37bd31e4e2: - React minimal: 86000 -> 85772 bytes (-228), equal to origin/main. - React full: 89601 -> 89356 bytes (-245), 6 below origin/main. - All 18 Router/Start fixtures shrink by 130-245 gzip bytes. Link remains included; fixtures and the existing Link workload are unchanged. - Independent Link-only changes save 78/86 bytes; core-only changes save 174/169. Combined gzip effects are not additive. Fresh existing production Link benchmark, Apple M4 / Node 24.20.0 / Vitest 4.1.4: 200 persistent Links, eight navigations per batch, 50 warm-up iterations and 10-second measurements, with separate processes in counterbalanced order. - Parent means: 2.903316, 2.908833, 2.945163, 2.955386 ms. - This commit means: 2.941129, 2.941699, 2.920172, 2.970072 ms. - Median run means: 2.926998 -> 2.941414 ms (+0.49% time, near process-to-process noise; no incremental Link speedup claimed). Maximum within-run RME: 0.84%. - Fresh original-baseline comparison: 4.283454 -> 3.016571 ms (-29.58% time). This is the whole-series improvement, not the incremental effect of this commit. Identical focused before/after benchmarks show public helper regressions eliminated, server public families 4.68-12.85% faster, and cached mixed/missing cases 6.50-10.43% faster. Removing the redundant last-template shortcut makes isolated single-template cache hits slower (5.93 -> 7.21 us client per 200 calls; 5.99 -> 6.83 us server). The real Link workload remains effectively flat for this size-reduction step. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(router-core): cache omitted optional path params --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/loud-times-tie.md | 5 + .changeset/mean-mice-design.md | 5 + .changeset/spotty-bats-jog.md | 6 + .../tests/link-destination.test.tsx | 290 ++++++++++++++++++ packages/router-core/src/path.ts | 204 ++++++------ packages/router-core/src/router.ts | 114 ++++++- .../router-core/tests/build-location.test.ts | 69 +++++ .../tests/path-interpolation.bench.ts | 164 ++++++++++ packages/router-core/tests/path.test.ts | 267 ++++++++++++++++ packages/router-core/tests/routerTestUtils.ts | 28 ++ 10 files changed, 1032 insertions(+), 120 deletions(-) create mode 100644 .changeset/loud-times-tie.md create mode 100644 .changeset/mean-mice-design.md create mode 100644 .changeset/spotty-bats-jog.md create mode 100644 packages/react-router/tests/link-destination.test.tsx create mode 100644 packages/router-core/tests/path-interpolation.bench.ts diff --git a/.changeset/loud-times-tie.md b/.changeset/loud-times-tie.md new file mode 100644 index 0000000000..71d1ccf62c --- /dev/null +++ b/.changeset/loud-times-tie.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Collect shared pathname-cache keys during interpolation instead of parsing templates twice, and share dynamic-segment handling to reduce bundle size. diff --git a/.changeset/mean-mice-design.md b/.changeset/mean-mice-design.md new file mode 100644 index 0000000000..2225bdac9c --- /dev/null +++ b/.changeset/mean-mice-design.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Reuse pathname interpolation across Links with bounded router-scoped caches. Keep parameter callbacks and navigation state independent of the cache. diff --git a/.changeset/spotty-bats-jog.md b/.changeset/spotty-bats-jog.md new file mode 100644 index 0000000000..da338b6d22 --- /dev/null +++ b/.changeset/spotty-bats-jog.md @@ -0,0 +1,6 @@ +--- +'@tanstack/router-core': patch +'@tanstack/react-router': patch +--- + +Reduce the bundle cost of shared Link pathname interpolation while preserving its rendering performance. Reuse one interpolation pass for pathname and optional metadata, keep the bounded cache on the router, and simplify React Link active-state and prop merging. diff --git a/packages/react-router/tests/link-destination.test.tsx b/packages/react-router/tests/link-destination.test.tsx new file mode 100644 index 0000000000..b81d02a706 --- /dev/null +++ b/packages/react-router/tests/link-destination.test.tsx @@ -0,0 +1,290 @@ +import React from 'react' +import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' +import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' +import { + Link, + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, + defaultStringifySearch, + retainSearchParams, +} from '../src' + +describe('Link destination updates', () => { + beforeEach(() => vi.stubEnv('NODE_ENV', 'production')) + afterEach(() => { + cleanup() + vi.unstubAllEnvs() + }) + + function setupFixedLink( + params = { id: 'fixed' }, + stringify?: (params: Record) => { id: string }, + ) { + const rootRoute = createRootRoute({ + component: () => ( + <> + + Target + + + + ), + }) + const itemsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/items/$source', + }) + const targetRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/target/$id', + params: { stringify }, + }) + const routeTree = rootRoute.addChildren([itemsRoute, targetRoute]) + const router = createRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/items/one'] }), + }) + return { router, rootRoute } + } + + test('preserves a fixed destination when unrelated location inputs change', async () => { + const { router } = setupFixedLink() + render() + + const link = await screen.findByTestId('fixed-link') + expect(link).toHaveAttribute('href', '/target/fixed#details') + expect(link).not.toHaveAttribute('data-status') + + await act(() => + router.navigate({ + to: '/items/$source', + params: { source: 'two' }, + search: { tab: 'other' }, + hash: 'other', + }), + ) + + expect(link).toHaveAttribute('href', '/target/fixed#details') + expect(link).not.toHaveAttribute('data-status') + + await act(() => + router.navigate({ + to: '/target/$id', + params: { id: 'fixed' }, + }), + ) + expect(link).toHaveAttribute('data-status', 'active') + expect(link).toHaveAttribute('href', '/target/fixed#details') + }) + + test('updates the destination when router options change', async () => { + const { router } = setupFixedLink() + render() + + const link = await screen.findByTestId('fixed-link') + expect(link).toHaveAttribute('href', '/target/fixed#details') + + router.update({ trailingSlash: 'always' }) + await act(() => + router.navigate({ to: '/items/$source', params: { source: 'two' } }), + ) + expect(link).toHaveAttribute('href', '/target/fixed/#details') + + router.update({ trailingSlash: 'never' }) + await act(() => + router.navigate({ to: '/items/$source', params: { source: 'three' } }), + ) + expect(link).toHaveAttribute('href', '/target/fixed#details') + }) + + test('evaluates param stringifiers before reusing pathnames', async () => { + const stringify = vi.fn((params: Record) => ({ + id: `${params.source}-${params.id}`, + })) + const { router } = setupFixedLink({ id: 'fixed' }, stringify) + render() + + const link = await screen.findByTestId('fixed-link') + expect(link).toHaveAttribute('href', '/target/one-fixed#details') + + await act(() => + router.navigate({ to: '/items/$source', params: { source: 'two' } }), + ) + expect(link).toHaveAttribute('href', '/target/two-fixed#details') + + stringify.mockClear() + await act(() => + router.navigate({ to: '/items/$source', params: { source: 'one' } }), + ) + expect(link).toHaveAttribute('href', '/target/one-fixed#details') + expect(stringify).toHaveBeenCalled() + }) + + test('updates when ancestor search middleware is added and removed', async () => { + const { router, rootRoute } = setupFixedLink() + render() + + const link = await screen.findByTestId('fixed-link') + expect(link).toHaveAttribute('href', '/target/fixed#details') + + rootRoute.update({ + search: { middlewares: [retainSearchParams(true)] }, + }) + await act(() => + router.navigate({ + to: '/items/$source', + params: { source: 'two' }, + search: { retained: 'value' }, + }), + ) + expect(link).toHaveAttribute('href', '/target/fixed?retained=value#details') + + rootRoute.update({ search: undefined }) + await act(() => + router.navigate({ + to: '/items/$source', + params: { source: 'three' }, + search: { retained: 'value' }, + }), + ) + expect(link).toHaveAttribute('href', '/target/fixed#details') + }) + + test('continues evaluating a custom search serializer', async () => { + const { router } = setupFixedLink() + let language = 'en' + router.update({ + stringifySearch: (search) => + defaultStringifySearch({ ...search, language }), + }) + render() + + const link = await screen.findByTestId('fixed-link') + expect(link).toHaveAttribute('href', '/target/fixed?language=en#details') + + language = 'fr' + await act(() => + router.navigate({ to: '/items/$source', params: { source: 'two' } }), + ) + expect(link).toHaveAttribute('href', '/target/fixed?language=fr#details') + }) + + test('reads accessor-backed params after navigation', async () => { + let id = 'one' + const { router } = setupFixedLink({ + get id() { + return id + }, + }) + render() + + const link = await screen.findByTestId('fixed-link') + expect(link).toHaveAttribute('href', '/target/one#details') + + id = 'two' + await act(() => + router.navigate({ to: '/items/$source', params: { source: 'two' } }), + ) + expect(link).toHaveAttribute('href', '/target/two#details') + }) + + test('updates when an existing params object changes', async () => { + const params = { id: 'one' } + const { router } = setupFixedLink(params) + render() + + const link = await screen.findByTestId('fixed-link') + expect(link).toHaveAttribute('href', '/target/one#details') + + params.id = 'two' + await act(() => + router.navigate({ to: '/items/$source', params: { source: 'two' } }), + ) + expect(link).toHaveAttribute('href', '/target/two#details') + }) + + test('updates fixed params and hash when Link props change', async () => { + const rootRoute = createRootRoute({ + component: function Root() { + const [value, setValue] = React.useState('one') + return ( + <> + + + Item + + + + ) + }, + }) + const itemsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/items/$id', + }) + const router = createRouter({ + routeTree: rootRoute.addChildren([itemsRoute]), + history: createMemoryHistory({ initialEntries: ['/items/one'] }), + }) + render() + + const link = await screen.findByTestId('changing-link') + expect(link).toHaveAttribute('href', '/items/one#one') + expect(link).toHaveAttribute('data-status', 'active') + + fireEvent.click(screen.getByRole('button', { name: 'Change target' })) + + expect(link).toHaveAttribute('href', '/items/two#two') + expect(link).not.toHaveAttribute('data-status') + }) + + test('updates inherited params and active state together', async () => { + const rootRoute = createRootRoute({ + component: () => ( + <> + + {({ isActive }) => (isActive ? 'Current item' : 'Another item')} + + + + ), + }) + const itemsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/items/$id', + }) + const router = createRouter({ + routeTree: rootRoute.addChildren([itemsRoute]), + history: createMemoryHistory({ initialEntries: ['/items/one'] }), + }) + render() + + const link = await screen.findByTestId('inherited-link') + expect(link).toHaveAttribute('href', '/items/one') + expect(link).toHaveTextContent('Current item') + + await act(() => + router.navigate({ to: '/items/$id', params: { id: 'two' } }), + ) + + expect(link).toHaveAttribute('href', '/items/two') + expect(link).toHaveAttribute('data-status', 'active') + expect(link).toHaveTextContent('Current item') + }) +}) diff --git a/packages/router-core/src/path.ts b/packages/router-core/src/path.ts index d302ee13ab..b469ef3f1b 100644 --- a/packages/router-core/src/path.ts +++ b/packages/router-core/src/path.ts @@ -2,7 +2,6 @@ import { isServer } from '@tanstack/router-core/isServer' import { last } from './utils' import { SEGMENT_TYPE_OPTIONAL_PARAM, - SEGMENT_TYPE_PARAM, SEGMENT_TYPE_PATHNAME, SEGMENT_TYPE_WILDCARD, parseSegment, @@ -232,11 +231,12 @@ type InterPolatePathResult = { function encodeParam( key: string, - params: InterpolatePathOptions['params'], + value: unknown, decoder: InterpolatePathOptions['decoder'], -): any { - const value = params[key] - if (typeof value !== 'string') return value +): string { + if (typeof value !== 'string') { + return '' + (value ?? undefined) + } if (key === '_splat') { // Early return if value only contains URL-safe characters (performance optimization) @@ -259,26 +259,44 @@ function encodeParam( * - Encodes params safely (configurable allowed characters) * - Supports `{-$optional}` segments, `{prefix{$id}suffix}` and `{$}` wildcards */ -export function interpolatePath({ - path, - params, - decoder, - // `server` is marked @internal and stripped from .d.ts by `stripInternal`. - // We avoid destructuring it in the function signature so the emitted - // declaration doesn't reference a property that no longer exists. - ...rest -}: InterpolatePathOptions): InterPolatePathResult { - // Tracking if any params are missing in the `params` object - // when interpolating the path - let isMissingParams = false +export function interpolatePath( + options: InterpolatePathOptions, +): InterPolatePathResult { + const { path, params, decoder, server } = options const usedParams: Record = Object.create(null) + let isMissingParams = false + const interpolatedPath = interpolatePathname( + path || '/', + params, + decoder, + usedParams, + undefined, + server, + () => { + isMissingParams = true + }, + ) + return { interpolatedPath, usedParams, isMissingParams } +} - if (!path || path === '/') - return { interpolatedPath: '/', usedParams, isMissingParams } - if (!path.includes('$')) - return { interpolatedPath: path, usedParams, isMissingParams } +/** + * @internal + * Optional metadata is collected in the same pass as the pathname. + */ +export function interpolatePathname( + path: string, + params: Record, + decoder: InterpolatePathOptions['decoder'], + usedParams?: Record, + keys?: Array, + server?: boolean, + onMissing?: () => void, +): string { + if (!path.includes('$')) { + return path + } - if (isServer ?? rest.server) { + if (isServer ?? server) { // Fast path for common templates like `/posts/$id` or `/files/$`. // Braced segments (`{...}`) are more complex (prefix/suffix/optional) and are // handled by the general parser below. @@ -289,65 +307,67 @@ export function interpolatePath({ while (cursor < length) { // Skip slashes between segments. '/' code is 47 - while (cursor < length && path.charCodeAt(cursor) === 47) cursor++ - if (cursor >= length) break + while (cursor < length && path.charCodeAt(cursor) === 47) { + cursor++ + } + if (cursor >= length) { + break + } const start = cursor let end = path.indexOf('/', cursor) - if (end === -1) end = length + if (end === -1) { + end = length + } cursor = end const part = path.substring(start, end) - if (!part) continue // `$id` or `$` (splat). '$' code is 36 if (part.charCodeAt(0) === 36) { - if (part.length === 1) { - const splat = params._splat - usedParams._splat = splat - // TODO: Deprecate * - usedParams['*'] = splat - - if (!splat) { - isMissingParams = true - continue + const splat = part.length === 1 + const key = splat ? '_splat' : part.substring(1) + const value = params[key] + keys?.push(key) + if (onMissing && !(splat ? value : key in params)) { + onMissing() + onMissing = undefined + } + if (usedParams) { + usedParams[key] = value + if (splat) { + // TODO: Deprecate * + usedParams['*'] = value } - - const value = encodeParam('_splat', params, decoder) - joined += '/' + value - } else { - const key = part.substring(1) - if (!isMissingParams && !(key in params)) { - isMissingParams = true - } - usedParams[key] = params[key] - - const value = encodeParam(key, params, decoder) ?? 'undefined' - joined += '/' + value + } + if (!splat || value) { + joined += '/' + encodeParam(key, value, decoder) } } else { joined += '/' + part } } - if (path.endsWith('/')) joined += '/' + if (path.endsWith('/')) { + joined += '/' + } - const interpolatedPath = joined || '/' - return { usedParams, interpolatedPath, isMissingParams } + return joined || '/' } } - const length = path.length let cursor = 0 let segment let joined = '' - while (cursor < length) { + while (cursor < path.length) { const start = cursor segment = parseSegment(path, start, segment) const end = segment[5] cursor = end + 1 - if (start === end) continue + if (start === end) { + continue + } const kind = segment[0] @@ -356,67 +376,41 @@ export function interpolatePath({ continue } - if (kind === SEGMENT_TYPE_WILDCARD) { - const splat = params._splat - usedParams._splat = splat - // TODO: Deprecate * - usedParams['*'] = splat - - const prefix = path.substring(start, segment[1]) - const suffix = path.substring(segment[4], end) - - // Check if _splat parameter is missing. _splat could be missing if undefined or an empty string or some other falsy value. - if (!splat) { - isMissingParams = true - // For missing splat parameters, just return the prefix and suffix without the wildcard - // If there is a prefix or suffix, return them joined, otherwise omit the segment - if (prefix || suffix) { - joined += '/' + prefix + suffix - } - continue - } - - const value = encodeParam('_splat', params, decoder) - joined += '/' + prefix + value + suffix + const splat = kind === SEGMENT_TYPE_WILDCARD + const optional = kind === SEGMENT_TYPE_OPTIONAL_PARAM + const key = splat ? '_splat' : path.substring(segment[2], segment[3]) + const valueRaw = params[key] + keys?.push(key) + if (onMissing && !(splat ? valueRaw : optional || key in params)) { + onMissing() + onMissing = undefined + } + if (optional && valueRaw == null) { continue } - - if (kind === SEGMENT_TYPE_PARAM) { - const key = path.substring(segment[2], segment[3]) - if (!isMissingParams && !(key in params)) { - isMissingParams = true - } - usedParams[key] = params[key] - - const prefix = path.substring(start, segment[1]) - const suffix = path.substring(segment[4], end) - const value = encodeParam(key, params, decoder) ?? 'undefined' - joined += '/' + prefix + value + suffix - continue - } - - if (kind === SEGMENT_TYPE_OPTIONAL_PARAM) { - const key = path.substring(segment[2], segment[3]) - const valueRaw = params[key] - - // Check if optional parameter is missing or undefined - if (valueRaw == null) continue - + if (usedParams) { usedParams[key] = valueRaw + if (splat) { + // TODO: Deprecate * + usedParams['*'] = valueRaw + } + } - const prefix = path.substring(start, segment[1]) - const suffix = path.substring(segment[4], end) - const value = encodeParam(key, params, decoder) ?? '' - joined += '/' + prefix + value + suffix + const prefix = path.substring(start, segment[1]) + const suffix = path.substring(segment[4], end) + const emptySplat = splat && !valueRaw + if (emptySplat && !prefix && !suffix) { continue } + const value = emptySplat ? '' : encodeParam(key, valueRaw, decoder) + joined += '/' + prefix + value + suffix } - if (path.endsWith('/')) joined += '/' + if (path.endsWith('/')) { + joined += '/' + } - const interpolatedPath = joined || '/' - - return { usedParams, interpolatedPath, isMissingParams } + return joined || '/' } function encodePathParam( diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 5e788bef76..3833f66230 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -6,6 +6,7 @@ import { import { isServer, loadServerRoute } from '@tanstack/router-core/isServer' import { DEFAULT_PROTOCOL_ALLOWLIST, + createNull, decodePath, deepEqual, encodePathLikeUrl, @@ -29,7 +30,7 @@ import { } from './new-process-route-tree' import { compileDecodeCharMap, - interpolatePath, + interpolatePathname, resolvePath, trimPath, trimPathRight, @@ -1015,6 +1016,12 @@ type LightweightRouteMatchCacheEntry = [ result: LightweightRouteMatchResult, ] +type InterpolationPlan = [ + keys: Array, + paths: SieveCache, + decoder: ((encoded: string) => string) | undefined, +] + export type CreateRouterFn = < TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption = 'never', @@ -1155,6 +1162,7 @@ export class RouterCore< routesByPath!: RoutesByPath processedTree!: ProcessedTree resolvePathCache!: SieveCache + private pathCache = createSieveCache(32) private routeBranchCache = new WeakMap>() private lightweightCache = new WeakMap< ParsedLocation, @@ -1663,12 +1671,23 @@ export class RouterCore< searchError ??= cause } // Match identity must only use the raw params captured from the URL. - const { interpolatedPath, usedParams } = interpolatePath({ - path: route.fullPath, - params: rawParams, - decoder: this.pathParamsDecoder, - server: this.isServer, - }) + const usedParams: Record = createNull() + const interpolatedPath = + isServer === undefined + ? interpolatePathname( + route.fullPath, + rawParams, + this.pathParamsDecoder, + usedParams, + undefined, + this.isServer, + ) + : interpolatePathname( + route.fullPath, + rawParams, + this.pathParamsDecoder, + usedParams, + ) // Seed planning from the accepted same-ID cache generation first, then // from the committed generation for this route. Presentation stores are @@ -1879,6 +1898,74 @@ export class RouterCore< return result } + private interpolatePath( + path: string, + params: Record, + ): string { + const decoder = this.pathParamsDecoder + let plan = this.pathCache.get(path) + let interpolated: string | undefined + if (!plan || plan[2] !== decoder) { + const keys: Array = [] + interpolated = + isServer === undefined + ? interpolatePathname( + path, + params, + decoder, + undefined, + keys, + this.isServer, + ) + : interpolatePathname(path, params, decoder, undefined, keys) + plan = [keys, createSieveCache(128), decoder] + this.pathCache.set(path, plan) + } + const [keys, paths] = plan + // Single-param templates use the value itself as the Map key. Compound keys + // concatenate `:` tokens; undefined becomes + // `undefined:undefined`, whose nonnumeric prefix cannot match a string token. + let key: string | undefined = '' + for (const name of keys) { + const value = params[name] + if (typeof value !== 'string' && value !== undefined) { + return ( + interpolated || + (isServer === undefined + ? interpolatePathname( + path, + params, + decoder, + undefined, + undefined, + this.isServer, + ) + : interpolatePathname(path, params, decoder)) + ) + } + key = keys.length === 1 ? value : key! + value?.length + ':' + value + } + const cached = paths.get(key) + if (cached) { + return cached + } + paths.set( + key, + (interpolated ||= + isServer === undefined + ? interpolatePathname( + path, + params, + decoder, + undefined, + undefined, + this.isServer, + ) + : interpolatePathname(path, params, decoder)), + ) + return interpolated + } + /** * Build the next ParsedLocation from navigation options without committing. * Resolves `to`/`from`, params/search/hash/state, applies search validation @@ -1989,7 +2076,7 @@ export class RouterCore< route.options.params?.stringify ?? route.options.stringifyParams if (fn) { if (nextParams === fromParams) { - nextParams = Object.assign(Object.create(null), nextParams) + nextParams = Object.assign(createNull(), nextParams) } try { Object.assign(nextParams, fn(nextParams)) @@ -2011,12 +2098,9 @@ export class RouterCore< // A splat can produce a path like "//evil.example". // Normalize it to "/evil.example" to keep it on the current origin. normalizeProtocolRelative( - interpolatePath({ - path: nextTo, - params: nextParams, - decoder: this.pathParamsDecoder, - server: this.isServer, - }).interpolatedPath, + nextTo.includes('$') + ? this.interpolatePath(nextTo, nextParams) + : nextTo, ), ) @@ -2156,7 +2240,7 @@ export class RouterCore< this.processedTree, ) if (match) { - const params = Object.assign(Object.create(null), match.rawParams) + const params = Object.assign(createNull(), match.rawParams) const { from: _from, params: maskParams, ...maskProps } = match.route // If mask has a params function, call it with the matched params as context diff --git a/packages/router-core/tests/build-location.test.ts b/packages/router-core/tests/build-location.test.ts index edb763fa03..865edfa943 100644 --- a/packages/router-core/tests/build-location.test.ts +++ b/packages/router-core/tests/build-location.test.ts @@ -1,5 +1,7 @@ import { describe, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' +import { isServer as serverEnvironment } from '@tanstack/router-core/isServer' +import * as pathUtils from '../src/path' import { BaseRootRoute, BaseRoute, @@ -24,6 +26,73 @@ test('_getUserHistoryState removes volatile router bookkeeping but keeps mask pa ).toEqual({ user: 'state', __tempLocation: {}, __tempKey: 'temp-key' }) }) +test.each([false, true])( + 'forwards the development server override when router.isServer is %s', + (isServer) => { + expect(serverEnvironment).toBeUndefined() + const rootRoute = new BaseRootRoute({}) + const route = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/items/$id', + }) + const router = createTestRouter({ + routeTree: rootRoute.addChildren([route]), + history: createMemoryHistory({ initialEntries: ['/items/one'] }), + isServer, + }) + const interpolate = vi.spyOn(pathUtils, 'interpolatePathname') + try { + const matches = router.matchRoutes('/items/one', {}) + expect(matches.at(-1)?.pathname).toBe('/items/one') + const call = interpolate.mock.calls.find( + ([path]) => path === '/items/$id', + ) + expect(call).toHaveLength(6) + expect(call?.[5]).toBe(isServer) + } finally { + interpolate.mockRestore() + } + }, +) + +test('keeps interpolation caches router-local and follows decoder changes', () => { + const rootRoute = new BaseRootRoute({}) + const route = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/items/$id', + }) + const routeTree = rootRoute.addChildren([route]) + const makeRouter = () => + createTestRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/'] }), + }) + const router = makeRouter() + const decoder = vi.fn(pathUtils.compileDecodeCharMap(['@'])) + router.pathParamsDecoder = decoder + + expect( + router.buildLocation({ to: '/items/$id', params: { id: '@one' } }).href, + ).toBe('/items/@one') + decoder.mockClear() + expect( + router.buildLocation({ to: '/items/$id', params: { id: '@one' } }).href, + ).toBe('/items/@one') + expect(decoder).not.toHaveBeenCalled() + + const other = makeRouter() + other.pathParamsDecoder = decoder + expect( + other.buildLocation({ to: '/items/$id', params: { id: '@one' } }).href, + ).toBe('/items/@one') + expect(decoder).toHaveBeenCalledOnce() + + router.pathParamsDecoder = pathUtils.compileDecodeCharMap(['+']) + expect( + router.buildLocation({ to: '/items/$id', params: { id: '@one' } }).href, + ).toBe('/items/%40one') +}) + describe('buildLocation - params function receives parsed params', () => { test('prev params should contain parsed params from route params.parse', async () => { const rootRoute = new BaseRootRoute({}) diff --git a/packages/router-core/tests/path-interpolation.bench.ts b/packages/router-core/tests/path-interpolation.bench.ts new file mode 100644 index 0000000000..baf1afd596 --- /dev/null +++ b/packages/router-core/tests/path-interpolation.bench.ts @@ -0,0 +1,164 @@ +import { bench, describe, expect } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute } from '../src' +import { compileDecodeCharMap, interpolatePath } from '../src/path' +import { createTestRouter } from './routerTestUtils' + +type Options = Parameters[0] + +const scenarios: Array<{ name: string; inputs: Array }> = [ + { + name: 'single-param shared hits', + inputs: Array.from({ length: 200 }, (_, index) => ({ + path: '/items/$id', + params: { id: `item ${Math.floor(index / 5)}`, unrelated: index }, + })), + }, + { + name: 'multi-param shared hits', + inputs: Array.from({ length: 200 }, (_, index) => ({ + path: '/orgs/$orgId/items/$id', + params: { + orgId: `org:${Math.floor(index / 5) % 4}`, + id: `item/${Math.floor(index / 5)}`, + }, + })), + }, + { + name: 'result eviction', + inputs: Array.from({ length: 256 }, (_, index) => ({ + path: '/items/$id', + params: { id: `item ${index}` }, + })), + }, + { + name: 'template eviction', + inputs: Array.from({ length: 64 }, (_, index) => ({ + path: `/section-${index}/$id`, + params: { id: 'item one' }, + })), + }, + { + name: 'mixed optional and splat params', + inputs: Array.from({ length: 200 }, (_, index) => { + switch (index % 5) { + case 0: + return { path: '/posts/{-$category}', params: {} } + case 1: + return { + path: '/posts/{-$category}', + params: { category: `news-${index % 10}` }, + } + case 2: + return { path: '/users/$id', params: { id: index } } + case 3: + return { path: '/files/$', params: { _splat: `docs/${index % 20}` } } + default: + return { path: '/about', params: {} } + } + }), + }, + { + name: 'missing required and splat params', + inputs: Array.from({ length: 200 }, (_, index) => { + switch (index % 5) { + case 0: + return { path: '/$first/$second', params: { second: 'two' } } + case 1: + return { + path: '/$first/$second', + params: { first: undefined, second: 'two' }, + } + case 2: + return { path: '/$first/{-$second}', params: {} } + case 3: + return { path: '/files/$', params: {} } + default: + return { path: '/files/prefix{$}suffix', params: { _splat: '' } } + } + }), + }, +] + +const decoder = compileDecodeCharMap(['@', '+']) +for (const { inputs } of scenarios) { + for (const input of inputs) { + input.decoder = decoder + input.server = false + } +} +scenarios.push( + ...scenarios.map(({ name, inputs }) => ({ + name: `server ${name}`, + inputs: inputs.map((input) => ({ ...input, server: true })), + })), +) + +describe.each(scenarios)('$name', ({ inputs }) => { + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history: createMemoryHistory({ initialEntries: ['/'] }), + isServer: inputs[0]?.server, + scrollRestoration: false, + }) + router.pathParamsDecoder = decoder + router.history.destroy() + const interpolate = router['interpolatePath'] + const calls = inputs + .filter((input) => input.path?.includes('$')) + .map((input) => ({ + args: + interpolate.length === 1 ? [input] : [input.path || '/', input.params], + expected: interpolatePath(input).interpolatedPath, + })) + let checksum = 0 + const expected = inputs.reduce( + (sum, input) => sum + interpolatePath(input).interpolatedPath.length, + 0, + ) + const cachedExpected = calls.reduce((sum, call) => { + expect(Reflect.apply(interpolate, router, call.args)).toBe(call.expected) + return sum + call.expected.length + }, 0) + for (const call of calls) { + expect(Reflect.apply(interpolate, router, call.args)).toBe(call.expected) + } + + bench( + 'shared interpolation batch', + () => { + let length = 0 + for (const call of calls) { + length += Reflect.apply(interpolate, router, call.args).length + } + checksum = length + }, + { + time: 1500, + warmupTime: 500, + throws: true, + teardown: () => { + expect(checksum).toBe(cachedExpected) + }, + }, + ) + + bench( + 'uncached interpolation batch', + () => { + let length = 0 + for (const input of inputs) { + length += interpolatePath(input).interpolatedPath.length + } + checksum = length + }, + { + time: 1500, + warmupTime: 500, + throws: true, + teardown: () => { + expect(checksum).toBe(expected) + }, + }, + ) +}) diff --git a/packages/router-core/tests/path.test.ts b/packages/router-core/tests/path.test.ts index 8e4f5ed1db..02a3df746f 100644 --- a/packages/router-core/tests/path.test.ts +++ b/packages/router-core/tests/path.test.ts @@ -16,8 +16,275 @@ import { processRouteTree, } from '../src/new-process-route-tree' import { createSieveCache } from '../src/sieve-cache' +import { createTestPathInterpolator as createPathInterpolator } from './routerTestUtils' import type { SegmentKind } from '../src/new-process-route-tree' +describe.each([false, true])( + 'shared pathname interpolation (server: %s)', + (server) => { + it.each([ + { path: '/', params: {} }, + { path: '/users/', params: {} }, + { path: '/users/$id', params: { id: '123' } }, + { path: '/users/$id', params: { id: 0 } }, + { path: '/users/$id', params: {} }, + { path: '/users/$id', params: { id: 'a/b?#@+' } }, + { path: '/users/$id', params: { id: 'cafe\u0301' } }, + { path: '/users/{$id}.json', params: { id: '123' } }, + { path: '/posts/{-$category}', params: {} }, + { path: '/posts/{-$category}', params: { category: undefined } }, + { path: '/posts/{-$category}', params: { category: '' } }, + { path: '/posts/{-$category}', params: { category: 'news' } }, + { + path: '/posts/prefix{-$category}suffix', + params: { category: 'news' }, + }, + { path: '/files/$', params: { _splat: 'a b/c+d' } }, + { path: '/files/prefix{$}suffix', params: { _splat: 'a/b' } }, + { path: '/files/$', params: { _splat: '' } }, + { path: '/$id/$id/', params: { id: '123' } }, + ])('matches interpolation for $path with $params', ({ path, params }) => { + const interpolate = createPathInterpolator() + const options = { path, params, server } + const expected = interpolatePath(options).interpolatedPath + + expect(interpolate(options)).toBe(expected) + expect(interpolate({ ...options, params: { ...params } })).toBe(expected) + }) + + it('shares results across equivalent params without retaining unrelated params', () => { + const interpolate = createPathInterpolator() + const decoder = vi.fn(compileDecodeCharMap(['@'])) + const options = { + path: '/users/$id', + params: { id: '@one', unrelated: 'first' }, + decoder, + server, + } + expect(interpolate(options)).toBe('/users/@one') + expect(decoder).toHaveBeenCalledOnce() + + expect( + interpolate({ + ...options, + params: { id: '@one', unrelated: 'second' }, + }), + ).toBe('/users/@one') + expect(decoder).toHaveBeenCalledOnce() + + const anotherRouter = createPathInterpolator() + expect(anotherRouter(options)).toBe('/users/@one') + expect(decoder).toHaveBeenCalledTimes(2) + }) + + it('invalidates results when allowed-character decoding changes', () => { + const interpolate = createPathInterpolator() + const options = { + path: '/users/$id', + params: { id: '@+' }, + server, + } + expect( + interpolate({ ...options, decoder: compileDecodeCharMap(['@']) }), + ).toBe('/users/@%2B') + expect( + interpolate({ ...options, decoder: compileDecodeCharMap(['+']) }), + ).toBe('/users/%40+') + expect(interpolate(options)).toBe('/users/%40%2B') + }) + + it('refreshes each cached template when its decoder changes', () => { + const interpolate = createPathInterpolator() + const allowAt = compileDecodeCharMap(['@']) + const allowPlus = compileDecodeCharMap(['+']) + for (const decoder of [allowAt, allowPlus, undefined, allowAt]) { + for (const path of ['/users/$id', '/teams/$id']) { + const options = { path, params: { id: '@+' }, decoder, server } + expect(interpolate(options)).toBe( + interpolatePath(options).interpolatedPath, + ) + } + } + }) + + it('does not confuse parameter boundaries in shared cache keys', () => { + const interpolate = createPathInterpolator() + const options = { path: '/$first/$second', server } + const first = { first: 'a:b', second: 'c' } + const second = { first: 'a', second: 'b:c' } + + expect(interpolate({ ...options, params: first })).toBe('/a%3Ab/c') + expect(interpolate({ ...options, params: second })).toBe('/a/b%3Ac') + expect(interpolate({ ...options, params: first })).toBe('/a%3Ab/c') + }) + + it('keeps templates separate when parameter values are equal', () => { + const interpolate = createPathInterpolator() + const params = { id: '123' } + + expect(interpolate({ path: '/users/$id', params, server })).toBe( + '/users/123', + ) + expect(interpolate({ path: '/posts/$id', params, server })).toBe( + '/posts/123', + ) + expect(interpolate({ path: '/users/$id', params, server })).toBe( + '/users/123', + ) + }) + + it('tracks optional params that were absent when the template was first used', () => { + const interpolate = createPathInterpolator() + const path = '/posts/{-$category}/$id' + const inputs = [ + { id: 'one' }, + { id: 'one', category: 'news' }, + { id: 'one', category: undefined }, + { id: 'one', category: '' }, + { id: 'one', category: 'updates' }, + ] + + for (const params of [...inputs, ...inputs]) { + const options = { path, params, server } + expect(interpolate(options)).toBe( + interpolatePath(options).interpolatedPath, + ) + } + }) + + it('caches paths with omitted optional params', () => { + const interpolate = createPathInterpolator() + const decoder = vi.fn(compileDecodeCharMap(['@'])) + const options = { + path: '/{-$lang}/foo/$id', + params: { id: '@one' }, + decoder, + server, + } + + expect(interpolate(options)).toBe('/foo/@one') + expect(interpolate({ ...options, params: { id: '@one' } })).toBe( + '/foo/@one', + ) + expect(decoder).toHaveBeenCalledOnce() + }) + + it('uses the canonical splat value instead of its legacy alias', () => { + const interpolate = createPathInterpolator() + const decoder = vi.fn(compileDecodeCharMap(['@'])) + const options = { + path: '/files/$', + params: { _splat: 'docs/@guide', '*': 'ignored' }, + decoder, + server, + } + + expect(interpolate(options)).toBe('/files/docs/@guide') + decoder.mockClear() + expect( + interpolate({ + ...options, + params: { _splat: 'docs/@guide', '*': 'changed' }, + }), + ).toBe('/files/docs/@guide') + expect(decoder).not.toHaveBeenCalled() + }) + + it('keeps public usedParams unchanged for missing optionals and splats', () => { + expect( + interpolatePath({ path: '/posts/{-$category}', params: {}, server }) + .usedParams, + ).toEqual({}) + expect( + interpolatePath({ + path: '/files/$', + params: { _splat: 'docs/guide' }, + server, + }).usedParams, + ).toEqual({ _splat: 'docs/guide', '*': 'docs/guide' }) + }) + + it.each([ + { + path: '/$first/$second', + params: { second: 'two' }, + pathname: '/undefined/two', + usedParams: { first: undefined, second: 'two' }, + missing: true, + }, + { + path: '/$first/$second', + params: { first: undefined, second: 'two' }, + pathname: '/undefined/two', + usedParams: { first: undefined, second: 'two' }, + missing: false, + }, + { + path: '/{-$first}/$second', + params: { second: 'two' }, + pathname: '/two', + usedParams: { second: 'two' }, + missing: false, + }, + { + path: '/$first/{-$second}', + params: {}, + pathname: '/undefined', + usedParams: { first: undefined }, + missing: true, + }, + { + path: '/$first/prefix{$}suffix', + params: { first: 'one' }, + pathname: '/one/prefixsuffix', + usedParams: { first: 'one', _splat: undefined, '*': undefined }, + missing: true, + }, + ])( + 'preserves missing-param metadata for $path with $params', + ({ path, params, pathname, usedParams, missing }) => { + expect(interpolatePath({ path, params, server })).toEqual({ + interpolatedPath: pathname, + usedParams, + isMissingParams: missing, + }) + }, + ) + + it('tracks a splat that was empty when the template was first used', () => { + const interpolate = createPathInterpolator() + for (const _splat of ['', 'docs/guide', '', 'docs/reference']) { + const options = { + path: '/files/prefix{$}suffix', + params: { _splat }, + server, + } + expect(interpolate(options)).toBe( + interpolatePath(options).interpolatedPath, + ) + } + }) + + it('does not retain incomplete metadata when the first interpolation throws', () => { + const interpolate = createPathInterpolator() + const options = { path: '/$first/$second', server } + + expect(() => + interpolate({ + ...options, + params: { first: '\uD800', second: 'one' }, + }), + ).toThrow(URIError) + + for (const second of ['two', 'three', 'two']) { + expect( + interpolate({ ...options, params: { first: 'valid', second } }), + ).toBe(`/valid/${second}`) + } + }) + }, +) + describe.each([{ basepath: '/' }, { basepath: '/app' }, { basepath: '/app/' }])( 'removeTrailingSlash with basepath $basepath', ({ basepath }) => { diff --git a/packages/router-core/tests/routerTestUtils.ts b/packages/router-core/tests/routerTestUtils.ts index 413b810b95..a52f82eb6a 100644 --- a/packages/router-core/tests/routerTestUtils.ts +++ b/packages/router-core/tests/routerTestUtils.ts @@ -1,11 +1,14 @@ import { batch, createAtom } from '@tanstack/store' +import { createMemoryHistory } from '@tanstack/history' import { isServer } from '@tanstack/router-core/isServer' import { RouterCore, + BaseRootRoute, createNonReactiveMutableStore, createNonReactiveReadonlyStore, } from '../src' import { createRequestHandler } from '../src/ssr/createRequestHandler' +import type { interpolatePath } from '../src/path' import type { RouterHistory } from '@tanstack/history' import type { AnyRouter, @@ -49,6 +52,31 @@ export function createTestRouter< return new RouterCore(options, getStoreConfig) } +export function createTestPathInterpolator() { + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history: createMemoryHistory({ initialEntries: ['/'] }), + scrollRestoration: false, + }) + router.history.destroy() + const interpolate = router['interpolatePath'] + + return (options: Parameters[0]): string => { + router.isServer = options.server ?? false + router.pathParamsDecoder = options.decoder + // Support both sides of the factory-to-method benchmark comparison. + const args = + interpolate.length === 1 + ? [options] + : [options.path || '/', options.params] + const result = Reflect.apply(interpolate, router, args) + if (typeof result !== 'string') { + throw new Error('Expected an interpolated pathname') + } + return result + } +} + /** Materialize the request-local server result as the HTTP response users see. */ export function loadServerResponse( router: AnyRouter, From 94f6c14f6b5f1a004034979497431ef6ecc366da Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:01 +0200 Subject: [PATCH 006/175] test(router): add stable Link performance benchmarks (#8317) * test(router): add opt-in React Link performance cases Add 13 shared typed workloads measured through production client navigation and real SSR rendering: shared/unique params, updater functions, inheritance, relative targets, middleware chains, numeric parse/stringify, optional/splat segments, encoding, masks, rewrites, and active props with structured search and style merging. Keep all 26 benchmarks outside the existing client-nav/SSR aggregate projects and CodSpeed build graph. The dedicated @benchmarks/react-link-performance targets require TSR_LINK_PERF=1 for discovery; disabled suites import no app. Gate tests cover explicit enablement and production environment selection. Client batches perform eight navigations with 200 persistent measured Links. SSR batches create/load/render/dispose four fresh routers. Independent href, active-state, style, and history-state updater assertions run outside the measured loops. No production packages or dependencies change. Compared identical sources on origin/main 28a5e4504e and captured HEAD bbaa7b3f29, with two fresh processes per ref/mode in counterbalanced order, 50 warm-up iterations, and 3-second windows. Full-suite results show lower HEAD client times for most cases (10.6% shared params, 13.2% search/hash/state updaters, 17.1% masks); SSR updater and optional cases show 14.8% and 12.4% reductions. These are whole-ref comparisons, not improvements from this benchmark-only commit. Run-to-run noise is significant for small differences. Initial middleware and unique-param SSR slowdowns reversed in focused reruns, so they are not established regressions. Preserve both full-suite and focused data in the uncommitted experiment log and session artifacts. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * test(router): stabilize opt-in Link performance comparisons Bound control navigation history with replace and assert that the measured anchors remain mounted. Share the exact setup, batch, and post-measurement assertions between normal Vitest benches and the paired comparison runner. Increase normal warm-up and measurement windows. Add an opt-in stable runner with a fresh process per case/replica, separate router/app modules, one shared production React runtime, deterministic V8 random/hash seeds, alternating initialization order, and ABBA/BAAB fixed-work blocks. Record main-thread CPU, wall time, whole-process CPU, bundle hashes, and all raw blocks. Derive per-case 95% intervals from independent process replicas rather than correlated individual batches; require CPU and wall results to corroborate a direction. Same-code controls exposed substantial noise in earlier methods. The selected control was centered near zero (client CPU -0.95%, SSR CPU -0.56%), with intervals still several percentage points wide. Keep unresolved measurements explicitly inconclusive instead of labeling them regressions. Compared fixed runtime refs origin/main 28a5e4504e and bbaa7b3f29 across all 26 cases with four fresh-process replicas each: 16 cases support speedups, 10 remain inconclusive, and none support a slowdown in both metrics. Client middleware CPU: -5.95% [-13.89%, +2.73%]; SSR middleware: -16.06% [-31.65%, +3.09%]; SSR unique params: -5.08% [-14.97%, +5.96%]. These do not establish middleware or unique-param regressions. No production package code or default CodSpeed workflow changes. Keep the complete raw matrix, calibration trials, snapshots, and detailed conclusions in uncommitted session artifacts and LOG.md. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- benchmarks/client-nav/README.md | 97 ++++ .../client-nav/link-performance/cases.ts | 360 +++++++++++++ .../link-performance/client.bench.ts | 31 ++ .../link-performance/config.test.ts | 57 ++ .../client-nav/link-performance/config.ts | 71 +++ .../client-nav/link-performance/project.json | 82 +++ .../client-nav/link-performance/scenario.ts | 114 ++++ .../link-performance/src/client.tsx | 29 + .../client-nav/link-performance/src/ssr.tsx | 29 + .../link-performance/src/workload.tsx | 506 ++++++++++++++++++ .../client-nav/link-performance/ssr.bench.ts | 31 ++ .../link-performance/stable-runner.ts | 274 ++++++++++ .../link-performance/stable-worker.ts | 112 ++++ .../link-performance/statistics.test.ts | 36 ++ .../client-nav/link-performance/statistics.ts | 57 ++ .../client-nav/link-performance/tsconfig.json | 15 + .../link-performance/vite.client.config.ts | 3 + .../link-performance/vite.ssr.config.ts | 3 + .../link-performance/vitest.config.ts | 11 + .../link-performance/worker-protocol.ts | 28 + benchmarks/ssr/README.md | 16 + 21 files changed, 1962 insertions(+) create mode 100644 benchmarks/client-nav/link-performance/cases.ts create mode 100644 benchmarks/client-nav/link-performance/client.bench.ts create mode 100644 benchmarks/client-nav/link-performance/config.test.ts create mode 100644 benchmarks/client-nav/link-performance/config.ts create mode 100644 benchmarks/client-nav/link-performance/project.json create mode 100644 benchmarks/client-nav/link-performance/scenario.ts create mode 100644 benchmarks/client-nav/link-performance/src/client.tsx create mode 100644 benchmarks/client-nav/link-performance/src/ssr.tsx create mode 100644 benchmarks/client-nav/link-performance/src/workload.tsx create mode 100644 benchmarks/client-nav/link-performance/ssr.bench.ts create mode 100644 benchmarks/client-nav/link-performance/stable-runner.ts create mode 100644 benchmarks/client-nav/link-performance/stable-worker.ts create mode 100644 benchmarks/client-nav/link-performance/statistics.test.ts create mode 100644 benchmarks/client-nav/link-performance/statistics.ts create mode 100644 benchmarks/client-nav/link-performance/tsconfig.json create mode 100644 benchmarks/client-nav/link-performance/vite.client.config.ts create mode 100644 benchmarks/client-nav/link-performance/vite.ssr.config.ts create mode 100644 benchmarks/client-nav/link-performance/vitest.config.ts create mode 100644 benchmarks/client-nav/link-performance/worker-protocol.ts diff --git a/benchmarks/client-nav/README.md b/benchmarks/client-nav/README.md index 6179c7f0b8..3cf38f87de 100644 --- a/benchmarks/client-nav/README.md +++ b/benchmarks/client-nav/README.md @@ -115,3 +115,100 @@ Typecheck benchmark sources (baseline + scenarios): ```bash CI=1 NX_DAEMON=false pnpm nx run @benchmarks/client-nav:test:types --outputStyle=stream --skipRemoteCache ``` + +## Opt-in React Link performance suite + +`link-performance/` contains additional client-navigation and SSR workloads for +focused Link work. They are **not included** in the regular client-nav/SSR +aggregate projects or their CodSpeed build dependencies. Benchmark discovery +also requires `TSR_LINK_PERF=1`; without it, no extended benchmark files or app +bundles are imported. + +```bash +TSR_LINK_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:client --outputStyle=stream --skipRemoteCache -- --run +TSR_LINK_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:ssr --outputStyle=stream --skipRemoteCache -- --run + +# Select a feature and save the normal Vitest JSON report. +TSR_LINK_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:client --outputStyle=stream --skipRemoteCache -- --run -t "updater|optional|splat" --outputJson /tmp/link-perf.json +``` + +The cases cover repeated versus unique destination params, updater functions, +relative/inherited values, search middleware chains, param stringification, +optional and splat segments, encoding, masks, basepath/rewrites, and active +props with structured search. These exercise different costs: cache hits and +misses, parameter cloning, callbacks, middleware traversal, URI encoding, +building masked/public locations, active-state comparisons, and prop merging. +Existing preload, mount, and route-tree-scale scenarios remain responsible for +those separate workloads. + +- **Client:** 200 persistent measured Links, four control Links, and eight + completed navigations per timed batch. The existing client harness checks + hrefs and active state during its untimed warm-up lap. Control navigations + replace the history entry, keeping history size constant. Post-measurement + assertions also check that the measured anchors stayed mounted. +- **SSR:** four fresh-router requests per timed batch, each rendering 200 + measured Links through `RouterProvider` and `renderToString`. Router creation, + `router.load()`, rendering, and history cleanup are included. This isolates + Router SSR Link work, not Start HTTP handling, dehydration, or streaming. + HTML assertions run outside the timed batch. +- Both use the same code-based workload definitions and production JSX/library + builds. The regular Vitest entry points use at least 100 warm-up iterations, + one second of warm-up time, and five-second measurement windows. The client + and server bundles assert their resolved `isServer` environment. React and + React DOM remain external so comparisons can share the same renderer runtime. + These bundles are Node-hosted (jsdom for client mode), not browser deployments. + +Run the gate tests and typecheck separately: + +```bash +CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:unit --outputStyle=stream --skipRemoteCache +CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:types --outputStyle=stream --skipRemoteCache +``` + +For before/after comparisons, use identical benchmark files and dependencies +on both refs, build each ref through its Nx targets, and alternate fresh +Vitest processes. Report the actual refs, per-case means and relative margins +of error; rerun noisy or borderline results with `-t` rather than interpreting +a small difference as a proven speedup. Client and SSR times have different +batch units and should not be compared directly. + +### Stable paired comparisons + +For regression decisions, prefer the paired runner over a whole-file Vitest +run. It starts a fresh process for every case and repetition, avoiding JIT +feedback from earlier cases. Inside each process, both revisions share the +same production React installation but have separate router/app modules and +router instances. Initialization order alternates between repetitions. + +```bash +# Build the baseline using these same benchmark sources in its own checkout. +# --baseline points to that checkout's link-performance/dist directory. +TSR_LINK_PERF=1 pnpm nx run @benchmarks/react-link-performance:test:perf:stable -- \ + --baseline /path/to/baseline/benchmarks/client-nav/link-performance/dist \ + --outputJson /tmp/paired-links.json + +# Narrow a comparison, or increase independent process repetitions. +TSR_LINK_PERF=1 pnpm nx run @benchmarks/react-link-performance:test:perf:stable -- \ + --baseline /path/to/baseline/benchmarks/client-nav/link-performance/dist \ + --mode ssr -t "middleware|unique-params" --repeats 6 \ + --outputJson /tmp/paired-links-ssr.json +``` + +The runner requires Node with `process.threadCpuUsage` (Node 24 works). +It fixes V8 random/hash seeds, warms each variant for at least two seconds +and 100 batches, then alternates ABBA/BAAB blocks calibrated to roughly 500 ms. +Both variants do exactly the same number of batches per block. It records +main-thread CPU time, wall time, and whole-process CPU time; GC during +measurement is not disabled or discarded. + +The default is four independent process repetitions. Reported 95% intervals +use their paired log-ratios, not the many correlated batches as independent +samples. A faster/slower verdict requires CPU and wall intervals to agree. +Intervals overlapping zero or disagreeing metrics are inconclusive; narrow +intervals entirely inside +/-2% are reported separately. + +An A/A calibration uses the current `dist` directory as `--baseline`. Its +intervals should contain zero before trusting similarly sized A/B differences. +Shared-machine contention can still make small changes unresolved. Do not +interpret a point estimate alone, or an inconclusive result, as proof that +a workload is unchanged. diff --git a/benchmarks/client-nav/link-performance/cases.ts b/benchmarks/client-nav/link-performance/cases.ts new file mode 100644 index 0000000000..a25eac563b --- /dev/null +++ b/benchmarks/client-nav/link-performance/cases.ts @@ -0,0 +1,360 @@ +export const LINK_CASES = [ + { + id: 'shared-params', + label: 'Shared string params', + description: '200 persistent Links reuse 40 string parameter values.', + }, + { + id: 'unique-params', + label: 'Unique string params', + description: '200 distinct parameter values exceed the 128-result cache.', + }, + { + id: 'param-updaters', + label: 'Parameter updaters', + description: 'Parameter functions derive destinations from current params.', + }, + { + id: 'location-updaters', + label: 'Search, hash and state updaters', + description: + 'Functions derive search, hash and history state from the source.', + }, + { + id: 'relative', + label: 'Relative targets', + description: 'Parent and child targets inherit current params and search.', + }, + { + id: 'middleware', + label: 'Search middleware chain', + description: + 'Retain a tenant, strip a default page and normalize a filter.', + }, + { + id: 'numeric-params', + label: 'Numeric params', + description: 'Parse numbers, update them numerically and stringify them.', + }, + { + id: 'optional-params', + label: 'Optional segments', + description: 'Set, inherit and explicitly clear an optional path segment.', + }, + { + id: 'splats', + label: 'Splat params', + description: 'Empty, multi-segment and encoded splat values.', + }, + { + id: 'encoding', + label: 'Allowed path characters', + description: 'Preserve allowed @, : and + while encoding other characters.', + }, + { + id: 'masks', + label: 'Explicit route masks', + description: + 'Build a different public path and search for each destination.', + }, + { + id: 'rewrites', + label: 'Basepath and rewrites', + description: 'Compose /app with input/output locale path rewrites.', + }, + { + id: 'active', + label: 'Active props and structured search', + description: + 'Exact, fuzzy and search matching with props and render children.', + }, +] as const + +export type LinkCaseId = (typeof LINK_CASES)[number]['id'] + +export const LINK_COUNT = 200 +export const NAVIGATION_STATES = [1, 2, 3, 0] as const +export const LOCALES = ['en', 'fr', 'de', 'es'] as const + +export interface Filter { + tag: string + flags: { open: boolean } + tags: Array +} + +export interface LinkSearch { + page?: number + tenant?: string + filter?: Filter +} + +export function sourceFilter(index: number): Filter { + return { + tag: `group-${index}`, + flags: { open: index % 2 === 0 }, + tags: ['links', `state-${index}`], + } +} + +export function sourceSearch( + caseId: LinkCaseId, + stateIndex: number, +): Partial { + switch (caseId) { + case 'location-updaters': + case 'relative': + case 'middleware': + case 'active': + return { + page: stateIndex + 1, + tenant: `tenant-${stateIndex}`, + filter: sourceFilter(stateIndex), + } + case 'rewrites': + return { tenant: LOCALES[stateIndex] } + default: + return {} + } +} + +export function optionalCategory(stateIndex: number) { + return stateIndex % 2 === 0 ? `category-${stateIndex}` : undefined +} + +export function splatValue(index: number) { + switch (index % 4) { + case 0: + return '' + case 1: + return `folder/sub/file-${index % 40}` + case 2: + return 'a b/100%/caf\u00e9?#' + default: + return 'literal%2F/\u{1f680}' + } +} + +export function encodedValue(index: number) { + return `user-${index % 40}@mail.test:tag+value /?#% caf\u00e9` +} + +function url(pathname: string, search: Partial = {}, hash = '') { + const result = new URL(pathname, 'http://localhost') + for (const [key, value] of Object.entries( + search, + )) { + if (value !== undefined) { + result.searchParams.set( + key, + typeof value === 'object' ? JSON.stringify(value) : String(value), + ) + } + } + result.hash = hash + return result.pathname + result.search + result.hash +} + +function sourcePath(caseId: LinkCaseId, stateIndex: number) { + switch (caseId) { + case 'relative': + return `/teams/team-${stateIndex}/item-${stateIndex}` + case 'numeric-params': + return `/numbers/${stateIndex}` + case 'optional-params': { + const category = optionalCategory(stateIndex) + return `/optional/${category ? `${category}/` : ''}item-${stateIndex}` + } + case 'splats': + return `/files/source/state-${stateIndex}` + case 'encoding': + return `/encoded/source-${stateIndex}` + case 'active': + return `/items/item-${stateIndex}/details` + default: + return `/items/item-${stateIndex}` + } +} + +export function getSourceUrl(caseId: LinkCaseId, stateIndex: number): string { + if (!Number.isInteger(stateIndex) || stateIndex < 0 || stateIndex > 3) { + throw new Error(`Invalid Link performance state: ${stateIndex}`) + } + const pathname = sourcePath(caseId, stateIndex) + if (caseId === 'rewrites') { + return `/app/${LOCALES[stateIndex]}${pathname}` + } + return url( + pathname, + sourceSearch(caseId, stateIndex), + caseId === 'location-updaters' ? `source-${stateIndex}` : '', + ) +} + +// These expectations use fixture values and platform encoding, not router APIs. +function expectedHref(caseId: LinkCaseId, stateIndex: number, index: number) { + const itemId = `item-${index % 40}` + switch (caseId) { + case 'shared-params': + return `/items/${itemId}` + case 'unique-params': + return `/items/item-${index}` + case 'param-updaters': + return `/items/item-${stateIndex}-related-${index % 40}` + case 'location-updaters': + return url( + `/items/item-${stateIndex}`, + { + ...sourceSearch(caseId, stateIndex), + page: stateIndex + 2 + (index % 5), + }, + `source-${stateIndex}-link-${index % 5}`, + ) + case 'relative': + return url( + index % 2 === 0 + ? `/teams/team-${stateIndex}` + : `/teams/team-${stateIndex}/item-${stateIndex}/details`, + sourceSearch(caseId, stateIndex), + ) + case 'middleware': + return url(`/filtered/${itemId}`, { + tenant: `tenant-${stateIndex}`, + page: index % 2 === 0 ? undefined : 2, + filter: { ...sourceFilter(index % 4), tag: `LABEL-${index % 40}` }, + }) + case 'numeric-params': + return `/numbers/${stateIndex + (index % 40)}` + case 'optional-params': { + const category = + index % 3 === 0 + ? 'fixed' + : index % 3 === 1 + ? optionalCategory(stateIndex) + : undefined + return `/optional/${category ? `${category}/` : ''}${itemId}` + } + case 'splats': { + const value = splatValue(index) + return `/files${value ? `/${value.split('/').map(encodeURIComponent).join('/')}` : ''}` + } + case 'encoding': { + const value = encodeURIComponent(encodedValue(index)) + .replaceAll('%40', '@') + .replaceAll('%3A', ':') + .replaceAll('%2B', '+') + return `/encoded/${value}` + } + case 'masks': + return url(`/public/display-${index % 40}`, { + tenant: `mask-${index % 4}`, + }) + case 'rewrites': + return url(`/app/${LOCALES[index % 4]}/items/${itemId}`, { + page: (index % 3) + 1, + }) + case 'active': { + const item = Math.floor(index / 5) + const variant = index % 5 + const search = + variant < 3 + ? { filter: sourceFilter(item % 4) } + : { + ...sourceSearch('active', item % 4), + ...(variant === 4 ? { filter: undefined } : {}), + } + return url(`/items/item-${item}${variant < 2 ? '' : '/details'}`, search) + } + } +} + +function assertUrl( + actualHref: string | null, + expectedHref: string, + label: string, +) { + if (actualHref === null) { + throw new Error(`${label}: missing href`) + } + const actual = new URL(actualHref, 'http://localhost') + const expected = new URL(expectedHref, 'http://localhost') + // Query ordering and the platform's '+' versus '%20' are immaterial here. + const query = (value: URL) => + JSON.stringify([...value.searchParams.entries()].sort()) + if ( + actual.origin !== expected.origin || + actual.pathname !== expected.pathname || + actual.hash !== expected.hash || + query(actual) !== query(expected) + ) { + throw new Error( + `${label}: expected ${expectedHref}, received ${actualHref}`, + ) + } +} + +export function assertScenario( + caseId: LinkCaseId, + stateIndex: number, + root: ParentNode, +): void { + const source = root.querySelector('[data-testid="source-path"]') + if (source?.textContent !== sourcePath(caseId, stateIndex)) { + throw new Error( + `${caseId}/${stateIndex}: unexpected source path ${source?.textContent}`, + ) + } + const links = root.querySelectorAll('a[data-perf-link]') + if (links.length !== LINK_COUNT) { + throw new Error( + `${caseId}: expected ${LINK_COUNT} Links, got ${links.length}`, + ) + } + for (const [index, link] of links.entries()) { + const label = `${caseId}/${stateIndex}/link-${index}` + if (link.getAttribute('data-perf-link') !== String(index)) { + throw new Error(`${label}: unexpected Link order`) + } + assertUrl( + link.getAttribute('href'), + expectedHref(caseId, stateIndex, index), + label, + ) + let active: boolean | undefined + if (caseId === 'shared-params') { + active = index % 40 === stateIndex + } else if (caseId === 'unique-params') { + active = index === stateIndex + } else if (caseId === 'active') { + active = + Math.floor(index / 5) === stateIndex && [0, 2, 3].includes(index % 5) + if ( + link.textContent !== `${index}:${active ? 'active' : 'inactive'}` || + link.getAttribute('title') !== (active ? 'active' : 'inactive') || + !link.classList.contains(active ? 'perf-active' : 'perf-inactive') || + link.style.color !== (active ? 'green' : 'gray') || + link.style.opacity !== '0.8' + ) { + throw new Error( + `${label}: active props or render children are incorrect`, + ) + } + } + if ( + active !== undefined && + (link.getAttribute('data-status') === 'active') !== active + ) { + throw new Error(`${label}: expected active=${active}`) + } + } + for (let state = 0; state < 4; state++) { + const control = root.querySelector(`[data-testid="go-state-${state}"]`) + if (!control || control.hasAttribute('data-perf-link')) { + throw new Error(`${caseId}: missing or measured control Link ${state}`) + } + assertUrl( + control.getAttribute('href'), + getSourceUrl(caseId, state), + `${caseId}/control-${state}`, + ) + } +} diff --git a/benchmarks/client-nav/link-performance/client.bench.ts b/benchmarks/client-nav/link-performance/client.bench.ts new file mode 100644 index 0000000000..086fadd161 --- /dev/null +++ b/benchmarks/client-nav/link-performance/client.bench.ts @@ -0,0 +1,31 @@ +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { LINK_CASES } from './cases' +import { createClientScenario, samplingOptions } from './scenario' +import type * as App from './src/client' + +const appModulePath = './dist/client/app.js' +const app: typeof App = await import(/* @vite-ignore */ appModulePath) +if (app.serverEnvironment !== false) { + throw new Error('Link client benchmarks must use the production client build') +} + +for (const { id, label } of LINK_CASES) { + describe(label, () => { + const scenario = createClientScenario(app, id) + function finish() { + try { + scenario.check() + } finally { + scenario.teardown() + } + } + beforeEach(scenario.setup) + afterEach(finish) + + bench(`client Links: ${id}`, scenario.batch, { + ...samplingOptions, + setup: scenario.setup, + teardown: finish, + }) + }) +} diff --git a/benchmarks/client-nav/link-performance/config.test.ts b/benchmarks/client-nav/link-performance/config.test.ts new file mode 100644 index 0000000000..3f2624677f --- /dev/null +++ b/benchmarks/client-nav/link-performance/config.test.ts @@ -0,0 +1,57 @@ +import { afterEach, describe, expect, test, vi } from 'vitest' +import { createLinkPerformanceConfig } from './config' + +afterEach(() => vi.unstubAllEnvs()) + +describe.each(['client', 'ssr'] as const)( + '%s opt-in configuration', + (target) => { + test.each([undefined, '', '0', 'false'])( + 'does not discover benchmarks with TSR_LINK_PERF=%s', + (value) => { + vi.stubEnv('TSR_LINK_PERF', value) + const config = createLinkPerformanceConfig(target) + expect(config.test?.benchmark?.include).toEqual([]) + expect(config.test?.passWithNoTests).toBe(true) + }, + ) + + test('discovers only the requested suite when explicitly enabled', () => { + vi.stubEnv('TSR_LINK_PERF', '1') + const config = createLinkPerformanceConfig(target) + expect(config.test?.benchmark?.include).toEqual([`${target}.bench.ts`]) + expect(config.test?.passWithNoTests).toBe(false) + }) + + test('builds production code for the correct environment', () => { + const config = createLinkPerformanceConfig(target) + expect(config.define?.['process.env.NODE_ENV']).toBe('"production"') + expect(config.resolve?.conditions).toContain( + target === 'ssr' ? 'node' : 'browser', + ) + expect(config.build?.ssr).toBe(target === 'ssr') + expect(config.build?.outDir).toBe(`./dist/${target}`) + expect(config.build?.rolldownOptions?.platform).toBe('node') + expect(config.build?.rolldownOptions?.external).toEqual([ + 'node:module', + 'module', + /^react(?:\/|$)/, + /^react-dom(?:\/|$)/, + ]) + }) + + test('does not retransform built bundles in the test environment', () => { + vi.stubEnv('VITEST', 'true') + const config = createLinkPerformanceConfig(target) + expect(config.ssr?.noExternal).toBeUndefined() + expect(config.test?.server?.deps?.external).toEqual([ + /\/link-performance\/dist\//, + ]) + }) + + test('bundles router dependencies when building app snapshots', () => { + vi.stubEnv('VITEST', undefined) + expect(createLinkPerformanceConfig(target).ssr?.noExternal).toBe(true) + }) + }, +) diff --git a/benchmarks/client-nav/link-performance/config.ts b/benchmarks/client-nav/link-performance/config.ts new file mode 100644 index 0000000000..ef5e4f29ca --- /dev/null +++ b/benchmarks/client-nav/link-performance/config.ts @@ -0,0 +1,71 @@ +import { fileURLToPath } from 'node:url' +import react from '@vitejs/plugin-react' +import codspeedPlugin from '@codspeed/vitest-plugin' +import type { UserConfig } from 'vite' + +const root = fileURLToPath(new URL('.', import.meta.url)) + +export function createLinkPerformanceConfig( + target: 'client' | 'ssr', +): UserConfig { + const server = target === 'ssr' + const enabled = process.env.TSR_LINK_PERF === '1' + + return { + root, + define: { + 'process.env.NODE_ENV': JSON.stringify('production'), + }, + plugins: [ + !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) && + codspeedPlugin(), + react(), + ], + resolve: { + conditions: [server ? 'node' : 'browser', 'production'], + }, + ssr: { + noExternal: process.env.VITEST ? undefined : true, + resolve: { + conditions: ['node', 'production'], + }, + }, + build: { + outDir: `./dist/${target}`, + emptyOutDir: true, + minify: false, + ssr: server, + lib: { + entry: `${root}src/${target}.tsx`, + formats: ['es'], + fileName: 'app', + }, + rolldownOptions: { + platform: 'node', + external: [ + 'node:module', + 'module', + /^react(?:\/|$)/, + /^react-dom(?:\/|$)/, + ], + output: { entryFileNames: 'app.js' }, + }, + }, + test: { + name: `react-link-performance-${target}`, + watch: false, + environment: server ? 'node' : 'jsdom', + setupFiles: server ? [] : ['../vitest.setup.ts'], + server: { + deps: { + external: [/\/link-performance\/dist\//], + }, + }, + include: [], + passWithNoTests: !enabled, + benchmark: { + include: enabled ? [`${target}.bench.ts`] : [], + }, + }, + } +} diff --git a/benchmarks/client-nav/link-performance/project.json b/benchmarks/client-nav/link-performance/project.json new file mode 100644 index 0000000000..548a92c872 --- /dev/null +++ b/benchmarks/client-nav/link-performance/project.json @@ -0,0 +1,82 @@ +{ + "name": "@benchmarks/react-link-performance", + "projectType": "application", + "tags": ["optional-benchmark"], + "targets": { + "build:client": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": [ + { + "projects": ["@tanstack/react-router"], + "target": "build" + } + ], + "options": { + "command": "NODE_ENV=production vite build --config ./link-performance/vite.client.config.ts", + "cwd": "benchmarks/client-nav" + } + }, + "build:ssr": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": [ + { + "projects": ["@tanstack/react-router"], + "target": "build" + } + ], + "options": { + "command": "NODE_ENV=production vite build --config ./link-performance/vite.ssr.config.ts", + "cwd": "benchmarks/client-nav" + } + }, + "test:perf:client": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": ["build:client"], + "options": { + "command": "NODE_ENV=production vitest bench --config ./link-performance/vite.client.config.ts", + "cwd": "benchmarks/client-nav" + } + }, + "test:perf:ssr": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": ["build:ssr"], + "options": { + "command": "NODE_ENV=production vitest bench --config ./link-performance/vite.ssr.config.ts", + "cwd": "benchmarks/client-nav" + } + }, + "test:perf:stable": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": ["build:client", "build:ssr"], + "options": { + "command": "NODE_ENV=production node --import=@swc-node/register/esm-register benchmarks/client-nav/link-performance/stable-runner.ts" + } + }, + "test:unit": { + "executor": "nx:run-commands", + "dependsOn": [], + "options": { + "command": "vitest run --config ./link-performance/vitest.config.ts", + "cwd": "benchmarks/client-nav" + } + }, + "test:types": { + "executor": "nx:run-commands", + "dependsOn": [ + { + "projects": ["@tanstack/react-router"], + "target": "build" + } + ], + "options": { + "command": "tsc -p ./link-performance/tsconfig.json --noEmit", + "cwd": "benchmarks/client-nav" + } + } + } +} diff --git a/benchmarks/client-nav/link-performance/scenario.ts b/benchmarks/client-nav/link-performance/scenario.ts new file mode 100644 index 0000000000..f1a3fb6df7 --- /dev/null +++ b/benchmarks/client-nav/link-performance/scenario.ts @@ -0,0 +1,114 @@ +import { JSDOM } from 'jsdom' +import { createScenarioSetup } from '../scenarios/harness' +import { ticksPerIteration } from '../scenarios/links/shared' +import { NAVIGATION_STATES, assertScenario, getSourceUrl } from './cases' +import type { LinkCaseId } from './cases' +import type * as ClientApp from './src/client' +import type * as SsrApp from './src/ssr' + +export interface LinkScenario { + setup: () => Promise + batch: () => Promise + check: () => void + teardown: () => void +} + +export const samplingOptions = { + warmupIterations: 100, + warmupTime: 1_000, + time: 5_000, + throws: true, +} + +export function createClientScenario( + app: typeof ClientApp, + id: LinkCaseId, +): LinkScenario { + let mounted: ReturnType | undefined + let container: HTMLElement | undefined + let anchors: Array = [] + const test = createScenarioSetup({ + frameworkLabel: 'React', + mount: (element, history) => { + container = element + mounted = app.mountTestApp(element, history, id) + return mounted + }, + initialUrl: getSourceUrl(id, 0), + steps: NAVIGATION_STATES.map((state) => `go-state-${state}`), + assertAfterStep: (index, element) => { + assertScenario(id, NAVIGATION_STATES[index]!, element) + if (!mounted) { + throw new Error('Link benchmark app was not mounted') + } + mounted.assertStateUpdates() + }, + }) + + return { + async setup() { + await test.before() + if (!container) { + throw new Error('Link benchmark container was not created') + } + anchors = [...container.querySelectorAll('a[data-perf-link]')] + }, + async batch() { + for (let index = 0; index < ticksPerIteration; index++) { + await test.tick() + } + await test.finishBatch() + }, + check() { + if (!container || !mounted) { + throw new Error('Link benchmark app was not mounted') + } + assertScenario(id, 0, container) + mounted.assertStateUpdates() + if (mounted.router.history.length !== 1) { + throw new Error('Link benchmark history must remain bounded') + } + const current = container.querySelectorAll('a[data-perf-link]') + if (anchors.some((anchor, index) => current[index] !== anchor)) { + throw new Error('Measured Links must stay mounted across navigations') + } + }, + teardown: test.after, + } +} + +export function createSsrScenario( + app: typeof SsrApp, + id: LinkCaseId, +): LinkScenario { + let html = '' + let state = 0 + function check() { + const dom = new JSDOM(html) + try { + assertScenario(id, state, dom.window.document) + } finally { + dom.window.close() + } + } + + return { + async setup() { + for (const nextState of NAVIGATION_STATES) { + state = nextState + html = await app.renderScenario(id, state, true) + check() + } + }, + async batch() { + for (const nextState of NAVIGATION_STATES) { + state = nextState + html = await app.renderScenario(id, state) + } + }, + check, + teardown() { + html = '' + }, + } +} diff --git a/benchmarks/client-nav/link-performance/src/client.tsx b/benchmarks/client-nav/link-performance/src/client.tsx new file mode 100644 index 0000000000..a187ee8c15 --- /dev/null +++ b/benchmarks/client-nav/link-performance/src/client.tsx @@ -0,0 +1,29 @@ +import { RouterProvider } from '@tanstack/react-router' +import { isServer } from '@tanstack/router-core/isServer' +import { createRoot } from 'react-dom/client' +import { assertStateUpdates, createLinkRouter } from './workload' +import type { LinkRouter } from './workload' +import type { RouterHistory } from '@tanstack/history' +import type { LinkCaseId } from '../cases' + +export const serverEnvironment: boolean | undefined = isServer + +export function mountTestApp( + container: HTMLElement, + history: RouterHistory, + caseId: LinkCaseId, +): { + router: LinkRouter + unmount: () => void + assertStateUpdates: () => void +} { + const router = createLinkRouter(caseId, history, false) + const root = createRoot(container) + root.render() + + return { + router, + unmount: () => root.unmount(), + assertStateUpdates: () => assertStateUpdates(router), + } +} diff --git a/benchmarks/client-nav/link-performance/src/ssr.tsx b/benchmarks/client-nav/link-performance/src/ssr.tsx new file mode 100644 index 0000000000..491191b1f9 --- /dev/null +++ b/benchmarks/client-nav/link-performance/src/ssr.tsx @@ -0,0 +1,29 @@ +import { RouterProvider, createMemoryHistory } from '@tanstack/react-router' +import { isServer } from '@tanstack/router-core/isServer' +import { renderToString } from 'react-dom/server' +import { getSourceUrl } from '../cases' +import { assertStateUpdates, createLinkRouter } from './workload' +import type { LinkCaseId } from '../cases' + +export const serverEnvironment: boolean | undefined = isServer + +export async function renderScenario( + caseId: LinkCaseId, + stateIndex: number, + verify = false, +) { + const history = createMemoryHistory({ + initialEntries: [getSourceUrl(caseId, stateIndex)], + }) + const router = createLinkRouter(caseId, history, true) + try { + await router.load() + const html = renderToString() + if (verify) { + assertStateUpdates(router) + } + return html + } finally { + history.destroy() + } +} diff --git a/benchmarks/client-nav/link-performance/src/workload.tsx b/benchmarks/client-nav/link-performance/src/workload.tsx new file mode 100644 index 0000000000..8315b85b8b --- /dev/null +++ b/benchmarks/client-nav/link-performance/src/workload.tsx @@ -0,0 +1,506 @@ +import { + Link, + Outlet, + createRootRouteWithContext, + createRoute, + createRouter, + linkOptions, + retainSearchParams, + stripSearchParams, + useLocation, +} from '@tanstack/react-router' +import { + LINK_COUNT, + LOCALES, + encodedValue, + optionalCategory, + sourceFilter, + sourceSearch, + splatValue, +} from '../cases' +import type { RouterHistory } from '@tanstack/history' +import type { SearchSchemaInput } from '@tanstack/react-router' +import type { Filter, LinkCaseId, LinkSearch } from '../cases' + +interface StateUpdates { + calls: number + verifiedCalls: number + input: number + output: number + offset: number +} + +interface WorkloadContext { + caseId: LinkCaseId + stateUpdates: StateUpdates +} + +function isFilter(value: unknown): value is Filter { + return ( + typeof value === 'object' && + value !== null && + 'tag' in value && + typeof value.tag === 'string' && + 'flags' in value && + typeof value.flags === 'object' && + value.flags !== null && + 'open' in value.flags && + typeof value.flags.open === 'boolean' && + 'tags' in value && + Array.isArray(value.tags) && + value.tags.every((tag: unknown) => typeof tag === 'string') + ) +} + +const rootRoute = createRootRouteWithContext()({ + validateSearch: ( + search: Record & SearchSchemaInput, + ): LinkSearch => ({ + page: typeof search.page === 'number' ? search.page : undefined, + tenant: typeof search.tenant === 'string' ? search.tenant : undefined, + filter: isFilter(search.filter) ? search.filter : undefined, + }), + component: RootLayout, +}) + +const itemsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'items/$itemId', +}) +const detailsRoute = createRoute({ + getParentRoute: () => itemsRoute, + path: 'details', +}) +const teamRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'teams/$teamId', +}) +const teamItemRoute = createRoute({ + getParentRoute: () => teamRoute, + path: '$itemId', +}) +const teamDetailsRoute = createRoute({ + getParentRoute: () => teamItemRoute, + path: 'details', +}) +const filteredRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'filtered/$itemId', + search: { + middlewares: [ + retainSearchParams(['tenant']), + stripSearchParams({ page: 1 }), + ({ search, next }) => { + const result = next(search) + return { + ...result, + filter: result.filter + ? { ...result.filter, tag: result.filter.tag.trim().toUpperCase() } + : undefined, + } + }, + ], + }, +}) +const numericRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'numbers/$number', + params: { + parse: ({ number }) => { + const value = Number(number) + if (!Number.isFinite(value)) { + throw new Error(`Invalid number: ${number}`) + } + return { number: value } + }, + stringify: ({ number }) => ({ number: String(number) }), + }, +}) +const optionalRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'optional/{-$category}/$itemId', +}) +const splatRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'files/$', +}) +const encodedRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'encoded/$value', +}) +const publicRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'public/$itemId', +}) + +const routeTree = rootRoute.addChildren([ + itemsRoute.addChildren([detailsRoute]), + teamRoute.addChildren([teamItemRoute.addChildren([teamDetailsRoute])]), + filteredRoute, + numericRoute, + optionalRoute, + splatRoute, + encodedRoute, + publicRoute, +]) + +const localeRewrite = { + input: ({ url }: { url: URL }) => { + const match = /^\/(en|fr|de|es)(\/.*)$/.exec(url.pathname) + if (match) { + url.pathname = match[2]! + url.searchParams.set('tenant', match[1]!) + } + return url + }, + output: ({ url }: { url: URL }) => { + const locale = url.searchParams.get('tenant') + if (locale) { + url.searchParams.delete('tenant') + url.pathname = `/${locale}${url.pathname}` + } + return url + }, +} + +export function createLinkRouter( + caseId: LinkCaseId, + history: RouterHistory, + isServer: boolean, +) { + const context: WorkloadContext = { + caseId, + stateUpdates: { + calls: 0, + verifiedCalls: 0, + input: 0, + output: 0, + offset: 0, + }, + } + return createRouter({ + routeTree, + history, + isServer, + context, + scrollRestoration: false, + defaultPreload: false, + trailingSlash: 'never', + pathParamsAllowedCharacters: + caseId === 'encoding' ? ['@', ':', '+'] : undefined, + ...(caseId === 'rewrites' + ? { basepath: '/app', rewrite: localeRewrite } + : {}), + }) +} + +export type LinkRouter = ReturnType + +declare module '@tanstack/react-router' { + interface Register { + router: LinkRouter + } +} + +declare module '@tanstack/history' { + interface HistoryState { + linkPerfState?: number + } +} + +// Call alongside DOM assertions, outside the timed loop, after each sample. +export function assertStateUpdates(router: LinkRouter): void { + const { caseId, stateUpdates } = router.options.context + if (caseId !== 'location-updaters') { + return + } + const input = router.state.location.state.linkPerfState ?? 0 + if ( + stateUpdates.calls - stateUpdates.verifiedCalls < LINK_COUNT || + stateUpdates.input !== input || + stateUpdates.output !== input + stateUpdates.offset || + stateUpdates.offset < 1 || + stateUpdates.offset > 40 + ) { + throw new Error( + 'Link history-state updaters did not run with current state', + ) + } + stateUpdates.verifiedCalls = stateUpdates.calls +} + +function sourceOptions(caseId: LinkCaseId, stateIndex: number) { + const itemId = `item-${stateIndex}` + const common = { + search: sourceSearch(caseId, stateIndex), + hash: caseId === 'location-updaters' ? `source-${stateIndex}` : '', + state: { linkPerfState: stateIndex + 10 }, + } + switch (caseId) { + case 'relative': + return linkOptions({ + ...common, + to: '/teams/$teamId/$itemId', + params: { teamId: `team-${stateIndex}`, itemId }, + }) + case 'numeric-params': + return linkOptions({ + ...common, + to: '/numbers/$number', + params: { number: stateIndex }, + }) + case 'optional-params': + return linkOptions({ + ...common, + to: '/optional/{-$category}/$itemId', + params: { category: optionalCategory(stateIndex), itemId }, + }) + case 'splats': + return linkOptions({ + ...common, + to: '/files/$', + params: { _splat: `source/state-${stateIndex}` }, + }) + case 'encoding': + return linkOptions({ + ...common, + to: '/encoded/$value', + params: { value: `source-${stateIndex}` }, + }) + case 'active': + return linkOptions({ + ...common, + to: '/items/$itemId/details', + params: { itemId }, + }) + default: + return linkOptions({ + ...common, + to: '/items/$itemId', + params: { itemId }, + }) + } +} + +const indexes = Array.from({ length: LINK_COUNT }, (_, index) => index) +const controls = [0, 1, 2, 3] as const + +function SourcePath() { + const pathname = useLocation({ select: (location) => location.pathname }) + return {pathname} +} + +function RootLayout() { + const context = rootRoute.useRouteContext() + return ( + <> + + +
+ {indexes.map((index) => measuredLink(context, index))} +
+ + + ) +} + +function measuredLink( + { caseId, stateUpdates }: WorkloadContext, + index: number, +) { + const common = { + key: index, + 'data-perf-link': index, + preload: false, + children: `Link ${index}`, + } as const + const itemId = `item-${index % 40}` + switch (caseId) { + case 'shared-params': + case 'unique-params': + return ( + + ) + case 'param-updaters': + return ( + ({ + itemId: `${previous.itemId}-related-${index % 40}`, + })} + /> + ) + case 'location-updaters': + return ( + ({ + ...previous, + page: (previous.page ?? 1) + 1 + (index % 5), + })} + hash={(previous) => `${previous}-link-${index % 5}`} + state={(previous) => { + const input = previous.linkPerfState ?? 0 + const offset = (index % 40) + 1 + const output = input + offset + stateUpdates.calls++ + stateUpdates.input = input + stateUpdates.output = output + stateUpdates.offset = offset + return { ...previous, linkPerfState: output } + }} + /> + ) + case 'relative': + return ( + + ) + case 'middleware': + return ( + + ) + case 'numeric-params': + return ( + ({ number: previous.number + (index % 40) })} + /> + ) + case 'optional-params': + return ( + + ) + case 'splats': + return ( + + ) + case 'encoding': + return ( + + ) + case 'masks': + return ( + + ) + case 'rewrites': + return ( + + ) + case 'active': { + const item = Math.floor(index / 5) + const variant = index % 5 + return ( + ({ + className: 'perf-active', + title: 'active', + style: { color: 'green' }, + })} + inactiveProps={() => ({ + className: 'perf-inactive', + title: 'inactive', + style: { color: 'gray' }, + })} + > + {({ isActive }) => `${index}:${isActive ? 'active' : 'inactive'}`} + + ) + } + } +} diff --git a/benchmarks/client-nav/link-performance/ssr.bench.ts b/benchmarks/client-nav/link-performance/ssr.bench.ts new file mode 100644 index 0000000000..2a4b431292 --- /dev/null +++ b/benchmarks/client-nav/link-performance/ssr.bench.ts @@ -0,0 +1,31 @@ +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { LINK_CASES } from './cases' +import { createSsrScenario, samplingOptions } from './scenario' +import type * as App from './src/ssr' + +const appUrl = new URL('./dist/ssr/app.js', import.meta.url).href +const app: typeof App = await import(/* @vite-ignore */ appUrl) +if (app.serverEnvironment !== true) { + throw new Error('Link SSR benchmarks must use the production server build') +} + +for (const { id, label } of LINK_CASES) { + describe(label, () => { + const scenario = createSsrScenario(app, id) + function finish() { + try { + scenario.check() + } finally { + scenario.teardown() + } + } + beforeEach(scenario.setup) + afterEach(finish) + + bench(`SSR Links: ${id}`, scenario.batch, { + ...samplingOptions, + setup: scenario.setup, + teardown: finish, + }) + }) +} diff --git a/benchmarks/client-nav/link-performance/stable-runner.ts b/benchmarks/client-nav/link-performance/stable-runner.ts new file mode 100644 index 0000000000..d947a14f21 --- /dev/null +++ b/benchmarks/client-nav/link-performance/stable-runner.ts @@ -0,0 +1,274 @@ +import { fork } from 'node:child_process' +import { createHash } from 'node:crypto' +import { + copyFileSync, + mkdirSync, + mkdtempSync, + readFileSync, + rmSync, + writeFileSync, +} from 'node:fs' +import { dirname, resolve } from 'node:path' +import { fileURLToPath } from 'node:url' +import { parseArgs } from 'node:util' +import { LINK_CASES } from './cases' +import { classify, mean, summarizeRatios } from './statistics' +import type { LinkCaseId } from './cases' +import type { + BlockSample, + Mode, + Variant, + WorkerRequest, + WorkerResponse, +} from './worker-protocol' + +const projectRoot = fileURLToPath(new URL('.', import.meta.url)) +const workspaceRoot = resolve(projectRoot, '../../..') + +function startWorker() { + const child = fork( + fileURLToPath(new URL('./stable-worker.ts', import.meta.url)), + { + cwd: workspaceRoot, + env: { ...process.env, NODE_ENV: 'production' }, + execArgv: [ + '--import=@swc-node/register/esm-register', + '--random-seed=42', + '--hash-seed=42', + ], + stdio: ['ignore', 'ignore', 'pipe', 'ipc'], + }, + ) + let stderr = '' + child.stderr?.on('data', (data: Buffer) => { + stderr = (stderr + data.toString()).slice(-4_096) + }) + + function request(message: WorkerRequest): Promise { + return new Promise((resolveResponse, reject) => { + const timeout = setTimeout(() => { + finish( + new Error(`Sampling worker timed out: ${message.kind}\n${stderr}`), + ) + }, 60_000) + const onExit = (code: number | null) => + finish(new Error(`Sampling worker exited (${code})\n${stderr}`)) + const onError = (error: Error) => finish(error) + const onMessage = (response: WorkerResponse) => { + if (response.kind === 'error') { + finish(new Error(response.message)) + } else { + finish(undefined, response) + } + } + function finish(error?: Error, response?: WorkerResponse) { + clearTimeout(timeout) + child.off('message', onMessage) + child.off('error', onError) + child.off('exit', onExit) + if (error) { + reject(error) + } else if (response) { + resolveResponse(response) + } + } + child.once('message', onMessage) + child.once('error', onError) + child.once('exit', onExit) + child.send(message, (error) => { + if (error) { + finish(error) + } + }) + }) + } + + return { + request, + kill: () => child.kill(), + } +} + +async function sampleReplica( + mode: Mode, + caseId: LinkCaseId, + baseline: string, + current: string, + replica: number, +) { + const worker = startWorker() + const samples: Array> = [[], []] + const ratios: Array<{ cpu: number; wall: number }> = [] + try { + const starts: Array = [] + // Balance module initialization and which variant finishes warming last. + const startupOrder: Array = replica % 2 ? [1, 0] : [0, 1] + for (const index of startupOrder) { + const ready = await worker.request({ + kind: 'init', + mode, + caseId, + bundle: index === 0 ? baseline : current, + variant: index, + }) + if (ready.kind !== 'ready') { + throw new Error('Expected a ready sampling worker') + } + starts[index] = ready.batchMs + } + const iterations = Math.max(1, Math.ceil(500 / Math.min(...starts))) + for (let round = 0; round < 2; round++) { + const block: Array> = [[], []] + const order: Array = + (round + replica) % 2 ? [1, 0, 0, 1] : [0, 1, 1, 0] + for (const index of order) { + const result = await worker.request({ + kind: 'measure', + iterations, + variant: index, + }) + if (result.kind !== 'sample') { + throw new Error('Expected a block measurement') + } + samples[index]!.push(result.sample) + block[index]!.push(result.sample) + } + ratios.push({ + cpu: + mean(block[1]!.map((s) => s.cpuMs)) / + mean(block[0]!.map((s) => s.cpuMs)), + wall: + mean(block[1]!.map((s) => s.wallMs)) / + mean(block[0]!.map((s) => s.wallMs)), + }) + } + const response = await worker.request({ kind: 'stop' }) + if (response.kind !== 'stopped') { + throw new Error('Expected successful post-measurement assertions') + } + return { + iterations, + baseline: samples[0]!, + current: samples[1]!, + cpuRatio: Math.exp(mean(ratios.map((r) => Math.log(r.cpu)))), + wallRatio: Math.exp(mean(ratios.map((r) => Math.log(r.wall)))), + } + } finally { + worker.kill() + } +} + +async function main() { + if (process.env.TSR_LINK_PERF !== '1') { + console.log('Link performance sampling is disabled; set TSR_LINK_PERF=1.') + return + } + const { values } = parseArgs({ + options: { + baseline: { type: 'string' }, + current: { type: 'string', default: resolve(projectRoot, 'dist') }, + mode: { type: 'string', default: 'all' }, + repeats: { type: 'string', default: '4' }, + outputJson: { type: 'string' }, + testNamePattern: { type: 'string', short: 't' }, + }, + }) + if (!values.baseline || !values.outputJson) { + throw new Error( + 'Specify --baseline and --outputJson ', + ) + } + const repeats = Number(values.repeats) + if (!Number.isInteger(repeats) || repeats < 3 || repeats > 11) { + throw new Error('--repeats must be an integer between 3 and 11') + } + if (!['all', 'client', 'ssr'].includes(values.mode)) { + throw new Error('--mode must be all, client, or ssr') + } + const modes: Array = + values.mode === 'all' + ? ['client', 'ssr'] + : values.mode === 'client' + ? ['client'] + : ['ssr'] + const pattern = values.testNamePattern + ? new RegExp(values.testNamePattern) + : undefined + const cases = LINK_CASES.filter( + (c) => !pattern || pattern.test(`${c.label} ${c.id}`), + ) + if (!cases.length) { + throw new Error('No Link workloads match the requested pattern') + } + const report: { + protocol: string + node: string + complete: boolean + results: Array<{ + mode: Mode + caseId: LinkCaseId + baselineSha256: string + currentSha256: string + replicas: Array>> + cpu: ReturnType + wall: ReturnType + verdict: ReturnType + }> + } = { + protocol: + 'fresh process per case/replica; shared React runtime; separately loaded router variants; 2 ABBA/BAAB rounds; ~500ms calibrated fixed-work blocks; >=2s/100 batches warmup; main-thread CPU and wall time; fixed V8 random/hash seeds', + node: process.version, + complete: false, + results: [], + } + const output = resolve(values.outputJson) + mkdirSync(dirname(output), { recursive: true }) + mkdirSync(resolve(projectRoot, 'dist'), { recursive: true }) + const staging = mkdtempSync(resolve(projectRoot, 'dist/comparison-')) + try { + for (const mode of modes) { + const baselineInput = resolve(values.baseline, mode, 'app.js') + const currentInput = resolve(values.current, mode, 'app.js') + // Both snapshots resolve React from the same package installation. + const baseline = resolve(staging, `baseline-${mode}.mjs`) + const current = resolve(staging, `current-${mode}.mjs`) + copyFileSync(baselineInput, baseline) + copyFileSync(currentInput, current) + const digest = (file: string) => + createHash('sha256').update(readFileSync(file)).digest('hex') + const baselineSha256 = digest(baseline) + const currentSha256 = digest(current) + for (const { id } of cases) { + const replicas = [] + for (let replica = 0; replica < repeats; replica++) { + replicas.push( + await sampleReplica(mode, id, baseline, current, replica), + ) + } + const cpu = summarizeRatios(replicas.map((r) => r.cpuRatio)) + const wall = summarizeRatios(replicas.map((r) => r.wallRatio)) + const verdict = classify(cpu, wall) + report.results.push({ + mode, + caseId: id, + baselineSha256, + currentSha256, + replicas, + cpu, + wall, + verdict, + }) + writeFileSync(output, JSON.stringify(report, null, 2)) + console.log( + `${mode} ${id}: CPU ${cpu.changePercent.toFixed(2)}% [${cpu.low95.toFixed(2)}, ${cpu.high95.toFixed(2)}], wall ${wall.changePercent.toFixed(2)}% [${wall.low95.toFixed(2)}, ${wall.high95.toFixed(2)}] ${verdict}`, + ) + } + } + report.complete = true + writeFileSync(output, JSON.stringify(report, null, 2)) + } finally { + rmSync(staging, { recursive: true }) + } +} + +await main() diff --git a/benchmarks/client-nav/link-performance/stable-worker.ts b/benchmarks/client-nav/link-performance/stable-worker.ts new file mode 100644 index 0000000000..d98679dc15 --- /dev/null +++ b/benchmarks/client-nav/link-performance/stable-worker.ts @@ -0,0 +1,112 @@ +import { pathToFileURL } from 'node:url' +import { createClientScenario, createSsrScenario } from './scenario' +import type { LinkScenario } from './scenario' +import type { WorkerRequest, WorkerResponse } from './worker-protocol' +import type * as ClientApp from './src/client' +import type * as SsrApp from './src/ssr' + +const scenarios: Array = [] +const creationOrder: Array = [] +let closeWindow = () => {} + +function reply(response: WorkerResponse) { + if (!process.send) { + throw new Error('The Link sampling worker requires an IPC parent') + } + process.send(response) +} + +async function handle(request: WorkerRequest) { + if (request.kind === 'init') { + if (typeof process.threadCpuUsage !== 'function') { + throw new Error( + 'Stable sampling requires Node.js with process.threadCpuUsage', + ) + } + if (scenarios[request.variant]) { + throw new Error('A worker must only initialize each variant once') + } + let scenario: LinkScenario + const bundleUrl = pathToFileURL(request.bundle) + bundleUrl.searchParams.set('linkPerfVariant', String(request.variant)) + if (request.mode === 'client') { + const { window } = await import('../jsdom') + closeWindow = () => window.close() + const app: typeof ClientApp = await import(bundleUrl.href) + if (app.serverEnvironment !== false) { + throw new Error('Expected a production client bundle') + } + scenario = createClientScenario(app, request.caseId) + } else { + const app: typeof SsrApp = await import(bundleUrl.href) + if (app.serverEnvironment !== true) { + throw new Error('Expected a production SSR bundle') + } + scenario = createSsrScenario(app, request.caseId) + } + scenarios[request.variant] = scenario + creationOrder.push(scenario) + await scenario.setup() + const start = performance.now() + let iterations = 0 + do { + await scenario.batch() + iterations++ + } while (iterations < 100 || performance.now() - start < 2_000) + reply({ + kind: 'ready', + batchMs: (performance.now() - start) / iterations, + }) + return + } + if (request.kind === 'measure') { + const scenario = scenarios[request.variant] + if (!scenario) { + throw new Error('The sampling worker has not been initialized') + } + if (!Number.isInteger(request.iterations) || request.iterations < 1) { + throw new Error('Expected a positive batch count') + } + const cpuStart = process.threadCpuUsage() + const processStart = process.cpuUsage() + const start = performance.now() + for (let index = 0; index < request.iterations; index++) { + await scenario.batch() + } + const wallMs = performance.now() - start + const cpu = process.threadCpuUsage(cpuStart) + const processCpu = process.cpuUsage(processStart) + reply({ + kind: 'sample', + sample: { + iterations: request.iterations, + wallMs: wallMs / request.iterations, + cpuMs: (cpu.user + cpu.system) / 1_000 / request.iterations, + processCpuMs: + (processCpu.user + processCpu.system) / 1_000 / request.iterations, + }, + }) + return + } + try { + for (const scenario of creationOrder) { + scenario.check() + } + } finally { + for (const scenario of creationOrder.reverse()) { + scenario.teardown() + } + closeWindow() + } + reply({ kind: 'stopped' }) +} + +process.on('message', (request: WorkerRequest) => { + void handle(request).catch((error: unknown) => { + reply({ + kind: 'error', + message: + error instanceof Error ? error.stack || error.message : String(error), + }) + }) +}) diff --git a/benchmarks/client-nav/link-performance/statistics.test.ts b/benchmarks/client-nav/link-performance/statistics.test.ts new file mode 100644 index 0000000000..8f5f37413b --- /dev/null +++ b/benchmarks/client-nav/link-performance/statistics.test.ts @@ -0,0 +1,36 @@ +import { expect, test } from 'vitest' +import { classify, mean, summarizeRatios } from './statistics' + +test('summarizes multiplicative paired changes across process replicas', () => { + const result = summarizeRatios([0.9, 0.9, 0.9, 0.9]) + expect(result.changePercent).toBeCloseTo(-10) + expect(result.low95).toBeCloseTo(-10) + expect(result.high95).toBeCloseTo(-10) + expect(result.replicas).toBe(4) +}) + +test('does not turn opposite noisy runs into a conclusive result', () => { + const result = summarizeRatios([0.9, 1.1, 0.95, 1.05]) + expect(result.low95).toBeLessThan(0) + expect(result.high95).toBeGreaterThan(0) + expect(classify(result, result)).toBe('inconclusive') +}) + +test('requires CPU and wall time to corroborate a direction', () => { + const slower = summarizeRatios([1.08, 1.09, 1.08, 1.09]) + const faster = summarizeRatios([0.9, 0.91, 0.9, 0.91]) + expect(classify(slower, slower)).toBe('slower') + expect(classify(faster, faster)).toBe('faster') + expect(classify(slower, faster)).toBe('inconclusive') + expect(classify(summarizeRatios([1, 1, 1]), summarizeRatios([1, 1, 1]))).toBe( + 'within-2%', + ) +}) + +test('rejects incomplete or invalid sampling data', () => { + expect(() => summarizeRatios([1])).toThrow() + expect(() => summarizeRatios([0, 1])).toThrow() + expect(() => summarizeRatios([NaN, 1])).toThrow() + expect(() => mean([])).toThrow() + expect(() => mean([Infinity])).toThrow() +}) diff --git a/benchmarks/client-nav/link-performance/statistics.ts b/benchmarks/client-nav/link-performance/statistics.ts new file mode 100644 index 0000000000..469bdaf65a --- /dev/null +++ b/benchmarks/client-nav/link-performance/statistics.ts @@ -0,0 +1,57 @@ +const critical95 = [ + 12.7062, 4.3027, 3.1824, 2.7764, 2.5706, 2.4469, 2.3646, 2.306, 2.2622, + 2.2281, +] + +export function mean(values: ReadonlyArray) { + if (!values.length || values.some((value) => !Number.isFinite(value))) { + throw new Error('Expected finite, nonempty samples') + } + return values.reduce((sum, value) => sum + value, 0) / values.length +} + +export function summarizeRatios(ratios: ReadonlyArray) { + if ( + ratios.length < 2 || + ratios.length > 11 || + ratios.some((value) => value <= 0) + ) { + throw new Error('Expected 2-11 independent positive process-replica ratios') + } + const logs = ratios.map(Math.log) + const center = mean(logs) + const variance = + logs.reduce((sum, value) => sum + (value - center) ** 2, 0) / + (logs.length - 1) + // Replicas, not the many correlated batches inside a worker, are the samples. + const margin = + critical95[logs.length - 2]! * Math.sqrt(variance / logs.length) + const percent = (value: number) => (Math.exp(value) - 1) * 100 + return { + changePercent: percent(center), + low95: percent(center - margin), + high95: percent(center + margin), + replicas: ratios.length, + } +} + +export function classify( + cpu: ReturnType, + wall: ReturnType, +) { + if (cpu.low95 > 0 && wall.low95 > 0) { + return 'slower' + } + if (cpu.high95 < 0 && wall.high95 < 0) { + return 'faster' + } + if ( + cpu.low95 >= -2 && + cpu.high95 <= 2 && + wall.low95 >= -2 && + wall.high95 <= 2 + ) { + return 'within-2%' + } + return 'inconclusive' +} diff --git a/benchmarks/client-nav/link-performance/tsconfig.json b/benchmarks/client-nav/link-performance/tsconfig.json new file mode 100644 index 0000000000..fbf230c977 --- /dev/null +++ b/benchmarks/client-nav/link-performance/tsconfig.json @@ -0,0 +1,15 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "jsx": "react-jsx", + "jsxImportSource": "react", + "types": ["node", "vite/client", "vitest/globals"] + }, + "include": [ + "./**/*.ts", + "./**/*.tsx", + "../scenarios/harness.ts", + "../setup-helpers.ts", + "../vitest.setup.ts" + ] +} diff --git a/benchmarks/client-nav/link-performance/vite.client.config.ts b/benchmarks/client-nav/link-performance/vite.client.config.ts new file mode 100644 index 0000000000..1cd45fc45e --- /dev/null +++ b/benchmarks/client-nav/link-performance/vite.client.config.ts @@ -0,0 +1,3 @@ +import { createLinkPerformanceConfig } from './config' + +export default createLinkPerformanceConfig('client') diff --git a/benchmarks/client-nav/link-performance/vite.ssr.config.ts b/benchmarks/client-nav/link-performance/vite.ssr.config.ts new file mode 100644 index 0000000000..f59148eaf6 --- /dev/null +++ b/benchmarks/client-nav/link-performance/vite.ssr.config.ts @@ -0,0 +1,3 @@ +import { createLinkPerformanceConfig } from './config' + +export default createLinkPerformanceConfig('ssr') diff --git a/benchmarks/client-nav/link-performance/vitest.config.ts b/benchmarks/client-nav/link-performance/vitest.config.ts new file mode 100644 index 0000000000..f8454c819d --- /dev/null +++ b/benchmarks/client-nav/link-performance/vitest.config.ts @@ -0,0 +1,11 @@ +import { fileURLToPath } from 'node:url' +import { defineConfig } from 'vitest/config' + +export default defineConfig({ + root: fileURLToPath(new URL('.', import.meta.url)), + test: { + watch: false, + environment: 'node', + include: ['*.test.ts'], + }, +}) diff --git a/benchmarks/client-nav/link-performance/worker-protocol.ts b/benchmarks/client-nav/link-performance/worker-protocol.ts new file mode 100644 index 0000000000..474858a529 --- /dev/null +++ b/benchmarks/client-nav/link-performance/worker-protocol.ts @@ -0,0 +1,28 @@ +import type { LinkCaseId } from './cases' + +export type Mode = 'client' | 'ssr' +export type Variant = 0 | 1 + +export type WorkerRequest = + | { + kind: 'init' + mode: Mode + caseId: LinkCaseId + bundle: string + variant: Variant + } + | { kind: 'measure'; iterations: number; variant: Variant } + | { kind: 'stop' } + +export interface BlockSample { + wallMs: number + cpuMs: number + processCpuMs: number + iterations: number +} + +export type WorkerResponse = + | { kind: 'ready'; batchMs: number } + | { kind: 'sample'; sample: BlockSample } + | { kind: 'stopped' } + | { kind: 'error'; message: string } diff --git a/benchmarks/ssr/README.md b/benchmarks/ssr/README.md index 625e1006c5..1f1c232922 100644 --- a/benchmarks/ssr/README.md +++ b/benchmarks/ssr/README.md @@ -98,3 +98,19 @@ Use `react`, `solid`, or `vue` for ``. The baseline projects use `@be - Server-function loops must include `sec-fetch-site: same-origin` so the default CSRF middleware accepts the request. - Loops that expect non-200 responses pass a custom `validateResponse` to `runRequestLoop`. - Bench loops must build deterministic requests from the seeded random helper and consume response bodies through `runRequestLoop` or `runSsrRequestLoop`. + +## Optional React Link workloads + +The [opt-in Link suite](../client-nav/README.md#opt-in-react-link-performance-suite) +adds focused standalone React Router SSR coverage for params/updaters, +inheritance, search middlewares, optional/splat segments, encoding, masks, +rewrites, and active props. Each timed batch creates four fresh routers and +renders their Links to HTML; it does not measure Start HTTP/streaming overhead. + +```bash +TSR_LINK_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:ssr --outputStyle=stream --skipRemoteCache -- --run +``` + +These cases are excluded from this directory's aggregate projects and normal +CodSpeed dependency graph. The flag must be explicitly enabled when invoking +the dedicated target. From 9b2adaf8c3fca905f156c42f6a4fe17a787afcc8 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:01 +0200 Subject: [PATCH 007/175] perf(router): optimize Link state props across frameworks (#8318) * perf(router): compact Solid and Vue Link state props Port the React Link bundle-size reductions to Solid and Vue: share exact/fuzzy pathname normalization, resolve only the selected active/inactive props, concatenate classes without temporary arrays, and avoid style allocation when neither source supplies styles. Vue forwards and visits one selected props object in both client and SSR paths. Keep framework-specific behavior: Solid retains its default-styling fast path and base href/handler precedence; Vue retains state-prop overrides and zero-argument callbacks. Both keep style snapshots so mutable Solid stores and Vue proxies remain reactive, including additions to empty style objects. No public API or unrelated production code changes. Official gzip measurements versus d4cc307869: - Solid minimal: 34017 -> 33973 (-44 bytes). - Solid full: 38973 -> 38930 (-43 bytes). - Vue minimal: 50731 -> 50646 (-85 bytes). - Vue full: 56484 -> 56395 (-89 bytes). All nine Solid/Vue Router/Start fixtures shrink by 26-104 gzip bytes; all nine React fixtures remain byte-identical. Independent hunk attribution: active pathname checks save 36/41 Solid and 37/34 Vue bytes. State-prop changes alone save 0/2 Solid and 46/53 Vue bytes. Combined gzip deltas are not additive. Existing 200-Link/eight-navigation workloads were compared with frozen parent, props-only, and final bundles. Standalone wall-time runs were too variable for a speed claim. Interleaved fixed-seed checks, repeated with reversed module order, showed effectively flat rendering cost: Solid mean CPU -1.49% / +0.33%, Vue -0.23% / -0.29%; corresponding wall changes -1.81% / +0.50% and -0.12% / -0.33%. No incremental rendering speedup is claimed. Raw results and experiments remain in uncommitted LOG.md and session artifacts. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * fix(router): honor Link state props and Vue class bindings Apply selected active/inactive props after ordinary base props in Solid and React, including React server output. Preserve the dedicated class concatenation and style merge handling. Add client/server regressions for supported refs and event handlers; do not widen the state-prop API to router navigation options. Keep Vue object and nested-array class values intact instead of interpolating them into strings. Compose base/state values with Vue-compatible arrays, retain omitted-class behavior, and clone props at VNode creation because Vue normalizes class values in place. This preserves cached bindings and later reactive class changes. Vue ordinary state-attribute precedence was already correct and is left unchanged. The regressions were run on the pre-fix implementations and failed for the reported behaviors, then passed after the fixes. Full framework unit/type/lint/package and Chromium coverage passes. Bundle impact remains small: React/Solid raw bytes unchanged; Vue Router minimal/full are 14/10 gzip bytes smaller. Detailed red/green evidence and measurements are kept in uncommitted LOG.md and session artifacts. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * fix(solid-router): preserve computed Link routing props Restore the computed href, target, and disabled values after active/inactive state props. Keep state-prop ref/event overrides, class/style composition, and the default styling fast path unchanged for client and SSR rendering. Reproduce the history/rewrite href failures and extend existing state-prop regressions to cover conflicting routing fields. Full validation passes 922 client tests (one skipped), 33 server tests, type/lint/export checks, and 24 Chromium cases. The full bundle matrix adds 16/13 gzip bytes to Solid Router minimal/full and 13-17 bytes to Solid Start fixtures. React and Vue bundles are unchanged; no extra allocations or href recomputation are introduced. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/forty-loops-sing.md | 5 + .changeset/loud-weeks-boil.md | 7 + .changeset/six-adults-open.md | 6 + packages/react-router/src/link.tsx | 17 +- .../tests/link-state-props.test.tsx | 150 ++++++++++- packages/solid-router/src/link.tsx | 32 ++- .../solid-router/tests/link-style.test.tsx | 218 ++++++++++++++++ .../tests/server/link-style.test.tsx | 109 ++++++++ packages/vue-router/src/link.tsx | 124 ++++----- .../vue-router/tests/link-style-ssr.test.tsx | 82 ++++++ packages/vue-router/tests/link-style.test.tsx | 242 ++++++++++++++++++ 11 files changed, 887 insertions(+), 105 deletions(-) create mode 100644 .changeset/forty-loops-sing.md create mode 100644 .changeset/loud-weeks-boil.md create mode 100644 .changeset/six-adults-open.md create mode 100644 packages/solid-router/tests/link-style.test.tsx create mode 100644 packages/solid-router/tests/server/link-style.test.tsx create mode 100644 packages/vue-router/tests/link-style-ssr.test.tsx create mode 100644 packages/vue-router/tests/link-style.test.tsx diff --git a/.changeset/forty-loops-sing.md b/.changeset/forty-loops-sing.md new file mode 100644 index 0000000000..7200420363 --- /dev/null +++ b/.changeset/forty-loops-sing.md @@ -0,0 +1,5 @@ +--- +'@tanstack/solid-router': patch +--- + +Keep Solid Link's computed `href`, `target`, and `disabled` values authoritative when active or inactive state props contain routing options, while preserving state-prop refs, event handlers, and class/style merging. diff --git a/.changeset/loud-weeks-boil.md b/.changeset/loud-weeks-boil.md new file mode 100644 index 0000000000..9df1ba41b7 --- /dev/null +++ b/.changeset/loud-weeks-boil.md @@ -0,0 +1,7 @@ +--- +'@tanstack/react-router': patch +'@tanstack/solid-router': patch +'@tanstack/vue-router': patch +--- + +Allow active and inactive Link props to override base element props in React and Solid while preserving class/style merging. Keep React's `href`, `target`, and `disabled` values controlled by routing options. Preserve Vue object and nested-array class bindings, including reactive updates and server rendering, without mutating cached bindings during VNode normalization. diff --git a/.changeset/six-adults-open.md b/.changeset/six-adults-open.md new file mode 100644 index 0000000000..f5486a5ff9 --- /dev/null +++ b/.changeset/six-adults-open.md @@ -0,0 +1,6 @@ +--- +'@tanstack/solid-router': patch +'@tanstack/vue-router': patch +--- + +Reduce Link bundle size by sharing exact/fuzzy active-path checks and resolving only the selected active or inactive props. Avoid unnecessary class/style allocations while preserving reactive style updates, server rendering, and each framework's prop-override behavior. diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index c0e2ddc4e3..4418032784 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -363,12 +363,16 @@ export function useLinkProps< return out })() + const blockedLink = !disabled && !hrefOption + return { ...propsSafeToSpread, - ...resolvedActiveProps, - ...resolvedInactiveProps, - href: hrefOption, + ...(blockedLink ? resolvedActiveProps : STATIC_EMPTY_OBJECT), + ...(blockedLink ? resolvedInactiveProps : STATIC_EMPTY_OBJECT), ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], + ...(!blockedLink ? resolvedActiveProps : STATIC_EMPTY_OBJECT), + ...(!blockedLink ? resolvedInactiveProps : STATIC_EMPTY_OBJECT), + href: hrefOption, disabled: !!linkDisabled, target, ...(resolvedStyle && { style: resolvedStyle }), @@ -560,6 +564,8 @@ export function useLinkProps< } } + const blockedLink = isActive === undefined + // Only one state contributes props, so resolve and merge it once. const resolvedStateProps: React.HTMLAttributes = functionalUpdate(isActive ? (activeProps as any) : inactiveProps, {}) ?? @@ -619,8 +625,7 @@ export function useLinkProps< return { ...propsSafeToSpread, - ...resolvedStateProps, - href, + ...(blockedLink ? resolvedStateProps : STATIC_EMPTY_OBJECT), ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], onClick: composeHandlers(onClick, handleClick), onBlur: composeHandlers(onBlur, handleLeave), @@ -628,6 +633,8 @@ export function useLinkProps< onMouseEnter: composeHandlers(onMouseEnter, enqueuePreload), onMouseLeave: composeHandlers(onMouseLeave, handleLeave), onTouchStart: composeHandlers(onTouchStart, handleTouchStart), + ...(!blockedLink ? resolvedStateProps : STATIC_EMPTY_OBJECT), + href, disabled: !!linkDisabled, target, ...(resolvedStyle && { style: resolvedStyle }), diff --git a/packages/react-router/tests/link-state-props.test.tsx b/packages/react-router/tests/link-state-props.test.tsx index 6f205b2020..1a17cfaab9 100644 --- a/packages/react-router/tests/link-state-props.test.tsx +++ b/packages/react-router/tests/link-state-props.test.tsx @@ -1,19 +1,27 @@ import React from 'react' import { renderToString } from 'react-dom/server' import { hydrateRoot } from 'react-dom/client' -import { act, cleanup, render } from '@testing-library/react' +import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' import { afterEach, expect, test, vi } from 'vitest' import { Link, RouterContextProvider, + RouterProvider, createLink, createMemoryHistory, createRootRoute, createRoute, createRouter, + useLinkProps, } from '../src' -afterEach(cleanup) +const disposers: Array<() => void> = [] +afterEach(() => { + cleanup() + for (const dispose of disposers.splice(0)) { + dispose() + } +}) test('blocked custom links keep the validated props and forwarded ref', () => { const CustomLink = createLink( @@ -246,20 +254,36 @@ test('external destinations skip state props across mounted link transitions', a } }) -test.each([false, true])( - 'active links preserve styling while disabled changes (masked=%s)', - async (masked) => { +test.each([ + { active: true, masked: false, server: false }, + { active: true, masked: true, server: false }, + { active: false, masked: false, server: false }, + { active: false, masked: true, server: false }, + { active: true, masked: false, server: true }, + { active: true, masked: true, server: true }, + { active: false, masked: false, server: true }, + { active: false, masked: true, server: true }, +])( + 'state props preserve routing while disabled changes (active: $active, masked: $masked, server: $server)', + async ({ active, masked, server }) => { const root = createRootRoute() const router = createRouter({ routeTree: root.addChildren([ createRoute({ getParentRoute: () => root, path: '/active' }), + createRoute({ getParentRoute: () => root, path: '/inactive' }), ]), - history: createMemoryHistory({ initialEntries: ['/active'] }), + history: createMemoryHistory({ + initialEntries: [active ? '/active' : '/inactive'], + }), + isServer: server, }) + disposers.push(router.history.destroy) await router.load() - const activeProps = { - className: 'active-state', + const stateProps = { + className: 'state-class', href: 'javascript:active()', + target: '_self', + disabled: false, } const content = (disabled: boolean) => ( @@ -267,18 +291,37 @@ test.each([false, true])( to="/active" mask={masked ? { to: '/masked' } : undefined} disabled={disabled} - activeProps={activeProps} + target="_blank" + activeProps={stateProps} + inactiveProps={stateProps} > Target ) - const view = render(content(false)) + const view = server ? undefined : render(content(false)) for (const disabled of [false, true, false]) { - view.rerender(content(disabled)) - const anchor = view.getByText('Target') - expect(anchor).toHaveClass('active-state') - expect(anchor).toHaveAttribute('aria-current', 'page') + let anchor: HTMLElement + if (view) { + view.rerender(content(disabled)) + anchor = view.getByText('Target') + } else { + const container = document.createElement('div') + container.innerHTML = renderToString(content(disabled)) + const link = container.querySelector('a') + expect(link).not.toBeNull() + if (!link) { + throw new Error('Expected the server-rendered Link') + } + anchor = link + } + expect(anchor).toHaveClass('state-class') + expect(anchor).toHaveAttribute('target', '_blank') + if (active) { + expect(anchor).toHaveAttribute('aria-current', 'page') + } else { + expect(anchor).not.toHaveAttribute('aria-current') + } if (disabled) { expect(anchor).not.toHaveAttribute('href') expect(anchor).toHaveAttribute('aria-disabled', 'true') @@ -353,3 +396,82 @@ test('functional state props preserve styling and href precedence across transit warn.mockRestore() } }) + +test.each([ + { active: true, server: false }, + { active: false, server: false }, + { active: true, server: true }, + { active: false, server: true }, +])( + 'selected state props override base props (active: $active, server: $server)', + async ({ active, server }) => { + const baseClick = vi.fn() + const selectedClick = vi.fn((event: React.MouseEvent) => + event.preventDefault(), + ) + const unusedClick = vi.fn() + const stateRef = React.createRef() + let resolvedRef: React.Ref | undefined + const stateProps = { + ref: stateRef, + title: 'state title', + onClick: selectedClick, + className: 'state-class', + style: { color: 'blue' }, + } + const history = createMemoryHistory({ initialEntries: ['/target'] }) + disposers.push(history.destroy) + function TestLink() { + const props = useLinkProps({ + to: active ? '/target' : '/', + target: '_blank', + title: 'base title', + onClick: baseClick, + className: 'base', + style: { color: 'red', marginTop: 2 }, + activeProps: active ? stateProps : { onClick: unusedClick }, + inactiveProps: active ? { onClick: unusedClick } : stateProps, + preload: false, + }) + resolvedRef = props.ref + return Override + } + const root = createRootRoute({ component: TestLink }) + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/' }), + createRoute({ getParentRoute: () => root, path: '/target' }), + ]), + history, + isServer: server, + scrollRestoration: false, + }) + + let link: HTMLElement + if (server) { + await router.load() + const container = document.createElement('div') + container.innerHTML = renderToString() + const anchor = container.querySelector('a') + expect(anchor).not.toBeNull() + if (!anchor) { + throw new Error('Expected the server-rendered Link') + } + link = anchor + } else { + render() + link = await screen.findByRole('link', { name: 'Override' }) + } + + expect(resolvedRef).toBe(stateRef) + expect(link).toHaveAttribute('title', 'state title') + expect(link).toHaveClass('base', 'state-class') + expect(link.style).toMatchObject({ color: 'blue', marginTop: '2px' }) + if (!server) { + fireEvent.click(link) + expect(selectedClick).toHaveBeenCalledOnce() + expect(baseClick).not.toHaveBeenCalled() + expect(unusedClick).not.toHaveBeenCalled() + } + }, +) diff --git a/packages/solid-router/src/link.tsx b/packages/solid-router/src/link.tsx index 95cc1e977f..ab5efb1d4d 100644 --- a/packages/solid-router/src/link.tsx +++ b/packages/solid-router/src/link.tsx @@ -253,20 +253,30 @@ export function useLinkProps< } } - // Active and inactive props are mutually exclusive. - const stateProps: ResolvedLinkStateProps = active - ? (functionalUpdate(local.activeProps as any, {}) ?? EMPTY_OBJECT) - : functionalUpdate(local.inactiveProps, {}) - const style = { - ...local.style, - ...stateProps.style, - } - const className = [local.class, stateProps.class].filter(Boolean).join(' ') + const stateProps: ResolvedLinkStateProps = + functionalUpdate(active ? local.activeProps : local.inactiveProps, {}) ?? + EMPTY_OBJECT + const baseStyle = local.style + const stateStyle = stateProps.style + // Snapshot reactive style properties so in-place updates remain observable. + const style = + baseStyle || stateStyle ? { ...baseStyle, ...stateStyle } : undefined + const baseClass = local.class + const stateClass = stateProps.class + const className = baseClass + ? stateClass + ? `${baseClass} ${stateClass}` + : baseClass + : stateClass return { - ...stateProps, ...base, - ...(hasKeys(style) ? { style } : undefined), + ...stateProps, + // State props can override element props, but not routing options. + href: base.href, + disabled: base.disabled, + target: base.target, + ...(style && hasKeys(style) ? { style } : undefined), ...(className ? { class: className } : undefined), ...(active && STATIC_ACTIVE_ATTRIBUTES), } as ResolvedLinkStateProps diff --git a/packages/solid-router/tests/link-style.test.tsx b/packages/solid-router/tests/link-style.test.tsx new file mode 100644 index 0000000000..5f7aacdbb1 --- /dev/null +++ b/packages/solid-router/tests/link-style.test.tsx @@ -0,0 +1,218 @@ +import * as Solid from 'solid-js' +import { createStore } from 'solid-js/store' +import { afterEach, expect, test, vi } from 'vitest' +import { + cleanup, + fireEvent, + render, + screen, + waitFor, +} from '@solidjs/testing-library' +import { + Link, + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, +} from '../src' + +const disposers: Array<() => void> = [] +afterEach(() => { + cleanup() + for (const dispose of disposers.splice(0)) { + dispose() + } +}) + +function renderLinks(Links: Solid.Component) { + const history = createMemoryHistory({ initialEntries: ['/target'] }) + disposers.push(history.destroy) + const root = createRootRoute({ + component: () => ( + <> + + + + ), + }) + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/' }), + createRoute({ getParentRoute: () => root, path: '/target' }), + ]), + history, + scrollRestoration: false, + defaultPreload: false, + }) + render(() => ) + return router +} + +test.each([true, false])( + 'selected state props override element props but not routing options (active: %s)', + async (active) => { + const baseClick = vi.fn() + const selectedClick = vi.fn((event: MouseEvent) => event.preventDefault()) + const unusedClick = vi.fn() + const selectedRef = vi.fn() + const stateProps = { + ref: selectedRef, + title: 'state title', + onClick: selectedClick, + class: 'state-class', + style: { color: 'blue' }, + href: '/state-href', + target: '_self', + disabled: true, + } + renderLinks(() => ( + + Override + + )) + const link = await screen.findByRole('link', { name: 'Override' }) + expect(selectedRef).toHaveBeenCalledOnce() + expect(selectedRef.mock.calls[0]?.[0]).toBe(link) + expect(link).toHaveAttribute('title', 'state title') + expect(link).toHaveAttribute('href', active ? '/target' : '/') + expect(link).toHaveAttribute('target', '_blank') + expect(link).not.toHaveAttribute('disabled') + expect(link).toHaveClass('base', 'state-class') + expect(link.style).toMatchObject({ color: 'blue', marginTop: '2px' }) + fireEvent.click(link) + expect(selectedClick).toHaveBeenCalledOnce() + expect(baseClick).not.toHaveBeenCalled() + expect(unusedClick).not.toHaveBeenCalled() + }, +) + +test('tracks additions to an initially empty state-only style store', async () => { + const [style, setStyle] = createStore({}) + renderLinks(() => ( + ({ style })}> + Reactive + + )) + const link = await screen.findByRole('link', { name: 'Reactive' }) + expect(link.style.color).toBe('') + setStyle('color', 'red') + await waitFor(() => expect(link.style.color).toBe('red')) + setStyle('color', undefined) + await waitFor(() => expect(link.style.color).toBe('')) +}) + +test('merges only the selected state and tracks reactive style properties', async () => { + const [base, setBase] = createStore({ + color: 'red', + 'margin-top': '2px', + }) + const [stateStyle, setStateStyle] = createStore({ + 'background-color': 'white', + }) + const [stateClass, setStateClass] = Solid.createSignal('selected') + const active = vi.fn(() => ({ + class: stateClass(), + style: stateStyle, + title: 'selected', + })) + const inactive = vi.fn(() => ({ + class: 'idle', + style: { color: 'gray' }, + title: 'idle', + })) + const router = renderLinks(() => ( + + Styled + + )) + const link = await screen.findByRole('link', { name: 'Styled' }) + expect(link).toHaveClass('base', 'selected') + expect(link.style).toMatchObject({ + color: 'red', + marginTop: '2px', + backgroundColor: 'white', + }) + expect(link).toHaveAttribute('href', '/target') + expect(inactive).not.toHaveBeenCalled() + + setBase('color', 'blue') + setStateStyle('background-color', 'black') + setStateClass('updated') + await waitFor(() => { + expect(link).toHaveClass('base', 'updated') + expect(link.style).toMatchObject({ + color: 'blue', + backgroundColor: 'black', + }) + }) + + await router.navigate({ to: '/' }) + await waitFor(() => { + expect(link).toHaveClass('base', 'idle') + expect(link).toHaveAttribute('title', 'idle') + expect(link.style).toMatchObject({ color: 'gray', marginTop: '2px' }) + expect(link.style.backgroundColor).toBe('') + }) + active.mockClear() + inactive.mockClear() + setBase('margin-top', '3px') + await waitFor(() => expect(link.style).toMatchObject({ marginTop: '3px' })) + expect(active).not.toHaveBeenCalled() + expect(inactive).toHaveBeenCalled() + + await router.navigate({ to: '/target' }) + await waitFor(() => { + expect(link).toHaveClass('base', 'updated') + expect(link.style).toMatchObject({ + color: 'blue', + backgroundColor: 'black', + }) + }) +}) + +test('switches between default and custom state props without stale attributes', async () => { + const [custom, setCustom] = Solid.createSignal(false) + const router = renderLinks(() => ( + + Defaults + + )) + const link = await screen.findByRole('link', { name: 'Defaults' }) + expect(link).toHaveClass('active') + setCustom(true) + await waitFor(() => { + expect(link).not.toHaveClass('active') + expect(link).toHaveAttribute('title', 'custom') + expect(link.style).toMatchObject({ color: 'red' }) + }) + setCustom(false) + await waitFor(() => { + expect(link).toHaveClass('active') + expect(link).not.toHaveAttribute('title') + expect(link.style.color).toBe('') + }) + await router.navigate({ to: '/' }) + await waitFor(() => expect(link).not.toHaveClass('active')) +}) diff --git a/packages/solid-router/tests/server/link-style.test.tsx b/packages/solid-router/tests/server/link-style.test.tsx new file mode 100644 index 0000000000..4ce962cde0 --- /dev/null +++ b/packages/solid-router/tests/server/link-style.test.tsx @@ -0,0 +1,109 @@ +import { JSDOM } from 'jsdom' +import { expect, test, vi } from 'vitest' +import { + Link, + createRootRoute, + createRoute, + createRouter, + useLinkProps, +} from '../../src' +import { + RouterServer, + createRequestHandler, + renderRouterToString, +} from '../../src/ssr/server' + +test('preserves routing options, selected state props, and styling during SSR', async () => { + const activeRef = vi.fn() + const inactiveRef = vi.fn() + let resolvedActiveRef: unknown + let resolvedInactiveRef: unknown + const active = vi.fn(() => ({ + class: 'selected', + style: { color: 'blue' }, + title: 'selected', + ref: activeRef, + href: '/state-active', + target: '_self', + disabled: true, + })) + const inactive = { + class: 'idle', + 'data-state': 'idle', + ref: inactiveRef, + href: '/state-inactive', + target: '_self', + disabled: true, + } + const unused = vi.fn(() => ({ class: 'unused' })) + const root = createRootRoute({ + component: () => { + const activeProps = useLinkProps({ + to: '/', + target: '_blank', + class: 'base', + style: { color: 'red', 'margin-top': '2px' }, + activeProps: active, + inactiveProps: unused, + }) + const inactiveProps = useLinkProps({ + to: '/other', + target: '_blank', + activeProps: unused, + inactiveProps: inactive, + }) + resolvedActiveRef = activeProps.ref + resolvedInactiveRef = inactiveProps.ref + return ( + <> + Active + Inactive + Default + + Empty + + + ) + }, + }) + const routeTree = root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/' }), + createRoute({ getParentRoute: () => root, path: '/other' }), + ]) + const handler = createRequestHandler({ + request: new Request('http://localhost/'), + createRouter: () => createRouter({ routeTree, isServer: true }), + }) + const response = await handler(({ router, responseHeaders }) => + renderRouterToString({ + router, + responseHeaders, + children: () => , + }), + ) + const dom = new JSDOM(await response.text()) + try { + const links = dom.window.document.querySelectorAll('a') + expect(links).toHaveLength(4) + expect([...links[0]!.classList]).toEqual(['base', 'selected']) + expect(links[0]!.style.color).toBe('blue') + expect(links[0]!.style.marginTop).toBe('2px') + expect(links[0]!.getAttribute('title')).toBe('selected') + expect(links[0]!.getAttribute('href')).toBe('/') + expect(links[0]!.getAttribute('target')).toBe('_blank') + expect(links[0]!.hasAttribute('disabled')).toBe(false) + expect(resolvedActiveRef).toBe(activeRef) + expect([...links[1]!.classList]).toEqual(['idle']) + expect(links[1]!.getAttribute('data-state')).toBe('idle') + expect(links[1]!.getAttribute('href')).toBe('/other') + expect(links[1]!.getAttribute('target')).toBe('_blank') + expect(links[1]!.hasAttribute('disabled')).toBe(false) + expect(resolvedInactiveRef).toBe(inactiveRef) + expect([...links[2]!.classList]).toEqual(['active']) + expect([...links[3]!.classList]).toEqual([]) + expect(active).toHaveBeenCalled() + expect(unused).not.toHaveBeenCalled() + } finally { + dom.window.close() + } +}) diff --git a/packages/vue-router/src/link.tsx b/packages/vue-router/src/link.tsx index d69046d7e0..e0a0789524 100644 --- a/packages/vue-router/src/link.tsx +++ b/packages/vue-router/src/link.tsx @@ -138,20 +138,17 @@ function useLinkPropsImpl( router, ) - const { - resolvedActiveProps, - resolvedInactiveProps, - resolvedClassName, - resolvedStyle, - } = resolveStyleProps(options, isActive) + const { resolvedProps, resolvedClass, resolvedStyle } = resolveStyleProps( + options, + isActive, + ) const result = combineResultProps({ href, options, isActive, - resolvedActiveProps, - resolvedInactiveProps, - resolvedClassName, + resolvedProps, + resolvedClass, resolvedStyle, }) @@ -425,21 +422,16 @@ function useLinkPropsImpl( return getExternalLinkProps(options, router, ref, staticEventHandlers) } - const { - resolvedActiveProps, - resolvedInactiveProps, - resolvedClassName, - resolvedStyle, - } = resolvedStyleProps.value + const { resolvedProps, resolvedClass, resolvedStyle } = + resolvedStyleProps.value return combineResultProps({ href: href.value, options, ref, staticEventHandlers, isActive: isActive.value, - resolvedActiveProps, - resolvedInactiveProps, - resolvedClassName, + resolvedProps, + resolvedClass, resolvedStyle, }) }) @@ -449,59 +441,48 @@ function useLinkPropsImpl( } function resolveStyleProps(options: AnyLinkPropsOptions, isActive: boolean) { - const activeProps = options.activeProps || (() => ({ class: 'active' })) - const resolvedActiveProps: StyledProps = (isActive - ? typeof activeProps === 'function' - ? activeProps() - : activeProps - : {}) || { class: undefined, style: undefined } + const props = + (isActive ? options.activeProps : options.inactiveProps) || + (isActive ? STATIC_ACTIVE_PROPS : EMPTY_OBJECT) + const resolvedProps: StyledProps = + (typeof props === 'function' ? props() : props) || EMPTY_OBJECT + const baseClass = options.class + const stateClass = resolvedProps.class + const resolvedClass = baseClass + ? stateClass + ? [baseClass, stateClass] + : baseClass + : stateClass + ? stateClass + : undefined - const inactiveProps = options.inactiveProps || (() => ({})) - - const resolvedInactiveProps: StyledProps = (isActive - ? {} - : typeof inactiveProps === 'function' - ? inactiveProps() - : inactiveProps) || { class: undefined, style: undefined } - - const classes = [ - options.class, - resolvedActiveProps?.class, - resolvedInactiveProps?.class, - ].filter(Boolean) - const resolvedClassName = classes.length ? classes.join(' ') : undefined - - const result: Record = {} - - // Merge styles from all sources - if (options.style) { - Object.assign(result, options.style) + const baseStyle = options.style + const stateStyle = resolvedProps.style + let resolvedStyle: Record | undefined + if (baseStyle || stateStyle) { + // Keep a snapshot of reactive styles rather than returning their proxy. + const style: Record = {} + Object.assign(style, baseStyle, stateStyle) + if (hasKeys(style)) { + resolvedStyle = style + } } - - if (resolvedActiveProps?.style) { - Object.assign(result, resolvedActiveProps.style) - } - - if (resolvedInactiveProps?.style) { - Object.assign(result, resolvedInactiveProps.style) - } - - const resolvedStyle = hasKeys(result) ? result : undefined return { - resolvedActiveProps, - resolvedInactiveProps, - resolvedClassName, + resolvedProps, + resolvedClass, resolvedStyle, } } +const STATIC_ACTIVE_PROPS = { class: 'active' } +const EMPTY_OBJECT = {} + function combineResultProps({ href, options, isActive, - resolvedActiveProps, - resolvedInactiveProps, - resolvedClassName, + resolvedProps, + resolvedClass, resolvedStyle, ref, staticEventHandlers, @@ -510,9 +491,8 @@ function combineResultProps({ href: string | undefined options: AnyLinkPropsOptions isActive: boolean - resolvedActiveProps: StyledProps - resolvedInactiveProps: StyledProps - resolvedClassName?: string + resolvedProps: StyledProps + resolvedClass?: StyledProps['class'] resolvedStyle?: Record ref?: Vue.VNodeRef | undefined staticEventHandlers?: LinkEventHandlers @@ -530,8 +510,8 @@ function combineResultProps({ result.style = resolvedStyle } - if (resolvedClassName) { - result.class = resolvedClassName + if (resolvedClass) { + result.class = resolvedClass } if (disabled) { @@ -544,15 +524,9 @@ function combineResultProps({ result['aria-current'] = 'page' } - for (const key of Object.keys(resolvedActiveProps)) { + for (const key of Object.keys(resolvedProps)) { if (key !== 'class' && key !== 'style') { - result[key] = resolvedActiveProps[key] - } - } - - for (const key of Object.keys(resolvedInactiveProps)) { - if (key !== 'class' && key !== 'style') { - result[key] = resolvedInactiveProps[key] + result[key] = resolvedProps[key] } } @@ -959,8 +933,8 @@ const LinkImpl = Vue.defineComponent({ ) } - // Return the component with props and children - return Vue.h(Component, linkProps, slotContent) + // Vue normalizes class bindings in place; preserve the cached bindings. + return Vue.h(Component, { ...linkProps }, slotContent) } }, }) diff --git a/packages/vue-router/tests/link-style-ssr.test.tsx b/packages/vue-router/tests/link-style-ssr.test.tsx new file mode 100644 index 0000000000..79af1f2164 --- /dev/null +++ b/packages/vue-router/tests/link-style-ssr.test.tsx @@ -0,0 +1,82 @@ +import * as Vue from 'vue' +import { renderToString } from 'vue/server-renderer' +import { expect, test, vi } from 'vitest' +import { + Link, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, +} from '../src' + +test('preserves selected state props and styling during SSR', async () => { + const active = vi.fn(() => ({ + class: ['selected', [{ 'active-object': true, hidden: false }]], + style: { color: 'blue' }, + title: 'selected', + })) + const unused = vi.fn(() => ({ class: 'unused' })) + const root = createRootRoute({ + component: () => + Vue.h(Vue.Fragment, [ + Vue.h( + Link, + { + to: '/', + class: 'base', + style: { color: 'red', marginTop: '2px' }, + activeProps: active, + inactiveProps: unused, + }, + () => 'Active', + ), + Vue.h( + Link, + { + to: '/other', + activeProps: unused, + inactiveProps: { class: { idle: true }, 'data-state': 'idle' }, + }, + () => 'Inactive', + ), + Vue.h(Link, { to: '/' }, () => 'Default'), + Vue.h(Link, { to: '/', activeProps: {} }, () => 'Empty'), + ]), + }) + const history = createMemoryHistory({ initialEntries: ['/'] }) + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/' }), + createRoute({ getParentRoute: () => root, path: '/other' }), + ]), + history, + isServer: true, + }) + try { + await router.load() + const html = await renderToString( + Vue.createSSRApp(() => Vue.h(RouterProvider, { router })), + ) + const container = document.createElement('div') + container.innerHTML = html + const links = container.querySelectorAll('a') + expect(links).toHaveLength(4) + expect([...links[0]!.classList]).toEqual([ + 'base', + 'selected', + 'active-object', + ]) + expect(links[0]!.style.color).toBe('blue') + expect(links[0]!.style.marginTop).toBe('2px') + expect(links[0]!.getAttribute('title')).toBe('selected') + expect(links[1]!.className).toBe('idle') + expect(links[1]!.getAttribute('data-state')).toBe('idle') + expect(links[2]!.className).toBe('active') + expect(links[3]!.className).toBe('') + expect(active).toHaveBeenCalledWith() + expect(unused).not.toHaveBeenCalled() + } finally { + history.destroy() + } +}) diff --git a/packages/vue-router/tests/link-style.test.tsx b/packages/vue-router/tests/link-style.test.tsx new file mode 100644 index 0000000000..d2c4e7891a --- /dev/null +++ b/packages/vue-router/tests/link-style.test.tsx @@ -0,0 +1,242 @@ +import * as Vue from 'vue' +import { afterEach, expect, test, vi } from 'vitest' +import { cleanup, render, screen, waitFor } from '@testing-library/vue' +import { + Link, + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, + useLinkProps, +} from '../src' + +const disposers: Array<() => void> = [] +afterEach(() => { + cleanup() + for (const dispose of disposers.splice(0)) { + dispose() + } +}) + +function renderLinks(Links: Vue.Component) { + const history = createMemoryHistory({ initialEntries: ['/target'] }) + disposers.push(history.destroy) + const root = createRootRoute({ + component: () => Vue.h(Vue.Fragment, [Vue.h(Links), Vue.h(Outlet)]), + }) + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/' }), + createRoute({ getParentRoute: () => root, path: '/target' }), + ]), + history, + scrollRestoration: false, + defaultPreload: false, + }) + render(Vue.h(RouterProvider, { router })) + return router +} + +test('preserves object and nested-array class bindings across state updates', async () => { + const activeClass = Vue.reactive({ selected: true, removed: false }) + const inactiveClass = Vue.reactive({ idle: true }) + const router = renderLinks(() => + Vue.h( + Link, + { + to: '/target', + class: ['base', { decorated: true }], + activeProps: () => ({ + class: ['active-state', [undefined, activeClass, ['nested']]], + }), + inactiveProps: { class: inactiveClass }, + }, + () => 'Class bindings', + ), + ) + const link = await screen.findByRole('link', { name: 'Class bindings' }) + expect([...link.classList]).toEqual([ + 'base', + 'decorated', + 'active-state', + 'selected', + 'nested', + ]) + activeClass.selected = false + activeClass.removed = true + await waitFor(() => { + expect(link).not.toHaveClass('selected') + expect(link).toHaveClass('removed', 'nested') + }) + await router.navigate({ to: '/' }) + await waitFor(() => { + expect([...link.classList]).toEqual(['base', 'decorated', 'idle']) + }) + inactiveClass.idle = false + await waitFor(() => + expect([...link.classList]).toEqual(['base', 'decorated']), + ) +}) + +test.each([false, true])( + 'useLinkProps retains class values rather than strings (with base: %s)', + async (withBase) => { + const baseClass = ['base', { decorated: true }] + const stateClass = { selected: true } + let binding: unknown + const HookLink = Vue.defineComponent({ + setup() { + const props = useLinkProps({ + to: '/target', + class: withBase ? baseClass : undefined, + activeProps: { class: stateClass }, + }) + return () => { + const resolved = Vue.unref(props) + binding = resolved.class + return Vue.h('a', { ...resolved }, 'Hook classes') + } + }, + }) + renderLinks(HookLink) + await screen.findByRole('link', { name: 'Hook classes' }) + if (withBase) { + expect(binding).toEqual([baseClass, stateClass]) + } else { + expect(binding).toBe(stateClass) + } + }, +) + +test('omits the class binding when neither source provides a class', async () => { + renderLinks(() => + Vue.h(Link, { to: '/target', activeProps: {} }, () => 'No classes'), + ) + const link = await screen.findByRole('link', { name: 'No classes' }) + expect(link).not.toHaveAttribute('class') +}) + +test('tracks additions to an initially empty state-only style proxy', async () => { + const style = Vue.reactive({}) + renderLinks(() => + Vue.h( + Link, + { to: '/target', activeProps: () => ({ style }) }, + () => 'Reactive', + ), + ) + const link = await screen.findByRole('link', { name: 'Reactive' }) + expect(link.style.color).toBe('') + style.color = 'red' + await waitFor(() => expect(link.style.color).toBe('red')) + delete style.color + await waitFor(() => expect(link.style.color).toBe('')) +}) + +test('merges only the selected state and tracks reactive style properties', async () => { + const base = Vue.reactive({ color: 'red', marginTop: '2px' }) + const stateStyle = Vue.reactive({ backgroundColor: 'white' }) + const stateClass = Vue.ref('selected') + const active = vi.fn(() => ({ + class: stateClass.value, + style: stateStyle, + title: 'selected', + href: '/state-href', + })) + const inactive = vi.fn(() => ({ + class: 'idle', + style: { color: 'gray' }, + title: 'idle', + })) + const router = renderLinks(() => + Vue.h( + Link, + { + to: '/target', + class: ['base', { decorated: true }], + style: base, + activeProps: active, + inactiveProps: inactive, + }, + () => 'Styled', + ), + ) + const link = await screen.findByRole('link', { name: 'Styled' }) + expect(link).toHaveClass('base', 'decorated', 'selected') + expect(link.style).toMatchObject({ + color: 'red', + marginTop: '2px', + backgroundColor: 'white', + }) + expect(link).toHaveAttribute('href', '/target') + expect(inactive).not.toHaveBeenCalled() + + base.color = 'blue' + stateStyle.backgroundColor = 'black' + stateClass.value = 'updated' + await waitFor(() => { + expect(link).toHaveClass('base', 'decorated', 'updated') + expect(link.style).toMatchObject({ + color: 'blue', + backgroundColor: 'black', + }) + }) + + await router.navigate({ to: '/' }) + await waitFor(() => { + expect(link).toHaveClass('base', 'idle') + expect(link).toHaveAttribute('title', 'idle') + expect(link).toHaveAttribute('href', '/target') + expect(link.style).toMatchObject({ color: 'gray', marginTop: '2px' }) + expect(link.style.backgroundColor).toBe('') + }) + active.mockClear() + inactive.mockClear() + base.marginTop = '3px' + await waitFor(() => expect(link.style).toMatchObject({ marginTop: '3px' })) + expect(active).not.toHaveBeenCalled() + expect(inactive).toHaveBeenCalled() + + await router.navigate({ to: '/target' }) + await waitFor(() => { + expect(link).toHaveClass('base', 'updated') + expect(link.style).toMatchObject({ + color: 'blue', + backgroundColor: 'black', + }) + }) +}) + +test('switches between default and custom state props without stale attributes', async () => { + const custom = Vue.ref(false) + const router = renderLinks(() => + Vue.h( + Link, + { + to: '/target', + activeProps: custom.value + ? { title: 'custom', style: { color: 'red' } } + : undefined, + }, + () => 'Defaults', + ), + ) + const link = await screen.findByRole('link', { name: 'Defaults' }) + expect(link).toHaveClass('active') + custom.value = true + await waitFor(() => { + expect(link).not.toHaveClass('active') + expect(link).toHaveAttribute('title', 'custom') + expect(link.style).toMatchObject({ color: 'red' }) + }) + custom.value = false + await waitFor(() => { + expect(link).toHaveClass('active') + expect(link).not.toHaveAttribute('title') + expect(link.style.color).toBe('') + }) + await router.navigate({ to: '/' }) + await waitFor(() => expect(link).not.toHaveClass('active')) +}) From 873c830ccb2610a864ee697250e10fcc99772ffa Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:02 +0200 Subject: [PATCH 008/175] refactor(router-core): clarify segment interpolation (#8319) Organize the generic interpolation loop into static, wildcard, and named-parameter behavior blocks. Keep one shared key lookup, one encoding step, and one prefix/value/suffix assembly. Name affix boundaries and keep optional/missing wildcard behavior local to its segment type. Replace the self-clearing onMissing callback with an optional metadata result object. The public interpolatePath wrapper reuses its existing result object; pathname-only callers still allocate no metadata. Preserve one parameter read, the reusable parser buffer, absent optional cache keys, canonical and legacy splat metadata, and public return values. Fast-path empty splat strings before the URL-safe regex so sharing the encoding step does not penalize omitted values. Final official gzip measurements versus 5017a72614: - React minimal: 85771 -> 85769 (-2 bytes). - React full: 89384 -> 89382 (-2 bytes). - All 18 fixtures range from -4 to +8 bytes; no unrelated source changes compensate for interpolation cost. Added mixed-type/affix metadata coverage and direct pathname-kernel benchmarks. Paired fixed-seed CPU measurements of the real parent/current modules show effectively flat required client pathname interpolation (+0.04%) and 0.37-4.14% lower time in the other sampled required/optional/splat/mixed/missing client/server combinations. These are focused kernel diagnostics, not a broad application speedup claim. Preserve the experiments, rejected larger variants, full fixture metrics, and raw benchmark output in uncommitted LOG.md and session artifacts. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/lucky-candies-smoke.md | 5 + packages/router-core/src/path.ts | 92 +++++++++++-------- .../tests/path-interpolation.bench.ts | 43 ++++++++- packages/router-core/tests/path.test.ts | 53 +++++++++++ 4 files changed, 155 insertions(+), 38 deletions(-) create mode 100644 .changeset/lucky-candies-smoke.md diff --git a/.changeset/lucky-candies-smoke.md b/.changeset/lucky-candies-smoke.md new file mode 100644 index 0000000000..29b62a90b9 --- /dev/null +++ b/.changeset/lucky-candies-smoke.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Simplify path interpolation into ordered segment-type blocks with shared prefix/value/suffix assembly. Preserve one-pass parsing and optional metadata collection, and reuse the public result object instead of allocating and clearing a missing-parameter callback. diff --git a/packages/router-core/src/path.ts b/packages/router-core/src/path.ts index b469ef3f1b..45239f177a 100644 --- a/packages/router-core/src/path.ts +++ b/packages/router-core/src/path.ts @@ -240,7 +240,9 @@ function encodeParam( if (key === '_splat') { // Early return if value only contains URL-safe characters (performance optimization) - if (/^[a-zA-Z0-9\-._~!/]*$/.test(value)) return value + if (!value || /^[a-zA-Z0-9\-._~!/]*$/.test(value)) { + return value + } // the splat/catch-all routes shouldn't have the '/' encoded out // Use encodeURIComponent for each segment to properly encode spaces, // plus signs, and other special characters that encodeURI leaves unencoded @@ -263,20 +265,21 @@ export function interpolatePath( options: InterpolatePathOptions, ): InterPolatePathResult { const { path, params, decoder, server } = options - const usedParams: Record = Object.create(null) - let isMissingParams = false - const interpolatedPath = interpolatePathname( - path || '/', + const result: InterPolatePathResult = { + interpolatedPath: path || '/', + usedParams: Object.create(null), + isMissingParams: false, + } + result.interpolatedPath = interpolatePathname( + result.interpolatedPath, params, decoder, - usedParams, + result.usedParams, undefined, server, - () => { - isMissingParams = true - }, + result, ) - return { interpolatedPath, usedParams, isMissingParams } + return result } /** @@ -290,7 +293,7 @@ export function interpolatePathname( usedParams?: Record, keys?: Array, server?: boolean, - onMissing?: () => void, + metadata?: { isMissingParams: boolean }, ): string { if (!path.includes('$')) { return path @@ -329,9 +332,8 @@ export function interpolatePathname( const key = splat ? '_splat' : part.substring(1) const value = params[key] keys?.push(key) - if (onMissing && !(splat ? value : key in params)) { - onMissing() - onMissing = undefined + if (metadata && (splat ? !value : !(key in params))) { + metadata.isMissingParams = true } if (usedParams) { usedParams[key] = value @@ -376,34 +378,50 @@ export function interpolatePathname( continue } - const splat = kind === SEGMENT_TYPE_WILDCARD - const optional = kind === SEGMENT_TYPE_OPTIONAL_PARAM - const key = splat ? '_splat' : path.substring(segment[2], segment[3]) - const valueRaw = params[key] + const prefixEnd = segment[1] + const suffixStart = segment[4] + const key = + kind === SEGMENT_TYPE_WILDCARD + ? '_splat' + : path.substring(segment[2], segment[3]) + let paramValue = params[key] keys?.push(key) - if (onMissing && !(splat ? valueRaw : optional || key in params)) { - onMissing() - onMissing = undefined - } - if (optional && valueRaw == null) { - continue - } - if (usedParams) { - usedParams[key] = valueRaw - if (splat) { + + if (kind === SEGMENT_TYPE_WILDCARD) { + if (usedParams) { + usedParams[key] = paramValue // TODO: Deprecate * - usedParams['*'] = valueRaw + usedParams['*'] = paramValue + } + if (!paramValue) { + if (metadata) { + metadata.isMissingParams = true + } + // A missing wildcard keeps its affixes, but omits a bare segment. + if (prefixEnd === start && suffixStart === end) { + continue + } + paramValue = '' + } + } else { + // Named parameters: $id or {-$id}. + if (kind === SEGMENT_TYPE_OPTIONAL_PARAM) { + if (paramValue == null) { + continue + } + } else if (metadata && !(key in params)) { + metadata.isMissingParams = true + } + if (usedParams) { + usedParams[key] = paramValue } } - const prefix = path.substring(start, segment[1]) - const suffix = path.substring(segment[4], end) - const emptySplat = splat && !valueRaw - if (emptySplat && !prefix && !suffix) { - continue - } - const value = emptySplat ? '' : encodeParam(key, valueRaw, decoder) - joined += '/' + prefix + value + suffix + joined += + '/' + + path.substring(start, prefixEnd) + + encodeParam(key, paramValue, decoder) + + path.substring(suffixStart, end) } if (path.endsWith('/')) { diff --git a/packages/router-core/tests/path-interpolation.bench.ts b/packages/router-core/tests/path-interpolation.bench.ts index baf1afd596..6b23200b8b 100644 --- a/packages/router-core/tests/path-interpolation.bench.ts +++ b/packages/router-core/tests/path-interpolation.bench.ts @@ -1,7 +1,11 @@ import { bench, describe, expect } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute } from '../src' -import { compileDecodeCharMap, interpolatePath } from '../src/path' +import { + compileDecodeCharMap, + interpolatePath, + interpolatePathname, +} from '../src/path' import { createTestRouter } from './routerTestUtils' type Options = Parameters[0] @@ -78,6 +82,17 @@ const scenarios: Array<{ name: string; inputs: Array }> = [ } }), }, + { + name: 'affixed mixed segments', + inputs: Array.from({ length: 200 }, (_, index) => ({ + path: '/root/prefix{$id}suffix/{-$language}/files/{$}.txt', + params: { + id: `item ${index % 40}`, + language: index % 2 ? 'en' : undefined, + _splat: index % 3 ? `docs/file ${index % 20}` : '', + }, + })), + }, ] const decoder = compileDecodeCharMap(['@', '+']) @@ -143,6 +158,32 @@ describe.each(scenarios)('$name', ({ inputs }) => { }, ) + bench( + 'pathname-only interpolation batch', + () => { + let length = 0 + for (const input of inputs) { + length += interpolatePathname( + input.path || '/', + input.params, + input.decoder, + undefined, + undefined, + input.server, + ).length + } + checksum = length + }, + { + time: 1500, + warmupTime: 500, + throws: true, + teardown: () => { + expect(checksum).toBe(expected) + }, + }, + ) + bench( 'uncached interpolation batch', () => { diff --git a/packages/router-core/tests/path.test.ts b/packages/router-core/tests/path.test.ts index 02a3df746f..004b97403c 100644 --- a/packages/router-core/tests/path.test.ts +++ b/packages/router-core/tests/path.test.ts @@ -3,6 +3,7 @@ import { compileDecodeCharMap, exactPathTest, interpolatePath, + interpolatePathname, removeTrailingSlash, resolvePath, trimPathLeft, @@ -204,6 +205,58 @@ describe.each([false, true])( ).toEqual({ _splat: 'docs/guide', '*': 'docs/guide' }) }) + it.each([ + { + params: { id: 'one two', _splat: 'docs/file name' }, + path: '/root/prefixone%20twosuffix/files/docs/file%20name.txt', + used: { + id: 'one two', + _splat: 'docs/file name', + '*': 'docs/file name', + }, + missing: false, + }, + { + params: { id: '', language: '', _splat: '' }, + path: '/root/prefixsuffix//files/.txt', + used: { id: '', language: '', _splat: '', '*': '' }, + missing: true, + }, + { + params: {}, + path: '/root/prefixundefinedsuffix/files/.txt', + used: { id: undefined, _splat: undefined, '*': undefined }, + missing: true, + }, + ])( + 'keeps mixed segment metadata in one pass for $params', + ({ params, path, used, missing }) => { + const template = '/root/prefix{$id}suffix/{-$language}/files/{$}.txt' + const usedParams: Record = Object.create(null) + const keys: Array = [] + const metadata = { isMissingParams: false } + expect( + interpolatePathname( + template, + params, + undefined, + usedParams, + keys, + server, + metadata, + ), + ).toBe(path) + expect(keys).toEqual(['id', 'language', '_splat']) + expect(usedParams).toEqual(used) + expect(metadata.isMissingParams).toBe(missing) + expect(interpolatePath({ path: template, params, server })).toEqual({ + interpolatedPath: path, + usedParams: used, + isMissingParams: missing, + }) + }, + ) + it.each([ { path: '/$first/$second', From f151ab018eede64ae849b77e68f3cdf31cb95cc5 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:02 +0200 Subject: [PATCH 009/175] perf(router-core): compact navigation parameter resolution (#8328) Declare the native null-prototype target once for non-inheriting parameter modes. Preserve updater isolation, native copy counts, and literal-parameter merge behavior. Group parameter resolution with search middleware without changing Link or path interpolation logic. Official current-branch bundles shrink in all 18 scenarios by 2-30 gzip bytes versus 9c7cab48c1. React Router minimal: 85778 -> 85748 (-30); full: 89386 -> 89384 (-2). A matched-main preview against cf166d160e measures React Router minimal at 85805 versus main 85821 (-16), and full at 89385 versus main 89398 (-13). Eight of nine matched-main React fixtures meet main; Start+Query remains +25 bytes. Small Solid overages are retained as agreed. Eight paired client/SSR cases with four independent replicas each detected no supported timing regression or improvement. Add coverage for fresh updater copies, null prototypes, inheritance, and clearing. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/quick-otters-switch.md | 5 ++ packages/router-core/src/router.ts | 32 +++++---- .../router-core/tests/build-location.test.ts | 71 +++++++++++++++++++ 3 files changed, 94 insertions(+), 14 deletions(-) create mode 100644 .changeset/quick-otters-switch.md diff --git a/.changeset/quick-otters-switch.md b/.changeset/quick-otters-switch.md new file mode 100644 index 0000000000..2207d8c008 --- /dev/null +++ b/.changeset/quick-otters-switch.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Reduce duplication in navigation parameter handling while preserving parameter inheritance, null-prototype dictionaries, and updater isolation. diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 3833f66230..1ccdf42cb6 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -2899,6 +2899,24 @@ function validateSearch(validateSearch: AnyValidator, input: unknown): unknown { return {} } +function resolveNextParams( + spec: unknown, + base: Record, +): Record { + if (spec === undefined || spec === true) { + return base + } + const next = Object.create(null) + if (spec === false || spec === null) { + return next + } + if (typeof spec === 'function') { + Object.assign(next, base) + return Object.assign(next, spec(next)) + } + return Object.assign(next, base, spec) +} + function applySearchMiddleware( search: any, dest: BuildNextOptions, @@ -3018,20 +3036,6 @@ function findGlobalNotFoundRouteId( return rootRouteId } -function resolveNextParams( - spec: unknown, - base: Record, -): Record { - if (spec === false || spec === null) { - return Object.create(null) - } - if ((spec ?? true) === true) { - return base - } - const next = Object.assign(Object.create(null), base) - return Object.assign(next, functionalUpdate(spec as any, next)) -} - function extractStrictParams( route: AnyRoute, accumulatedParams: Record, diff --git a/packages/router-core/tests/build-location.test.ts b/packages/router-core/tests/build-location.test.ts index 865edfa943..9c24f9add6 100644 --- a/packages/router-core/tests/build-location.test.ts +++ b/packages/router-core/tests/build-location.test.ts @@ -1722,6 +1722,77 @@ describe('buildLocation - basepath', () => { }) describe('buildLocation - params edge cases', () => { + test('isolates mutating params updaters while preserving inherit and clear modes', () => { + const rootRoute = new BaseRootRoute({}) + const userRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/users/{-$userId}', + }) + const history = createMemoryHistory({ initialEntries: ['/users/123'] }) + const router = createTestRouter({ + routeTree: rootRoute.addChildren([userRoute]), + history, + }) + const updater = vi.fn((params: { userId?: string }) => { + expect(Object.getPrototypeOf(params)).toBeNull() + expect(params).toEqual({ userId: '123' }) + params.userId = '456' + return params + }) + + try { + for (let i = 0; i < 2; i++) { + expect( + router.buildLocation({ + to: '/users/{-$userId}', + params: updater, + }).pathname, + ).toBe('/users/456') + } + expect(updater).toHaveBeenCalledTimes(2) + expect(updater.mock.calls[0]![0]).not.toBe(updater.mock.calls[1]![0]) + expect(router.buildLocation({ to: '/users/{-$userId}' }).pathname).toBe( + '/users/123', + ) + expect( + router.buildLocation({ to: '/users/{-$userId}', params: true }) + .pathname, + ).toBe('/users/123') + expect( + router.buildLocation({ to: '/users/{-$userId}', params: false }) + .pathname, + ).toBe('/users') + } finally { + history.destroy() + } + }) + + test('copies static param getters once without mutating inherited params', () => { + const rootRoute = new BaseRootRoute({}) + const userRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/users/$userId', + }) + const router = createTestRouter({ + routeTree: rootRoute.addChildren([userRoute]), + history: createMemoryHistory({ initialEntries: ['/users/123'] }), + }) + const getUserId = vi.fn(() => '456') + const params = { + get userId() { + return getUserId() + }, + } + + expect( + router.buildLocation({ to: '/users/$userId', params }).pathname, + ).toBe('/users/456') + expect(getUserId).toHaveBeenCalledOnce() + expect( + router.buildLocation({ to: '/users/$userId', params: true }).pathname, + ).toBe('/users/123') + }) + test('params: true should preserve current params', async () => { const rootRoute = new BaseRootRoute({}) const userRoute = new BaseRoute({ From d76a33284bc0668f7af4c972a6d32bd0f42b22a6 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:03 +0200 Subject: [PATCH 010/175] perf(router-core): consolidate interpolation caches (#8321) * refactor(router-core): consolidate path interpolation Remove the object-returning internal wrapper and keep one interpolatePath returning a pathname with optional metadata outputs. Migrate router, devtools, tests, and benchmarks while leaving parsing and cache limits unchanged. Devtools requests only missing-param status. Tests use direct expected paths and explicit metadata; cache benchmarks no longer carry obsolete factory compatibility dispatch. React Router minimal/full gzip are 85829/89413 bytes (+5/+4 from 8a9f57e638, still 14/4 below measured main). Full units/types/exports and 76 browser cases pass; eight paired client/SSR workloads show no supported timing change. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(router-core): keep derived caches on routes Store branches and interpolation plans directly on route objects. Use the already-resolved destination route, remove the fixed outer limit for registered templates, and retain128 results per route. Keep a bounded32-template fallback for arbitrary templates and masks. Build/install route-tree indexes and string caches as one bundle for existing SSR reuse. Reinitialization clears ancestor branches; interpolation plans validate their exact template and decoder without unconditional resets. Loaded match data remains request-local. Against29509b9b98, paired core buildLocation batches over64/256 templates use40-43% less CPU; four fresh server routers generating200 hrefs each use8-9% less. Reversed import order corroborates these scoped results. Four real client/SSR Link cases remain statistically inconclusive. All18 bundle fixtures shrink19-37 gzip bytes versus the consolidation baseline. React Router minimal/full are85797/89379 bytes,46/38 below measured main. Tests cover SSR request cleanup, route reuse, decoder/trailing variants, reparenting, result bounds and fallback capacity. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * test(router-core): add opt-in matching interpolation benchmarks Cover client/server matching with cold and Link-primed route plans, nested params, high-cardinality misses, optional params, and splats. Gate all additional cases behind TSR_LINK_PERF=1. Evaluate six matching-cache prototypes without retaining production changes. Eager variants regress repeated misses by24-64%. Read-through reuse improves warm matching microcases but adds65 gzip bytes; all26 application Link/SSR comparisons show no supported speedup, with one relative-Link slowdown. Real HTTP SSR ABBA means differ by only -0.41%, within observed variation. Restore production and all18 bundle metrics exactly to ec05cc6bec. Preserve detailed measurements and rejected prototypes in session artifacts and uncommitted LOG.md. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/bright-dryers-vanish.md | 5 + .changeset/smart-corners-rhyme.md | 6 + packages/react-router/tests/link.bench.tsx | 7 +- packages/router-core/src/path.ts | 69 +--- packages/router-core/src/route.ts | 11 + packages/router-core/src/router.ts | 91 +++-- .../router-core/tests/build-location.test.ts | 6 +- .../tests/matching-interpolation.bench.ts | 123 +++++++ .../tests/optional-path-params-clean.test.ts | 94 +++-- .../tests/optional-path-params.test.ts | 6 +- .../tests/path-interpolation.bench.ts | 104 ++++-- packages/router-core/tests/path.test.ts | 343 +++++++++++++----- .../tests/route-tree-caches.test.ts | 288 +++++++++++++++ packages/router-core/tests/routerTestUtils.ts | 22 +- .../src/BaseTanStackRouterDevtoolsPanel.tsx | 23 +- .../tests/interpolation-navigation.test.ts | 90 +++++ packages/solid-router/tests/link.bench.tsx | 7 +- packages/vue-router/tests/link.bench.tsx | 5 +- 18 files changed, 987 insertions(+), 313 deletions(-) create mode 100644 .changeset/bright-dryers-vanish.md create mode 100644 .changeset/smart-corners-rhyme.md create mode 100644 packages/router-core/tests/matching-interpolation.bench.ts create mode 100644 packages/router-core/tests/route-tree-caches.test.ts create mode 100644 packages/router-devtools-core/tests/interpolation-navigation.test.ts diff --git a/.changeset/bright-dryers-vanish.md b/.changeset/bright-dryers-vanish.md new file mode 100644 index 0000000000..6216bd3e83 --- /dev/null +++ b/.changeset/bright-dryers-vanish.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Cache route branches and interpolated paths on their route objects, removing the fixed template limit for registered routes and reusing cached paths across server requests. Rebuild tree-dependent caches together, preserve decoder and trailing-slash isolation, and keep unregistered templates bounded. diff --git a/.changeset/smart-corners-rhyme.md b/.changeset/smart-corners-rhyme.md new file mode 100644 index 0000000000..87ae320554 --- /dev/null +++ b/.changeset/smart-corners-rhyme.md @@ -0,0 +1,6 @@ +--- +'@tanstack/router-core': patch +'@tanstack/router-devtools-core': patch +--- + +Consolidate internal path interpolation into `interpolatePath`, returning a pathname directly and collecting metadata only when requested. Update router and devtools callers without changing route parsing or interpolation caching. diff --git a/packages/react-router/tests/link.bench.tsx b/packages/react-router/tests/link.bench.tsx index a04149ed61..56114e65d8 100644 --- a/packages/react-router/tests/link.bench.tsx +++ b/packages/react-router/tests/link.bench.tsx @@ -37,8 +37,11 @@ const InterpolatePathLink = ({ to, params, children, -}: React.PropsWithChildren) => { - const href = interpolatePath({ path: to, params }).interpolatedPath +}: React.PropsWithChildren<{ + to: string + params: Record +}>) => { + const href = interpolatePath(to, params) return {children} } diff --git a/packages/router-core/src/path.ts b/packages/router-core/src/path.ts index 45239f177a..65de358ea5 100644 --- a/packages/router-core/src/path.ts +++ b/packages/router-core/src/path.ts @@ -208,31 +208,17 @@ export function compileDecodeCharMap( encoded.replace(regex, (match) => charMap.get(match) ?? match) } -interface InterpolatePathOptions { - path?: string - params: Record - /** - * A function that decodes a path parameter value. - * Obtained from `compileDecodeCharMap(pathParamsAllowedCharacters)`. - */ - decoder?: (encoded: string) => string - /** - * @internal - * For testing only, in development mode we use the router.isServer value - */ - server?: boolean -} - -type InterPolatePathResult = { - interpolatedPath: string - usedParams: Record - isMissingParams: boolean // true if any params were not available when being looked up in the params object -} +export type InterpolationPlan = [ + keys: Array, + paths: SieveCache, + decoder: ((encoded: string) => string) | undefined, + path: string, +] function encodeParam( key: string, value: unknown, - decoder: InterpolatePathOptions['decoder'], + decoder: ((encoded: string) => string) | undefined, ): string { if (typeof value !== 'string') { return '' + (value ?? undefined) @@ -256,47 +242,23 @@ function encodeParam( } /** - * Interpolate params and wildcards into a route path template. + * Interpolate params and wildcards into a route pathname. * * - Encodes params safely (configurable allowed characters) * - Supports `{-$optional}` segments, `{prefix{$id}suffix}` and `{$}` wildcards + * - Collects optional metadata in the same pass without allocating it for callers */ export function interpolatePath( - options: InterpolatePathOptions, -): InterPolatePathResult { - const { path, params, decoder, server } = options - const result: InterPolatePathResult = { - interpolatedPath: path || '/', - usedParams: Object.create(null), - isMissingParams: false, - } - result.interpolatedPath = interpolatePathname( - result.interpolatedPath, - params, - decoder, - result.usedParams, - undefined, - server, - result, - ) - return result -} - -/** - * @internal - * Optional metadata is collected in the same pass as the pathname. - */ -export function interpolatePathname( - path: string, + path: string | undefined, params: Record, - decoder: InterpolatePathOptions['decoder'], + decoder?: (encoded: string) => string, usedParams?: Record, keys?: Array, server?: boolean, metadata?: { isMissingParams: boolean }, ): string { - if (!path.includes('$')) { - return path + if (!path?.includes('$')) { + return path || '/' } if (isServer ?? server) { @@ -431,10 +393,7 @@ export function interpolatePathname( return joined || '/' } -function encodePathParam( - value: string, - decoder?: InterpolatePathOptions['decoder'], -) { +function encodePathParam(value: string, decoder?: (encoded: string) => string) { const encoded = encodeURIComponent(value) return decoder?.(encoded) ?? encoded } diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts index 70bfdc46cd..4451242456 100644 --- a/packages/router-core/src/route.ts +++ b/packages/router-core/src/route.ts @@ -4,6 +4,7 @@ import { notFound } from './not-found' import { redirect } from './redirect' import { rootRouteId } from './root' import type { LazyRoute } from './fileRoute' +import type { InterpolationPlan } from './path' import type { NotFoundError } from './not-found' import type { RedirectFnRoute } from './redirect' import type { NavigateOptions, ParsePathParams } from './link' @@ -726,6 +727,10 @@ export interface Route< > /** @internal */ _lazy?: Promise | true + /** @internal */ + _branch?: ReadonlyArray + /** @internal */ + _pathCache?: InterpolationPlan rank: number to: TrimPathRight init: (opts: { originalIndex: number }) => void @@ -1713,6 +1718,10 @@ export class BaseRoute< > /** @internal */ _lazy?: Promise | true + /** @internal */ + _branch?: ReadonlyArray + /** @internal */ + _pathCache?: InterpolationPlan constructor( options?: RouteOptions< TRegister, @@ -1764,6 +1773,8 @@ export class BaseRoute< init = (opts: { originalIndex: number }): void => { this.originalIndex = opts.originalIndex + // Rebuilding a tree can change the ancestors of an existing route. + this._branch = undefined const options = this.options as | (RouteOptions< diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 1ccdf42cb6..7f1145f02f 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -30,7 +30,7 @@ import { } from './new-process-route-tree' import { compileDecodeCharMap, - interpolatePathname, + interpolatePath, resolvePath, trimPath, trimPathRight, @@ -56,6 +56,7 @@ import { } from './rewrite' import { createRouterStores } from './stores' import type { SieveCache } from './sieve-cache' +import type { InterpolationPlan } from './path' import type { ProcessRouteTreeResult, ProcessedTree, @@ -1016,11 +1017,12 @@ type LightweightRouteMatchCacheEntry = [ result: LightweightRouteMatchResult, ] -type InterpolationPlan = [ - keys: Array, - paths: SieveCache, - decoder: ((encoded: string) => string) | undefined, -] +/** Indexes and caches rebuilt together when the route tree changes. */ +type RouteTreeCaches = + ProcessRouteTreeResult & { + resolvePathCache: SieveCache + unmatchedPathCache: SieveCache + } export type CreateRouterFn = < TRouteTree extends AnyRoute, @@ -1051,8 +1053,7 @@ declare global { var __TSR_CACHE__: | { routeTree: AnyRoute - processRouteTreeResult: ProcessRouteTreeResult - resolvePathCache: SieveCache + processRouteTreeResult: RouteTreeCaches } | undefined } @@ -1162,8 +1163,7 @@ export class RouterCore< routesByPath!: RoutesByPath processedTree!: ProcessedTree resolvePathCache!: SieveCache - private pathCache = createSieveCache(32) - private routeBranchCache = new WeakMap>() + private unmatchedPathCache!: SieveCache private lightweightCache = new WeakMap< ParsedLocation, LightweightRouteMatchCacheEntry @@ -1282,7 +1282,7 @@ export class RouterCore< if (this.options.routeTree !== this.routeTree) { this.routeTree = this.options.routeTree as TRouteTree - let processRouteTreeResult: ProcessRouteTreeResult + let processRouteTreeResult: RouteTreeCaches if ( process.env.NODE_ENV !== 'development' && (isServer ?? this.isServer) && @@ -1290,10 +1290,8 @@ export class RouterCore< globalThis.__TSR_CACHE__.routeTree === this.routeTree ) { const cached = globalThis.__TSR_CACHE__ - this.resolvePathCache = cached.resolvePathCache processRouteTreeResult = cached.processRouteTreeResult as any } else { - this.resolvePathCache = createSieveCache(1000) processRouteTreeResult = this.buildRouteTree() // only cache if nothing else is cached yet if ( @@ -1304,7 +1302,6 @@ export class RouterCore< globalThis.__TSR_CACHE__ = { routeTree: this.routeTree, processRouteTreeResult: processRouteTreeResult as any, - resolvePathCache: this.resolvePathCache, } } } @@ -1370,7 +1367,7 @@ export class RouterCore< ) } - buildRouteTree = () => { + buildRouteTree = (): RouteTreeCaches => { const result = processRouteTree( this.routeTree, this.options.caseSensitive, @@ -1384,17 +1381,16 @@ export class RouterCore< processRouteMasks(this.options.routeMasks, result.processedTree) } - return result + return { + ...result, + resolvePathCache: createSieveCache(1000), + // Arbitrary templates (for example, masks) have no route object to key by. + unmatchedPathCache: createSieveCache(32), + } } - setRoutes({ - routesById, - routesByPath, - processedTree, - }: ProcessRouteTreeResult) { - this.routesById = routesById as RoutesById - this.routesByPath = routesByPath as RoutesByPath - this.processedTree = processedTree + setRoutes(caches: RouteTreeCaches) { + Object.assign(this, caches) const notFoundRoute = this.options.notFoundRoute @@ -1535,15 +1531,6 @@ export class RouterCore< }) } - private getRouteBranch(route: AnyRoute) { - let branch = this.routeBranchCache.get(route) - if (!branch) { - branch = buildRouteBranch(route) - this.routeBranchCache.set(route, branch) - } - return branch - } - matchRoutes: MatchRoutesFn = ( pathnameOrNext: string | ParsedLocation, locationSearchOrOpts?: AnySchema | MatchRoutesOpts, @@ -1674,7 +1661,7 @@ export class RouterCore< const usedParams: Record = createNull() const interpolatedPath = isServer === undefined - ? interpolatePathname( + ? interpolatePath( route.fullPath, rawParams, this.pathParamsDecoder, @@ -1682,7 +1669,7 @@ export class RouterCore< undefined, this.isServer, ) - : interpolatePathname( + : interpolatePath( route.fullPath, rawParams, this.pathParamsDecoder, @@ -1901,15 +1888,16 @@ export class RouterCore< private interpolatePath( path: string, params: Record, + route?: AnyRoute, ): string { const decoder = this.pathParamsDecoder - let plan = this.pathCache.get(path) + let plan = route ? route._pathCache : this.unmatchedPathCache.get(path) let interpolated: string | undefined - if (!plan || plan[2] !== decoder) { + if (!plan || plan[2] !== decoder || plan[3] !== path) { const keys: Array = [] interpolated = isServer === undefined - ? interpolatePathname( + ? interpolatePath( path, params, decoder, @@ -1917,9 +1905,18 @@ export class RouterCore< keys, this.isServer, ) - : interpolatePathname(path, params, decoder, undefined, keys) - plan = [keys, createSieveCache(128), decoder] - this.pathCache.set(path, plan) + : interpolatePath(path, params, decoder, undefined, keys) + plan = [ + keys, + createSieveCache(128), + decoder, + path, + ] + if (route) { + route._pathCache = plan + } else { + this.unmatchedPathCache.set(path, plan) + } } const [keys, paths] = plan // Single-param templates use the value itself as the Map key. Compound keys @@ -1932,7 +1929,7 @@ export class RouterCore< return ( interpolated || (isServer === undefined - ? interpolatePathname( + ? interpolatePath( path, params, decoder, @@ -1940,7 +1937,7 @@ export class RouterCore< undefined, this.isServer, ) - : interpolatePathname(path, params, decoder)) + : interpolatePath(path, params, decoder)) ) } key = keys.length === 1 ? value : key! + value?.length + ':' + value @@ -1953,7 +1950,7 @@ export class RouterCore< key, (interpolated ||= isServer === undefined - ? interpolatePathname( + ? interpolatePath( path, params, decoder, @@ -1961,7 +1958,7 @@ export class RouterCore< undefined, this.isServer, ) - : interpolatePathname(path, params, decoder)), + : interpolatePath(path, params, decoder)), ) return interpolated } @@ -2051,7 +2048,7 @@ export class RouterCore< let destRoutes: ReadonlyArray if (destRoute) { - destRoutes = this.getRouteBranch(destRoute) + destRoutes = destRoute._branch ??= buildRouteBranch(destRoute) } else if (nextTo.includes('$')) { // Route templates must match routesByPath exactly. A miss here is a // typed destination mismatch, not a concrete URL to route-match. @@ -2099,7 +2096,7 @@ export class RouterCore< // Normalize it to "/evil.example" to keep it on the current origin. normalizeProtocolRelative( nextTo.includes('$') - ? this.interpolatePath(nextTo, nextParams) + ? this.interpolatePath(nextTo, nextParams, destRoute) : nextTo, ), ) diff --git a/packages/router-core/tests/build-location.test.ts b/packages/router-core/tests/build-location.test.ts index 9c24f9add6..35dc8a1f61 100644 --- a/packages/router-core/tests/build-location.test.ts +++ b/packages/router-core/tests/build-location.test.ts @@ -40,7 +40,7 @@ test.each([false, true])( history: createMemoryHistory({ initialEntries: ['/items/one'] }), isServer, }) - const interpolate = vi.spyOn(pathUtils, 'interpolatePathname') + const interpolate = vi.spyOn(pathUtils, 'interpolatePath') try { const matches = router.matchRoutes('/items/one', {}) expect(matches.at(-1)?.pathname).toBe('/items/one') @@ -55,7 +55,7 @@ test.each([false, true])( }, ) -test('keeps interpolation caches router-local and follows decoder changes', () => { +test('shares interpolation on reused routes and follows decoder changes', () => { const rootRoute = new BaseRootRoute({}) const route = new BaseRoute({ getParentRoute: () => rootRoute, @@ -85,7 +85,7 @@ test('keeps interpolation caches router-local and follows decoder changes', () = expect( other.buildLocation({ to: '/items/$id', params: { id: '@one' } }).href, ).toBe('/items/@one') - expect(decoder).toHaveBeenCalledOnce() + expect(decoder).not.toHaveBeenCalled() router.pathParamsDecoder = pathUtils.compileDecodeCharMap(['+']) expect( diff --git a/packages/router-core/tests/matching-interpolation.bench.ts b/packages/router-core/tests/matching-interpolation.bench.ts new file mode 100644 index 0000000000..8932897ec2 --- /dev/null +++ b/packages/router-core/tests/matching-interpolation.bench.ts @@ -0,0 +1,123 @@ +import { bench, describe, expect } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute, BaseRoute } from '../src' +import { createTestRouter } from './routerTestUtils' +import type { AnyRoute } from '../src' + +const cases = [ + { + name: 'nested required params', + segments: ['/orgs/$org', '/items/$id'], + paths: Array.from( + { length: 32 }, + (_, id) => `/orgs/team%20one/items/item%20${id}`, + ), + }, + { + name: 'non-overlapping params', + segments: ['/items/$id'], + paths: Array.from({ length: 256 }, (_, id) => `/items/item%20${id}`), + misses: true, + }, + { + name: 'missing optional params', + segments: ['/items/{-$lang}/$id'], + paths: Array.from({ length: 32 }, (_, id) => `/items/item%20${id}`), + }, + { + name: 'present optional params', + segments: ['/items/{-$lang}/$id'], + paths: Array.from({ length: 32 }, (_, id) => `/items/en/item%20${id}`), + }, + { + name: 'affixed splats', + segments: ['/files/prefix{$}.txt'], + paths: Array.from( + { length: 32 }, + (_, id) => `/files/prefixdocs/file%20${id}.txt`, + ), + }, +] + +// Opt in explicitly; these extra cases are not part of default CI benchmarks. +if (process.env.TSR_LINK_PERF === '1') { + for (const server of [false, true]) { + for (const primeLinks of [false, true]) { + describe(`matching interpolation (server: ${server}, Link-primed: ${primeLinks})`, () => { + for (const scenario of cases) { + const root = new BaseRootRoute({}) + let parent: AnyRoute = root + for (const path of scenario.segments) { + const parentRoute = parent + const route = new BaseRoute({ + getParentRoute: () => parentRoute, + path, + }) + parent.addChildren([route]) + parent = route + } + const history = createMemoryHistory({ initialEntries: ['/'] }) + const router = createTestRouter({ + routeTree: root, + history, + isServer: server, + scrollRestoration: false, + }) + history.destroy() + const options = { _controller: new AbortController() } + + for (const path of scenario.paths) { + router.getMatchedRoutes(path) + } + if (primeLinks) { + const paths = scenario.misses + ? scenario.paths + .slice(0, 32) + .map((path) => path.replace('item%20', 'cached%20')) + : scenario.paths + for (const path of paths) { + const [routes, params] = router.getMatchedRoutes(path) + for (const route of routes) { + const to: string = route.fullPath + if (to.includes('$')) { + router.buildLocation({ to, params }) + } + } + } + } + + let expected = 0 + for (const path of scenario.paths) { + const matches = router.matchRoutes(path, {}, options) + expect(matches.at(-1)?.routeId).toBe(parent.id) + for (const match of matches) { + expect(match.paramsError).toBeUndefined() + expected += + match.id.length + Object.keys(match._strictParams).length + } + } + let checksum = 0 + bench( + scenario.name, + () => { + let length = 0 + for (const path of scenario.paths) { + for (const match of router.matchRoutes(path, {}, options)) { + length += + match.id.length + Object.keys(match._strictParams).length + } + } + checksum = length + }, + { + time: 1000, + warmupTime: 300, + throws: true, + teardown: () => expect(checksum).toBe(expected), + }, + ) + } + }) + } + } +} diff --git a/packages/router-core/tests/optional-path-params-clean.test.ts b/packages/router-core/tests/optional-path-params-clean.test.ts index e3a09c2cf2..2569cb8f38 100644 --- a/packages/router-core/tests/optional-path-params-clean.test.ts +++ b/packages/router-core/tests/optional-path-params-clean.test.ts @@ -87,53 +87,44 @@ describe('Optional Path Parameters - Clean Comprehensive Tests', () => { describe('interpolatePath', () => { it('should interpolate optional dynamic params when present', () => { - const result = interpolatePath({ - path: '/posts/{-$category}', - params: { category: 'tech' }, + const result = interpolatePath('/posts/{-$category}', { + category: 'tech', }) - expect(result.interpolatedPath).toBe('/posts/tech') + expect(result).toBe('/posts/tech') }) it('should omit optional dynamic params when missing', () => { - const result = interpolatePath({ - path: '/posts/{-$category}', - params: {}, - }) - expect(result.interpolatedPath).toBe('/posts') + const result = interpolatePath('/posts/{-$category}', {}) + expect(result).toBe('/posts') }) it('should handle multiple optional dynamic params', () => { - const result1 = interpolatePath({ - path: '/posts/{-$category}/{-$slug}', - params: { category: 'tech', slug: 'hello' }, + const result1 = interpolatePath('/posts/{-$category}/{-$slug}', { + category: 'tech', + slug: 'hello', }) - expect(result1.interpolatedPath).toBe('/posts/tech/hello') + expect(result1).toBe('/posts/tech/hello') - const result2 = interpolatePath({ - path: '/posts/{-$category}/{-$slug}', - params: { category: 'tech' }, + const result2 = interpolatePath('/posts/{-$category}/{-$slug}', { + category: 'tech', }) - expect(result2.interpolatedPath).toBe('/posts/tech') + expect(result2).toBe('/posts/tech') - const result3 = interpolatePath({ - path: '/posts/{-$category}/{-$slug}', - params: {}, - }) - expect(result3.interpolatedPath).toBe('/posts') + const result3 = interpolatePath('/posts/{-$category}/{-$slug}', {}) + expect(result3).toBe('/posts') }) it('should handle mixed required and optional dynamic params', () => { - const result = interpolatePath({ - path: '/posts/{-$category}/user/$id', - params: { category: 'tech', id: '123' }, + const result = interpolatePath('/posts/{-$category}/user/$id', { + category: 'tech', + id: '123', }) - expect(result.interpolatedPath).toBe('/posts/tech/user/123') + expect(result).toBe('/posts/tech/user/123') - const result2 = interpolatePath({ - path: '/posts/{-$category}/user/$id', - params: { id: '123' }, + const result2 = interpolatePath('/posts/{-$category}/user/$id', { + id: '123', }) - expect(result2.interpolatedPath).toBe('/posts/user/123') + expect(result2).toBe('/posts/user/123') }) }) @@ -206,44 +197,41 @@ describe('Optional Path Parameters - Clean Comprehensive Tests', () => { describe('Edge Cases', () => { it('should handle optional params with wildcards', () => { - const result = interpolatePath({ - path: '/docs/{-$version}/$', - params: { version: 'v1', _splat: 'guide/intro' }, + const result = interpolatePath('/docs/{-$version}/$', { + version: 'v1', + _splat: 'guide/intro', }) - expect(result.interpolatedPath).toBe('/docs/v1/guide/intro') + expect(result).toBe('/docs/v1/guide/intro') - const result2 = interpolatePath({ - path: '/docs/{-$version}/$', - params: { _splat: 'guide/intro' }, + const result2 = interpolatePath('/docs/{-$version}/$', { + _splat: 'guide/intro', }) - expect(result2.interpolatedPath).toBe('/docs/guide/intro') + expect(result2).toBe('/docs/guide/intro') }) it('should work with complex patterns', () => { const pattern = '/app/{-$env}/api/{-$version}/users/$id/{-$tab}' // All params provided - const result1 = interpolatePath({ - path: pattern, - params: { env: 'prod', version: 'v2', id: '123', tab: 'settings' }, + const result1 = interpolatePath(pattern, { + env: 'prod', + version: 'v2', + id: '123', + tab: 'settings', }) - expect(result1.interpolatedPath).toBe( - '/app/prod/api/v2/users/123/settings', - ) + expect(result1).toBe('/app/prod/api/v2/users/123/settings') // Only required param - const result2 = interpolatePath({ - path: pattern, - params: { id: '123' }, - }) - expect(result2.interpolatedPath).toBe('/app/api/users/123') + const result2 = interpolatePath(pattern, { id: '123' }) + expect(result2).toBe('/app/api/users/123') // Mix of optional and required - const result3 = interpolatePath({ - path: pattern, - params: { env: 'dev', id: '456', tab: 'profile' }, + const result3 = interpolatePath(pattern, { + env: 'dev', + id: '456', + tab: 'profile', }) - expect(result3.interpolatedPath).toBe('/app/dev/api/users/456/profile') + expect(result3).toBe('/app/dev/api/users/456/profile') }) }) }) diff --git a/packages/router-core/tests/optional-path-params.test.ts b/packages/router-core/tests/optional-path-params.test.ts index ec1c6bff92..b8584c9dc2 100644 --- a/packages/router-core/tests/optional-path-params.test.ts +++ b/packages/router-core/tests/optional-path-params.test.ts @@ -369,7 +369,7 @@ describe('Optional Path Parameters', () => { result: '/posts/42', }, ])('$name', ({ path, params, result }) => { - expect(interpolatePath({ path, params }).interpolatedPath).toBe(result) + expect(interpolatePath(path, params)).toBe(result) }) }) @@ -499,9 +499,7 @@ describe('Optional Path Parameters', () => { // This test will be expanded when we implement params.parse for optional params const path = '/posts/{-$category}' const params = { category: 'tech' } - expect(interpolatePath({ path, params }).interpolatedPath).toBe( - '/posts/tech', - ) + expect(interpolatePath(path, params)).toBe('/posts/tech') }) it('should handle multiple consecutive optional parameters correctly', () => { diff --git a/packages/router-core/tests/path-interpolation.bench.ts b/packages/router-core/tests/path-interpolation.bench.ts index 6b23200b8b..8f4b6c1e5c 100644 --- a/packages/router-core/tests/path-interpolation.bench.ts +++ b/packages/router-core/tests/path-interpolation.bench.ts @@ -1,16 +1,15 @@ import { bench, describe, expect } from 'vitest' import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute } from '../src' -import { - compileDecodeCharMap, - interpolatePath, - interpolatePathname, -} from '../src/path' +import { BaseRootRoute, BaseRoute } from '../src' +import { compileDecodeCharMap, interpolatePath } from '../src/path' import { createTestRouter } from './routerTestUtils' +import type { PathInterpolationTestOptions } from './routerTestUtils' -type Options = Parameters[0] - -const scenarios: Array<{ name: string; inputs: Array }> = [ +const scenarios: Array<{ + name: string + inputs: Array + register?: boolean +}> = [ { name: 'single-param shared hits', inputs: Array.from({ length: 200 }, (_, index) => ({ @@ -36,7 +35,22 @@ const scenarios: Array<{ name: string; inputs: Array }> = [ })), }, { - name: 'template eviction', + name: '64-template working set', + inputs: Array.from({ length: 64 }, (_, index) => ({ + path: `/section-${index}/$id`, + params: { id: 'item one' }, + })), + }, + { + name: '256-template working set', + inputs: Array.from({ length: 256 }, (_, index) => ({ + path: `/section-${index}/$id`, + params: { id: 'item one' }, + })), + }, + { + name: 'unregistered template eviction', + register: false, inputs: Array.from({ length: 64 }, (_, index) => ({ path: `/section-${index}/$id`, params: { id: 'item one' }, @@ -103,40 +117,68 @@ for (const { inputs } of scenarios) { } } scenarios.push( - ...scenarios.map(({ name, inputs }) => ({ + ...scenarios.map(({ name, inputs, register }) => ({ name: `server ${name}`, inputs: inputs.map((input) => ({ ...input, server: true })), + register, })), ) -describe.each(scenarios)('$name', ({ inputs }) => { +describe.each(scenarios)('$name', ({ inputs, register = true }) => { + const root = new BaseRootRoute({}) + const routes = new Map( + [...new Set(inputs.map((input) => input.path || '/'))].map((path) => [ + path, + new BaseRoute({ getParentRoute: () => root, path }), + ]), + ) const router = createTestRouter({ - routeTree: new BaseRootRoute({}), + routeTree: register ? root.addChildren([...routes.values()]) : root, history: createMemoryHistory({ initialEntries: ['/'] }), isServer: inputs[0]?.server, scrollRestoration: false, }) router.pathParamsDecoder = decoder router.history.destroy() - const interpolate = router['interpolatePath'] const calls = inputs .filter((input) => input.path?.includes('$')) .map((input) => ({ - args: - interpolate.length === 1 ? [input] : [input.path || '/', input.params], - expected: interpolatePath(input).interpolatedPath, + path: input.path || '/', + params: input.params, + route: register ? routes.get(input.path || '/') : undefined, + expected: interpolatePath( + input.path, + input.params, + input.decoder, + undefined, + undefined, + input.server, + ), })) let checksum = 0 const expected = inputs.reduce( - (sum, input) => sum + interpolatePath(input).interpolatedPath.length, + (sum, input) => + sum + + interpolatePath( + input.path, + input.params, + input.decoder, + undefined, + undefined, + input.server, + ).length, 0, ) const cachedExpected = calls.reduce((sum, call) => { - expect(Reflect.apply(interpolate, router, call.args)).toBe(call.expected) + expect(router['interpolatePath'](call.path, call.params, call.route)).toBe( + call.expected, + ) return sum + call.expected.length }, 0) for (const call of calls) { - expect(Reflect.apply(interpolate, router, call.args)).toBe(call.expected) + expect(router['interpolatePath'](call.path, call.params, call.route)).toBe( + call.expected, + ) } bench( @@ -144,7 +186,11 @@ describe.each(scenarios)('$name', ({ inputs }) => { () => { let length = 0 for (const call of calls) { - length += Reflect.apply(interpolate, router, call.args).length + length += router['interpolatePath']( + call.path, + call.params, + call.route, + ).length } checksum = length }, @@ -163,8 +209,8 @@ describe.each(scenarios)('$name', ({ inputs }) => { () => { let length = 0 for (const input of inputs) { - length += interpolatePathname( - input.path || '/', + length += interpolatePath( + input.path, input.params, input.decoder, undefined, @@ -185,11 +231,19 @@ describe.each(scenarios)('$name', ({ inputs }) => { ) bench( - 'uncached interpolation batch', + 'metadata-enabled interpolation batch', () => { let length = 0 for (const input of inputs) { - length += interpolatePath(input).interpolatedPath.length + length += interpolatePath( + input.path, + input.params, + input.decoder, + Object.create(null), + undefined, + input.server, + { isMissingParams: false }, + ).length } checksum = length }, diff --git a/packages/router-core/tests/path.test.ts b/packages/router-core/tests/path.test.ts index 004b97403c..b67d5fe1e2 100644 --- a/packages/router-core/tests/path.test.ts +++ b/packages/router-core/tests/path.test.ts @@ -3,7 +3,6 @@ import { compileDecodeCharMap, exactPathTest, interpolatePath, - interpolatePathname, removeTrailingSlash, resolvePath, trimPathLeft, @@ -24,34 +23,84 @@ describe.each([false, true])( 'shared pathname interpolation (server: %s)', (server) => { it.each([ - { path: '/', params: {} }, - { path: '/users/', params: {} }, - { path: '/users/$id', params: { id: '123' } }, - { path: '/users/$id', params: { id: 0 } }, - { path: '/users/$id', params: {} }, - { path: '/users/$id', params: { id: 'a/b?#@+' } }, - { path: '/users/$id', params: { id: 'cafe\u0301' } }, - { path: '/users/{$id}.json', params: { id: '123' } }, - { path: '/posts/{-$category}', params: {} }, - { path: '/posts/{-$category}', params: { category: undefined } }, - { path: '/posts/{-$category}', params: { category: '' } }, - { path: '/posts/{-$category}', params: { category: 'news' } }, + { path: '/', params: {}, expected: '/' }, + { path: '/users/', params: {}, expected: '/users/' }, + { path: '/users/$id', params: { id: '123' }, expected: '/users/123' }, + { path: '/users/$id', params: { id: 0 }, expected: '/users/0' }, + { path: '/users/$id', params: {}, expected: '/users/undefined' }, + { + path: '/users/$id', + params: { id: 'a/b?#@+' }, + expected: '/users/a%2Fb%3F%23%40%2B', + }, + { + path: '/users/$id', + params: { id: 'cafe\u0301' }, + expected: '/users/cafe%CC%81', + }, + { + path: '/users/{$id}.json', + params: { id: '123' }, + expected: '/users/123.json', + }, + { path: '/posts/{-$category}', params: {}, expected: '/posts' }, + { + path: '/posts/{-$category}', + params: { category: undefined }, + expected: '/posts', + }, + { + path: '/posts/{-$category}', + params: { category: '' }, + expected: '/posts/', + }, + { + path: '/posts/{-$category}', + params: { category: 'news' }, + expected: '/posts/news', + }, { path: '/posts/prefix{-$category}suffix', params: { category: 'news' }, + expected: '/posts/prefixnewssuffix', }, - { path: '/files/$', params: { _splat: 'a b/c+d' } }, - { path: '/files/prefix{$}suffix', params: { _splat: 'a/b' } }, - { path: '/files/$', params: { _splat: '' } }, - { path: '/$id/$id/', params: { id: '123' } }, - ])('matches interpolation for $path with $params', ({ path, params }) => { - const interpolate = createPathInterpolator() - const options = { path, params, server } - const expected = interpolatePath(options).interpolatedPath - - expect(interpolate(options)).toBe(expected) - expect(interpolate({ ...options, params: { ...params } })).toBe(expected) - }) + { + path: '/files/$', + params: { _splat: 'a b/c+d' }, + expected: '/files/a%20b/c%2Bd', + }, + { + path: '/files/prefix{$}suffix', + params: { _splat: 'a/b' }, + expected: '/files/prefixa/bsuffix', + }, + { path: '/files/$', params: { _splat: '' }, expected: '/files' }, + { + path: '/$id/$id/', + params: { id: '123' }, + expected: '/123/123/', + }, + ])( + 'interpolates and caches $path with $params', + ({ path, params, expected }) => { + const interpolate = createPathInterpolator() + const options = { path, params, server } + expect( + interpolatePath( + path, + params, + undefined, + undefined, + undefined, + server, + ), + ).toBe(expected) + expect(interpolate(options)).toBe(expected) + expect(interpolate({ ...options, params: { ...params } })).toBe( + expected, + ) + }, + ) it('shares results across equivalent params without retaining unrelated params', () => { const interpolate = createPathInterpolator() @@ -98,12 +147,16 @@ describe.each([false, true])( const interpolate = createPathInterpolator() const allowAt = compileDecodeCharMap(['@']) const allowPlus = compileDecodeCharMap(['+']) - for (const decoder of [allowAt, allowPlus, undefined, allowAt]) { - for (const path of ['/users/$id', '/teams/$id']) { + for (const [decoder, encoded] of [ + [allowAt, '@%2B'], + [allowPlus, '%40+'], + [undefined, '%40%2B'], + [allowAt, '@%2B'], + ] as const) { + for (const prefix of ['/users/', '/teams/']) { + const path = prefix + '$id' const options = { path, params: { id: '@+' }, decoder, server } - expect(interpolate(options)).toBe( - interpolatePath(options).interpolatedPath, - ) + expect(interpolate(options)).toBe(prefix + encoded) } } }) @@ -138,18 +191,25 @@ describe.each([false, true])( const interpolate = createPathInterpolator() const path = '/posts/{-$category}/$id' const inputs = [ - { id: 'one' }, - { id: 'one', category: 'news' }, - { id: 'one', category: undefined }, - { id: 'one', category: '' }, - { id: 'one', category: 'updates' }, + { params: { id: 'one' }, expected: '/posts/one' }, + { + params: { id: 'one', category: 'news' }, + expected: '/posts/news/one', + }, + { + params: { id: 'one', category: undefined }, + expected: '/posts/one', + }, + { params: { id: 'one', category: '' }, expected: '/posts//one' }, + { + params: { id: 'one', category: 'updates' }, + expected: '/posts/updates/one', + }, ] - for (const params of [...inputs, ...inputs]) { + for (const { params, expected } of [...inputs, ...inputs]) { const options = { path, params, server } - expect(interpolate(options)).toBe( - interpolatePath(options).interpolatedPath, - ) + expect(interpolate(options)).toBe(expected) } }) @@ -191,18 +251,30 @@ describe.each([false, true])( expect(decoder).not.toHaveBeenCalled() }) - it('keeps public usedParams unchanged for missing optionals and splats', () => { - expect( - interpolatePath({ path: '/posts/{-$category}', params: {}, server }) - .usedParams, - ).toEqual({}) - expect( - interpolatePath({ - path: '/files/$', - params: { _splat: 'docs/guide' }, - server, - }).usedParams, - ).toEqual({ _splat: 'docs/guide', '*': 'docs/guide' }) + it('collects used params for splats but not missing optionals', () => { + const usedParams: Record = Object.create(null) + interpolatePath( + '/posts/{-$category}', + {}, + undefined, + usedParams, + undefined, + server, + ) + expect(usedParams).toEqual({}) + interpolatePath( + '/files/$', + { _splat: 'docs/guide' }, + undefined, + usedParams, + undefined, + server, + ) + expect(usedParams).toEqual({ + _splat: 'docs/guide', + '*': 'docs/guide', + }) + expect(Object.getPrototypeOf(usedParams)).toBeNull() }) it.each([ @@ -236,7 +308,7 @@ describe.each([false, true])( const keys: Array = [] const metadata = { isMissingParams: false } expect( - interpolatePathname( + interpolatePath( template, params, undefined, @@ -249,11 +321,16 @@ describe.each([false, true])( expect(keys).toEqual(['id', 'language', '_splat']) expect(usedParams).toEqual(used) expect(metadata.isMissingParams).toBe(missing) - expect(interpolatePath({ path: template, params, server })).toEqual({ - interpolatedPath: path, - usedParams: used, - isMissingParams: missing, - }) + expect( + interpolatePath( + template, + params, + undefined, + undefined, + undefined, + server, + ), + ).toBe(path) }, ) @@ -296,11 +373,21 @@ describe.each([false, true])( ])( 'preserves missing-param metadata for $path with $params', ({ path, params, pathname, usedParams, missing }) => { - expect(interpolatePath({ path, params, server })).toEqual({ - interpolatedPath: pathname, - usedParams, - isMissingParams: missing, - }) + const collectedParams: Record = Object.create(null) + const metadata = { isMissingParams: false } + expect( + interpolatePath( + path, + params, + undefined, + collectedParams, + undefined, + server, + metadata, + ), + ).toBe(pathname) + expect(collectedParams).toEqual(usedParams) + expect(metadata.isMissingParams).toBe(missing) }, ) @@ -312,9 +399,7 @@ describe.each([false, true])( params: { _splat }, server, } - expect(interpolate(options)).toBe( - interpolatePath(options).interpolatedPath, - ) + expect(interpolate(options)).toBe(`/files/prefix${_splat}suffix`) } }) @@ -615,6 +700,77 @@ describe('resolvePath', () => { describe.each([{ server: true }, { server: false }])( 'interpolatePath (server: $server)', ({ server }) => { + it.each([ + { path: undefined, expected: '/' }, + { path: '', expected: '/' }, + { path: '/', expected: '/' }, + { path: '/about/', expected: '/about/' }, + ])('preserves static and empty paths: $path', ({ path, expected }) => { + const params = { + get unused() { + throw new Error('Static paths must not read params') + }, + } + const decoder = vi.fn() + const usedParams: Record = Object.create(null) + const keys: Array = [] + const metadata = { isMissingParams: false } + expect( + interpolatePath( + path, + params, + decoder, + usedParams, + keys, + server, + metadata, + ), + ).toBe(expected) + expect(usedParams).toEqual({}) + expect(keys).toEqual([]) + expect(metadata.isMissingParams).toBe(false) + expect(decoder).not.toHaveBeenCalled() + }) + + it.each([ + { + path: '/users/$id', + params: {}, + expected: '/users/undefined', + missing: true, + }, + { + path: '/users/$id', + params: { id: 'one' }, + expected: '/users/one', + missing: false, + }, + { + path: '/posts/{-$category}', + params: {}, + expected: '/posts', + missing: false, + }, + { path: '/files/$', params: {}, expected: '/files', missing: true }, + ])( + 'collects only missing status for $path', + ({ path, params, expected, missing }) => { + const metadata = { isMissingParams: false } + expect( + interpolatePath( + path, + params, + undefined, + undefined, + undefined, + server, + metadata, + ), + ).toBe(expected) + expect(metadata.isMissingParams).toBe(missing) + }, + ) + describe('regular usage', () => { it.each([ { @@ -721,12 +877,7 @@ describe.each([{ server: true }, { server: false }])( }, ])('$name', ({ path, params, decoder, result }) => { expect( - interpolatePath({ - path, - params, - decoder, - server, - }).interpolatedPath, + interpolatePath(path, params, decoder, undefined, undefined, server), ).toBe(result) }) }) @@ -757,11 +908,14 @@ describe.each([{ server: true }, { server: false }])( 'should preserve trailing slash for $path', ({ path, params, result }) => { expect( - interpolatePath({ + interpolatePath( path, params, + undefined, + undefined, + undefined, server, - }).interpolatedPath, + ), ).toBe(result) }, ) @@ -801,11 +955,7 @@ describe.each([{ server: true }, { server: false }])( }, ])('$name', ({ to, params, result }) => { expect( - interpolatePath({ - path: to, - params, - server, - }).interpolatedPath, + interpolatePath(to, params, undefined, undefined, undefined, server), ).toBe(result) }) }) @@ -868,11 +1018,14 @@ describe.each([{ server: true }, { server: false }])( }, ])('$name', ({ path, params, result }) => { expect( - interpolatePath({ + interpolatePath( path, params, + undefined, + undefined, + undefined, server, - }).interpolatedPath, + ), ).toBe(result) }) }) @@ -917,11 +1070,7 @@ describe.each([{ server: true }, { server: false }])( }, ])('$name', ({ to, params, result }) => { expect( - interpolatePath({ - path: to, - params, - server, - }).interpolatedPath, + interpolatePath(to, params, undefined, undefined, undefined, server), ).toBe(result) }) }) @@ -969,13 +1118,18 @@ describe.each([{ server: true }, { server: false }])( expectedResult: '/hello', }, ])('$name', ({ path, params, expectedResult }) => { - const result = interpolatePath({ + const metadata = { isMissingParams: false } + const result = interpolatePath( path, params, + undefined, + undefined, + undefined, server, - }) - expect(result.interpolatedPath).toBe(expectedResult) - expect(result.isMissingParams).toBe(true) + metadata, + ) + expect(result).toBe(expectedResult) + expect(metadata.isMissingParams).toBe(true) }) }) @@ -996,11 +1150,14 @@ describe.each([{ server: true }, { server: false }])( trailingSlash, }) const nextParams = { _splat: '' } - const interpolatedNextTo = interpolatePath({ - path: nextTo, - params: nextParams, + const interpolatedNextTo = interpolatePath( + nextTo, + nextParams, + undefined, + undefined, + undefined, server, - }).interpolatedPath + ) expect(interpolatedNextTo).toBe(`/splat${tail}`) }, ) diff --git a/packages/router-core/tests/route-tree-caches.test.ts b/packages/router-core/tests/route-tree-caches.test.ts new file mode 100644 index 0000000000..85ea2ec1af --- /dev/null +++ b/packages/router-core/tests/route-tree-caches.test.ts @@ -0,0 +1,288 @@ +import { afterEach, beforeEach, expect, test, vi } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute, BaseRoute } from '../src' +import * as pathUtils from '../src/path' +import { createRequestHandler } from '../src/ssr/createRequestHandler' +import { createTestRouter } from './routerTestUtils' +import type { AnyRoute, AnyRouter } from '../src' + +const disposers: Array<() => void> = [] + +beforeEach(() => { + vi.stubEnv('NODE_ENV', 'production') + vi.stubGlobal('__TSR_CACHE__', undefined) +}) + +afterEach(() => { + for (const dispose of disposers.splice(0)) { + dispose() + } + vi.restoreAllMocks() + vi.unstubAllGlobals() + vi.unstubAllEnvs() +}) + +function createRoutes() { + const root = new BaseRootRoute({}) + const item = new BaseRoute({ + getParentRoute: () => root, + path: '/items/$id', + }) + return { root, item, routeTree: root.addChildren([item]) } +} + +function history() { + const result = createMemoryHistory({ initialEntries: ['/'] }) + disposers.push(result.destroy) + return result +} + +test('reuses route caches after server request cleanup without sharing match state', async () => { + const { routeTree, item, root } = createRoutes() + const routers: Array = [] + const request = () => + createRequestHandler({ + request: new Request('http://localhost/'), + createRouter: () => { + const router = createTestRouter({ routeTree, isServer: true }) + routers.push(router) + return router + }, + })(({ router }) => { + disposers.push(router.history.destroy) + return new Response( + router.buildLocation({ + to: '/items/$id', + params: { id: 'one two' }, + }).href, + ) + }) + + expect(await (await request()).text()).toBe('/items/one%20two') + const branch = item._branch + const plan = item._pathCache + expect(branch).toEqual([root, item]) + expect(plan).toBeDefined() + const interpolate = vi.spyOn(pathUtils, 'interpolatePath') + + expect(await (await request()).text()).toBe('/items/one%20two') + expect(item._branch).toBe(branch) + expect(item._pathCache).toBe(plan) + expect( + interpolate.mock.calls.filter(([path]) => path === '/items/$id'), + ).toHaveLength(0) + expect(routers[0]).not.toBe(routers[1]) + expect(routers[0]!.resolvePathCache).toBe(routers[1]!.resolvePathCache) + expect(routers[0]!._cache).not.toBe(routers[1]!._cache) +}) + +test.each([ + { mode: 'production', isServer: false }, + { mode: 'development', isServer: true }, +])( + 'does not share router cache groups in $mode (server: $isServer)', + ({ mode, isServer }) => { + vi.stubEnv('NODE_ENV', mode) + const { routeTree } = createRoutes() + const first = createTestRouter({ routeTree, history: history(), isServer }) + const second = createTestRouter({ routeTree, history: history(), isServer }) + expect(first.resolvePathCache).not.toBe(second.resolvePathCache) + expect(first['unmatchedPathCache']).not.toBe(second['unmatchedPathCache']) + expect(globalThis.__TSR_CACHE__).toBeUndefined() + }, +) + +test('keeps different route objects independent and resets derived caches when rebuilding', () => { + vi.stubEnv('NODE_ENV', 'development') + const firstTree = createRoutes() + const secondTree = createRoutes() + const first = createTestRouter({ + routeTree: firstTree.routeTree, + history: history(), + }) + const second = createTestRouter({ + routeTree: secondTree.routeTree, + history: history(), + }) + for (const router of [first, second]) { + expect( + router.buildLocation({ to: '/items/$id', params: { id: 'one' } }).href, + ).toBe('/items/one') + } + expect(firstTree.item._branch).not.toBe(secondTree.item._branch) + expect(firstTree.item._pathCache).not.toBe(secondTree.item._pathCache) + + const previousResolve = first.resolvePathCache + const previousFallback = first['unmatchedPathCache'] + const previousBranch = firstTree.item._branch + const previousPlan = firstTree.item._pathCache + first.setRoutes(first.buildRouteTree()) + expect(first.resolvePathCache).not.toBe(previousResolve) + expect(first['unmatchedPathCache']).not.toBe(previousFallback) + expect(firstTree.item._branch).toBeUndefined() + expect(firstTree.item._pathCache).toBe(previousPlan) + expect( + first.buildLocation({ to: '/items/$id', params: { id: 'one' } }).href, + ).toBe('/items/one') + expect(firstTree.item._branch).not.toBe(previousBranch) + expect(firstTree.item._pathCache).toBe(previousPlan) +}) + +test('keeps more than 32 registered route templates warm', () => { + const root = new BaseRootRoute({}) + const routes = Array.from( + { length: 128 }, + (_, index) => + new BaseRoute({ + getParentRoute: () => root, + path: `/section-${index}/$id`, + }), + ) + const router = createTestRouter({ + routeTree: root.addChildren(routes), + history: history(), + }) + const decoder = vi.fn(pathUtils.compileDecodeCharMap(['@'])) + router.pathParamsDecoder = decoder + for (let round = 0; round < 2; round++) { + for (let index = 0; index < routes.length; index++) { + expect( + router.buildLocation({ + to: `/section-${index}/$id`, + params: { id: '@one' }, + }).pathname, + ).toBe(`/section-${index}/@one`) + } + expect(decoder).toHaveBeenCalledTimes(routes.length) + } +}) + +test('refreshes branches and path plans when an existing route is reparented', () => { + vi.stubEnv('NODE_ENV', 'development') + const root = new BaseRootRoute({}) + const left = new BaseRoute({ getParentRoute: () => root, path: '/left' }) + const right = new BaseRoute({ getParentRoute: () => root, path: '/right' }) + let parent: AnyRoute = left + const child = new BaseRoute({ + getParentRoute: () => parent, + path: '/child/$id', + }) + const router = createTestRouter({ + routeTree: root.addChildren([left.addChildren([child]), right]), + history: history(), + }) + expect( + router.buildLocation({ to: '/left/child/$id', params: { id: 'one two' } }) + .href, + ).toBe('/left/child/one%20two') + expect(child._branch).toEqual([root, left, child]) + const plan = child._pathCache + + parent = right + left.addChildren([]) + right.addChildren([child]) + router.setRoutes(router.buildRouteTree()) + expect(child._branch).toBeUndefined() + expect(child._pathCache).toBe(plan) + expect( + router.buildLocation({ to: '/right/child/$id', params: { id: 'one two' } }) + .href, + ).toBe('/right/child/one%20two') + expect(child._branch).toEqual([root, right, child]) + expect(child._pathCache).not.toBe(plan) +}) + +test('keeps the 128-result bound within each route', () => { + const { routeTree } = createRoutes() + const router = createTestRouter({ routeTree, history: history() }) + const decoder = vi.fn(pathUtils.compileDecodeCharMap(['@'])) + router.pathParamsDecoder = decoder + for (let id = 0; id <= 128; id++) { + expect( + router.buildLocation({ + to: '/items/$id', + params: { id: `@${id}` }, + }).pathname, + ).toBe(`/items/@${id}`) + } + decoder.mockClear() + expect( + router.buildLocation({ to: '/items/$id', params: { id: '@0' } }).pathname, + ).toBe('/items/@0') + expect(decoder).toHaveBeenCalledOnce() +}) + +test('isolates decoder and trailing-slash variants on the same server route', () => { + const { routeTree } = createRoutes() + const allowAt = createTestRouter({ + routeTree, + history: history(), + isServer: true, + trailingSlash: 'never', + pathParamsAllowedCharacters: ['@'], + }) + const allowPlus = createTestRouter({ + routeTree, + history: history(), + isServer: true, + trailingSlash: 'always', + pathParamsAllowedCharacters: ['+'], + }) + for (let round = 0; round < 3; round++) { + expect( + allowAt.buildLocation({ to: '/items/$id', params: { id: '@+' } }) + .pathname, + ).toBe('/items/@%2B') + expect( + allowPlus.buildLocation({ to: '/items/$id', params: { id: '@+' } }) + .pathname, + ).toBe('/items/%40+/') + } + allowPlus.pathParamsDecoder = allowAt.pathParamsDecoder + expect( + allowPlus.buildLocation({ to: '/items/$id', params: { id: '@+' } }) + .pathname, + ).toBe('/items/@%2B/') + expect( + allowAt.buildLocation({ to: '/items/$id', params: { id: '@+' } }).pathname, + ).toBe('/items/@%2B') +}) + +test('retains a bounded fallback for unregistered mask templates', () => { + const { routeTree } = createRoutes() + const router = createTestRouter({ routeTree, history: history() }) + const decoder = vi.fn(pathUtils.compileDecodeCharMap(['@'])) + router.pathParamsDecoder = decoder + const build = () => + router.buildLocation({ + to: '/items/$id', + params: { id: '@one' }, + mask: { to: '/pretty/$id', params: { id: '@one' } }, + }) + expect(build().maskedLocation?.pathname).toBe('/pretty/@one') + decoder.mockClear() + expect(build().maskedLocation?.pathname).toBe('/pretty/@one') + expect(decoder).not.toHaveBeenCalled() + + const templates = Array.from( + { length: 64 }, + (_, index) => `/unregistered-${index}/$id`, + ) + for (const to of templates) { + router.buildLocation({ + to, + params: { id: '@one' }, + }) + } + const cache = router['unmatchedPathCache'] + expect( + ['/pretty/$id', ...templates].filter((path) => cache.get(path)), + ).toHaveLength(32) + const evicted = templates.find((path) => !cache.get(path))! + expect(evicted).toBeDefined() + decoder.mockClear() + expect( + router.buildLocation({ to: evicted, params: { id: '@one' } }).pathname, + ).toBe(evicted.replace('$id', '@one')) + expect(decoder).toHaveBeenCalledOnce() +}) diff --git a/packages/router-core/tests/routerTestUtils.ts b/packages/router-core/tests/routerTestUtils.ts index a52f82eb6a..8e1b6ee533 100644 --- a/packages/router-core/tests/routerTestUtils.ts +++ b/packages/router-core/tests/routerTestUtils.ts @@ -52,6 +52,13 @@ export function createTestRouter< return new RouterCore(options, getStoreConfig) } +export type PathInterpolationTestOptions = { + path?: string + params: Record + decoder?: Parameters[2] + server?: boolean +} + export function createTestPathInterpolator() { const router = createTestRouter({ routeTree: new BaseRootRoute({}), @@ -59,21 +66,10 @@ export function createTestPathInterpolator() { scrollRestoration: false, }) router.history.destroy() - const interpolate = router['interpolatePath'] - - return (options: Parameters[0]): string => { + return (options: PathInterpolationTestOptions): string => { router.isServer = options.server ?? false router.pathParamsDecoder = options.decoder - // Support both sides of the factory-to-method benchmark comparison. - const args = - interpolate.length === 1 - ? [options] - : [options.path || '/', options.params] - const result = Reflect.apply(interpolate, router, args) - if (typeof result !== 'string') { - throw new Error('Expected an interpolated pathname') - } - return result + return router['interpolatePath'](options.path || '/', options.params) } } diff --git a/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx b/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx index 966eb32bc5..17f5776330 100644 --- a/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx +++ b/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx @@ -179,19 +179,18 @@ function RouteComp({ // flatten all params in the router state, into a single object const allParams = Object.assign({}, ...matches().map((m) => m.params)) - // interpolatePath is used by router-core to generate the `to` - // path for the navigate function in the router - const interpolated = interpolatePath({ - path: route.fullPath, - params: allParams, - decoder: router().pathParamsDecoder, - }) + const metadata = { isMissingParams: false } + const pathname = interpolatePath( + route.fullPath, + allParams, + router().pathParamsDecoder, + undefined, + undefined, + undefined, + metadata, + ) - // only if `interpolated` is not missing params, return the path since this - // means that all the params are present for a successful navigation - return !interpolated.isMissingParams - ? interpolated.interpolatedPath - : undefined + return metadata.isMissingParams ? undefined : pathname }) return ( diff --git a/packages/router-devtools-core/tests/interpolation-navigation.test.ts b/packages/router-devtools-core/tests/interpolation-navigation.test.ts new file mode 100644 index 0000000000..d756d1d5a2 --- /dev/null +++ b/packages/router-devtools-core/tests/interpolation-navigation.test.ts @@ -0,0 +1,90 @@ +import { beforeAll, expect, test, vi } from 'vitest' +import { + BaseRootRoute, + BaseRoute, + RouterCore, + createNonReactiveMutableStore, + createNonReactiveReadonlyStore, +} from '@tanstack/router-core' +import { TanStackRouterDevtoolsPanelCore } from '../src/TanStackRouterDevtoolsPanelCore' + +beforeAll(async () => { + await import('../src/BaseTanStackRouterDevtoolsPanel') +}, 30_000) + +test('offers navigation only when required and splat params are available', async () => { + const root = new BaseRootRoute({}) + const routeTree = root.addChildren( + ['/users/$id', '/posts/{-$category}', '/files/$'].map( + (path) => new BaseRoute({ getParentRoute: () => root, path }), + ), + ) + const router = new RouterCore({ routeTree, isServer: false }, () => ({ + createMutableStore: createNonReactiveMutableStore, + createReadonlyStore: createNonReactiveReadonlyStore, + batch: (fn) => fn(), + })) + const navigate = vi.spyOn(router, 'navigate').mockResolvedValue() + const initialState = router.state + const panel = new TanStackRouterDevtoolsPanelCore({ + router, + routerState: initialState, + }) + const container = document.createElement('div') + document.body.append(container) + panel.mount(container) + + try { + await vi.waitFor(() => { + expect( + container.querySelector('[title="Navigate to /posts"]'), + ).not.toBeNull() + }) + expect(container.querySelector('[title^="Navigate to /users/"]')).toBeNull() + expect(container.querySelector('[title^="Navigate to /files"]')).toBeNull() + + panel.setRouterState({ + ...initialState, + matches: router.matchRoutes('/users/item%20one', {}), + }) + await vi.waitFor(() => { + expect( + container.querySelector('[title="Navigate to /users/item%20one"]'), + ).not.toBeNull() + }) + container + .querySelector( + '[title="Navigate to /users/item%20one"]', + )! + .click() + expect(navigate).toHaveBeenCalledWith({ + to: '/users/item%20one', + params: undefined, + search: undefined, + }) + + panel.setRouterState({ + ...initialState, + matches: router.matchRoutes('/files/docs/guide', {}), + }) + await vi.waitFor(() => { + expect( + container.querySelector('[title="Navigate to /files/docs/guide"]'), + ).not.toBeNull() + }) + expect(container.querySelector('[title^="Navigate to /users/"]')).toBeNull() + + panel.setRouterState(initialState) + await vi.waitFor(() => { + expect( + container.querySelector('[title^="Navigate to /files"]'), + ).toBeNull() + }) + } finally { + panel.unmount() + router.history.destroy() + navigate.mockRestore() + container.remove() + window.localStorage.clear() + } +}, 30_000) diff --git a/packages/solid-router/tests/link.bench.tsx b/packages/solid-router/tests/link.bench.tsx index 7d60d9ebd5..6c83fa0a91 100644 --- a/packages/solid-router/tests/link.bench.tsx +++ b/packages/solid-router/tests/link.bench.tsx @@ -38,8 +38,11 @@ const InterpolatePathLink = ({ to, params, children, -}: Solid.PropsWithChildren) => { - const href = interpolatePath({ path: to, params }).interpolatedPath +}: Solid.PropsWithChildren<{ + to: string + params: Record +}>) => { + const href = interpolatePath(to, params) return {children} } diff --git a/packages/vue-router/tests/link.bench.tsx b/packages/vue-router/tests/link.bench.tsx index 8a30d80a2d..6448c89368 100644 --- a/packages/vue-router/tests/link.bench.tsx +++ b/packages/vue-router/tests/link.bench.tsx @@ -37,10 +37,7 @@ const createRouterRenderer = (routesCount: number) => (children: Vue.VNode) => { const InterpolatePathLink = Vue.defineComponent({ props: ['to', 'params'], setup(props, { slots }) { - const href = interpolatePath({ - path: props.to, - params: props.params, - }).interpolatedPath + const href = interpolatePath(props.to, props.params) return () => Vue.h('a', { href }, slots.default?.()) }, From 9a356d75059ad0fcf25dba0480aba5658c870913 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:03 +0200 Subject: [PATCH 011/175] test(benchmarks): profile unmodified React Link bundles (#8323) Keep comparison snapshots in SWC's existing node_modules exclusion so emitted JavaScript is not retranspiled and source-map positions remain valid. Preserve asynchronous ESM loading and add a failing-before source-integrity regression. Four-replica identical-bundle calibration: client shared-params CPU +0.92% [-4.14%, +6.24%], wall +1.03% [-4.55%, +6.93%]; SSR CPU +0.17% [-6.32%, +7.11%], wall +0.15% [-6.44%, +7.21%]. Intervals include zero; no speedup is claimed. Production code is unchanged; baseline React Router gzip is 85797/89379 bytes. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- benchmarks/client-nav/README.md | 2 + .../link-performance/stable-runner.ts | 5 +- .../link-performance/stable-worker.test.ts | 60 +++++++++++++++++++ .../client-nav/link-performance/staging.ts | 10 ++++ 4 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 benchmarks/client-nav/link-performance/stable-worker.test.ts create mode 100644 benchmarks/client-nav/link-performance/staging.ts diff --git a/benchmarks/client-nav/README.md b/benchmarks/client-nav/README.md index 3cf38f87de..c2e6616d76 100644 --- a/benchmarks/client-nav/README.md +++ b/benchmarks/client-nav/README.md @@ -179,6 +179,8 @@ run. It starts a fresh process for every case and repetition, avoiding JIT feedback from earlier cases. Inside each process, both revisions share the same production React installation but have separate router/app modules and router instances. Initialization order alternates between repetitions. +Built snapshots are staged under `node_modules/.cache` so the TypeScript +harness loader does not transpile their emitted JavaScript a second time. ```bash # Build the baseline using these same benchmark sources in its own checkout. diff --git a/benchmarks/client-nav/link-performance/stable-runner.ts b/benchmarks/client-nav/link-performance/stable-runner.ts index d947a14f21..83f63ff6d2 100644 --- a/benchmarks/client-nav/link-performance/stable-runner.ts +++ b/benchmarks/client-nav/link-performance/stable-runner.ts @@ -3,7 +3,6 @@ import { createHash } from 'node:crypto' import { copyFileSync, mkdirSync, - mkdtempSync, readFileSync, rmSync, writeFileSync, @@ -12,6 +11,7 @@ import { dirname, resolve } from 'node:path' import { fileURLToPath } from 'node:url' import { parseArgs } from 'node:util' import { LINK_CASES } from './cases' +import { createStagingDirectory } from './staging' import { classify, mean, summarizeRatios } from './statistics' import type { LinkCaseId } from './cases' import type { @@ -223,8 +223,7 @@ async function main() { } const output = resolve(values.outputJson) mkdirSync(dirname(output), { recursive: true }) - mkdirSync(resolve(projectRoot, 'dist'), { recursive: true }) - const staging = mkdtempSync(resolve(projectRoot, 'dist/comparison-')) + const staging = createStagingDirectory() try { for (const mode of modes) { const baselineInput = resolve(values.baseline, mode, 'app.js') diff --git a/benchmarks/client-nav/link-performance/stable-worker.test.ts b/benchmarks/client-nav/link-performance/stable-worker.test.ts new file mode 100644 index 0000000000..087b32414a --- /dev/null +++ b/benchmarks/client-nav/link-performance/stable-worker.test.ts @@ -0,0 +1,60 @@ +import { fork } from 'node:child_process' +import { rmdirSync, unlinkSync, writeFileSync } from 'node:fs' +import { join } from 'node:path' +import { fileURLToPath } from 'node:url' +import { expect, test } from 'vitest' +import { createStagingDirectory } from './staging' +import type { WorkerResponse } from './worker-protocol' + +test('loads emitted JavaScript without retranspiling it through SWC', async () => { + const directory = createStagingDirectory() + const bundle = join(directory, 'app.mjs') + const definition = 'function untouched ( ) { return 1 }' + writeFileSync( + bundle, + `${definition}\nawait Promise.resolve()\nthrow new Error(untouched.toString())`, + ) + const worker = fork( + fileURLToPath(new URL('./stable-worker.ts', import.meta.url)), + { + cwd: fileURLToPath(new URL('../../../', import.meta.url)), + execArgv: ['--import=@swc-node/register/esm-register'], + env: { ...process.env, NODE_ENV: 'production' }, + stdio: ['ignore', 'ignore', 'pipe', 'ipc'], + }, + ) + let stderr = '' + worker.stderr?.on('data', (data: Buffer) => { + stderr += data.toString() + }) + let timeout: ReturnType | undefined + try { + const result = new Promise((resolve, reject) => { + worker.once('message', (message: WorkerResponse) => resolve(message)) + worker.once('error', reject) + worker.once('exit', (code) => { + reject(new Error(`Worker exited (${code}): ${stderr}`)) + }) + timeout = setTimeout(() => { + reject(new Error(`Worker timed out: ${stderr}`)) + }, 5_000) + }) + worker.send({ + kind: 'init', + mode: 'ssr', + caseId: 'shared-params', + bundle, + variant: 0, + }) + const response = await result + expect(response.kind).toBe('error') + if (response.kind === 'error') { + expect(response.message).toContain(`Error: ${definition}`) + } + } finally { + clearTimeout(timeout) + worker.kill() + unlinkSync(bundle) + rmdirSync(directory) + } +}) diff --git a/benchmarks/client-nav/link-performance/staging.ts b/benchmarks/client-nav/link-performance/staging.ts new file mode 100644 index 0000000000..ac07d34c29 --- /dev/null +++ b/benchmarks/client-nav/link-performance/staging.ts @@ -0,0 +1,10 @@ +import { mkdirSync, mkdtempSync } from 'node:fs' +import { resolve } from 'node:path' +import { fileURLToPath } from 'node:url' + +export function createStagingDirectory() { + // SWC skips node_modules, leaving the emitted benchmark JavaScript intact. + const root = fileURLToPath(new URL('./node_modules/.cache/', import.meta.url)) + mkdirSync(root, { recursive: true }) + return mkdtempSync(resolve(root, 'link-performance-')) +} From 6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:03 +0200 Subject: [PATCH 012/175] perf(react-router): reduce Link runtime allocations (#8324) * perf(react-router): filter native Link props once Omit type and disabled in one rest copy for native anchors instead of copying the hook result twice. Custom components still receive disabled, and useLinkProps still returns supported type/disabled values. Add client/SSR coverage for those distinctions, refs and render-function children. Against 6e4584e0d8, four balanced fresh-process pairs with one implementation per process reduced client parameter-updater CPU from 15.61515 to 15.14615 ms per eight-navigation batch (-3.00%, 95% CI -4.19% to -1.80%); wall -3.04% (-4.29% to -1.78%). SSR shared-param CPU fell from 1.45208 to 1.41006 ms per four-request batch (-2.89%, CI -3.80% to -1.98%); wall -2.85% (-3.84% to -1.84%). Earlier co-loaded comparisons were inconclusive. React Router minimal gzip -5 bytes to 85773; full +1 to 89358. Other React fixtures vary -3 to +4 bytes, raw +14; Solid/Vue remain byte-identical. No public API or prop functionality removed. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(react-router): stabilize hydration snapshot getters Reuse the existing true/false snapshot functions instead of allocating them on every useHydrated render. This lets React skip unnecessary store-instance passive bookkeeping without changing hydration values or adding hooks. Cover stable identities and an actual server-render/hydrateRoot transition. Against b6971a434a, four balanced fresh-process pairs per case (200 warmup and 500 measured eight-navigation batches) reduced parameter-updater CPU from 15.16880 to 14.99436 ms (-1.15%, 95% CI -1.84% to -0.46%); wall -1.05% (-1.62% to -0.47%). Middleware CPU fell from 15.23708 to 14.81729 ms (-2.75%, CI -4.46% to -1.01%); wall -2.79% (-4.53% to -1.01%). React Router minimal/full gzip increases 14/15 bytes for this isolated fix, remaining below the initial branch baseline. All Solid/Vue bundle output is unchanged. Public APIs, server snapshots and client hydration transitions are preserved. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/deep-chefs-work.md | 5 ++ .changeset/rare-chefs-shine.md | 5 ++ packages/react-router/src/ClientOnly.tsx | 9 ++- packages/react-router/src/link.tsx | 10 +-- .../tests/link-state-props.test.tsx | 71 +++++++++++++++++++ .../react-router/tests/useHydrated.test.tsx | 63 ++++++++++++++++ 6 files changed, 153 insertions(+), 10 deletions(-) create mode 100644 .changeset/deep-chefs-work.md create mode 100644 .changeset/rare-chefs-shine.md create mode 100644 packages/react-router/tests/useHydrated.test.tsx diff --git a/.changeset/deep-chefs-work.md b/.changeset/deep-chefs-work.md new file mode 100644 index 0000000000..c3d5311ed1 --- /dev/null +++ b/.changeset/deep-chefs-work.md @@ -0,0 +1,5 @@ +--- +'@tanstack/react-router': patch +--- + +Reuse hydration snapshot getters to avoid unnecessary store-instance effect updates when Links and other hydration-aware components rerender. diff --git a/.changeset/rare-chefs-shine.md b/.changeset/rare-chefs-shine.md new file mode 100644 index 0000000000..18e7bfae3d --- /dev/null +++ b/.changeset/rare-chefs-shine.md @@ -0,0 +1,5 @@ +--- +'@tanstack/react-router': patch +--- + +Avoid a redundant prop copy when rendering native Links while preserving custom-component props and the public hook result. diff --git a/packages/react-router/src/ClientOnly.tsx b/packages/react-router/src/ClientOnly.tsx index 102859d75a..c139b05d0a 100644 --- a/packages/react-router/src/ClientOnly.tsx +++ b/packages/react-router/src/ClientOnly.tsx @@ -2,6 +2,9 @@ import React from 'react' +const getSnapshot = () => true +const getServerSnapshot = () => false + export interface ClientOnlyProps { /** * The children to render when the JS is loaded. @@ -54,11 +57,7 @@ export function ClientOnly({ children, fallback = null }: ClientOnlyProps) { * @returns True if the JS has been hydrated already, false otherwise. */ export function useHydrated(): boolean { - return React.useSyncExternalStore( - subscribe, - () => true, - () => false, - ) + return React.useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot) } function subscribe() { diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 4418032784..7a76081742 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -853,8 +853,7 @@ export function createLink( export const Link: LinkComponent<'a'> = React.forwardRef( (props, ref) => { const { _asChild, ...rest } = props - // eslint-disable-next-line prefer-const -- The rest binding is reassigned below. - let { type: _type, ...linkProps } = useLinkProps(rest as any, ref) + const linkProps = useLinkProps(rest as any, ref) const children = typeof rest.children === 'function' @@ -866,10 +865,11 @@ export const Link: LinkComponent<'a'> = React.forwardRef( if (!_asChild) { // the ReturnType of useLinkProps returns the correct type for a element, not a general component that has a disabled prop // @ts-expect-error - const { disabled: _, ...rest } = linkProps - linkProps = rest + const { type: _type, disabled: _, ...anchorProps } = linkProps + return React.createElement('a', anchorProps, children) } - return React.createElement(_asChild || 'a', linkProps, children) + const { type: _type, ...customProps } = linkProps + return React.createElement(_asChild, customProps, children) }, ) as any diff --git a/packages/react-router/tests/link-state-props.test.tsx b/packages/react-router/tests/link-state-props.test.tsx index 1a17cfaab9..a560c5e967 100644 --- a/packages/react-router/tests/link-state-props.test.tsx +++ b/packages/react-router/tests/link-state-props.test.tsx @@ -23,6 +23,77 @@ afterEach(() => { } }) +test.each([false, true])( + 'filters native and custom props without changing the hook result (server: %s)', + async (server) => { + type AnchorProps = React.ComponentPropsWithoutRef<'a'> & { + disabled?: boolean + } + let customProps: AnchorProps | undefined + let hookProps: React.ComponentPropsWithRef<'a'> | undefined + const customRef = React.createRef() + const nativeRef = React.createRef() + const CustomLink = createLink( + React.forwardRef((props, ref) => { + customProps = props + return ( + + {props.children} + + ) + }), + ) + function Probe() { + hookProps = useLinkProps({ + to: '/target', + type: 'text/custom', + disabled: true, + }) + return null + } + const root = createRootRoute() + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/target' }), + ]), + history: createMemoryHistory({ initialEntries: ['/target'] }), + isServer: server, + }) + disposers.push(router.history.destroy) + await router.load() + const tree = ( + + + Native + + + {({ isActive }) => (isActive ? 'Active custom' : 'Inactive custom')} + + + + ) + const container = server + ? document.createElement('div') + : render(tree).container + if (server) { + container.innerHTML = renderToString(tree) + } + const native = container.querySelector('a')! + const custom = container.querySelector('[data-testid="custom"]') + expect(native).not.toHaveAttribute('type') + expect(native).not.toHaveAttribute('disabled') + expect(native).toHaveAttribute('aria-disabled', 'true') + expect(custom).toHaveTextContent('Active custom') + expect(customProps).toMatchObject({ disabled: true }) + expect(customProps).not.toHaveProperty('type') + expect(hookProps).toMatchObject({ type: 'text/custom', disabled: true }) + if (!server) { + expect(nativeRef.current).toBe(native) + expect(customRef.current).toBe(custom) + } + }, +) + test('blocked custom links keep the validated props and forwarded ref', () => { const CustomLink = createLink( React.forwardRef< diff --git a/packages/react-router/tests/useHydrated.test.tsx b/packages/react-router/tests/useHydrated.test.tsx new file mode 100644 index 0000000000..4b7c6ff469 --- /dev/null +++ b/packages/react-router/tests/useHydrated.test.tsx @@ -0,0 +1,63 @@ +import React from 'react' +import { hydrateRoot } from 'react-dom/client' +import { renderToString } from 'react-dom/server' +import { act, cleanup, renderHook } from '@testing-library/react' +import { afterEach, expect, test, vi } from 'vitest' +import { ClientOnly, useHydrated } from '../src/ClientOnly' + +afterEach(() => { + cleanup() + vi.restoreAllMocks() +}) + +test('keeps both snapshot getters stable across renders', () => { + const spy = vi.spyOn(React, 'useSyncExternalStore') + const view = renderHook(() => useHydrated()) + const first = spy.mock.calls.at(-1)! + expect(view.result.current).toBe(true) + view.rerender() + const next = spy.mock.calls.at(-1)! + expect(next[0]).toBe(first[0]) + expect(next[1]).toBe(first[1]) + expect(next[2]).toBe(first[2]) + expect(view.result.current).toBe(true) +}) + +test('preserves the server snapshot through hydration before showing client content', async () => { + const values: Array = [] + function Probe() { + const hydrated = useHydrated() + values.push(hydrated) + return ( +
+ {String(hydrated)} + Fallback}> + Client content + +
+ ) + } + const container = document.createElement('div') + container.innerHTML = renderToString() + document.body.append(container) + expect(values).toEqual([false]) + expect(container).toHaveTextContent('falseFallback') + values.length = 0 + const onRecoverableError = vi.fn() + let root: ReturnType | undefined + try { + await act(() => { + root = hydrateRoot(container, , { onRecoverableError }) + }) + expect(values[0]).toBe(false) + expect(values.at(-1)).toBe(true) + expect(container).toHaveTextContent('trueClient content') + expect(onRecoverableError).not.toHaveBeenCalled() + values.length = 0 + await act(() => root!.render()) + expect(values).toEqual([true]) + } finally { + await act(() => root?.unmount()) + container.remove() + } +}) From 700a714c5fb64199b4edfaa3273d230c9894e274 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:04 +0200 Subject: [PATCH 013/175] perf(router-core): reduce navigation allocations (#8325) * perf(router-core): cache canonical interpolated pathnames Store the existing canonical decoder's pathname in the route interpolation cache so hits do not decode it again. Keep the standalone interpolation kernel, static/leaveParams paths, non-string fallbacks, cache capacities and decoder/template invalidation unchanged. Cover cold/hit href parity, reserved encodings and coercion fallback. Against 3905181fd4, four balanced isolated-process pairs reduced encoded-destination client CPU 13.42% (95% CI -14.50% to -12.32%) and wall 13.32% (-14.44% to -12.19%). Shared params CPU improved 1.27% (-2.39% to -0.14%); unique/miss-heavy CPU +0.49% (-0.35% to +1.33%) was inconclusive. Four paired SSR repetitions improved encoded CPU 14.13% (-19.70% to -8.18%) and wall 14.17% (-19.83% to -8.12%). React Router minimal/full gzip +4/+5 bytes to 85791/89378. Across all 18 fixtures gzip deltas range -7 to +16 bytes. The private microbenchmark now names its normalized-output contract; its changed-scope timings are not used for the speedup claims. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(router-core): reuse lightweight raw-param snapshots getMatchedRoutes already copies cached raw params. Reuse that owned snapshot for lightweight parsing instead of allocating another dictionary. Preserve state-param reuse and matcher cache ownership. Cover mutating/throwing live parsers and add an opt-in cold-source location benchmark. Against ac2ac45367, the same 256-build cold-location benchmark observed client means 0.3434 to 0.2987 ms for one param, 0.7437 to 0.4638 ms for eight, and 1.8625 to 1.1565 ms for 32. Before/after RMEs were 5.15/5.47%, 8.10/4.14%, and 2.37/2.97%. These are cold-mechanism results, not a 38% application speedup; small server cases were noisy and four paired application relative/numeric cases were inconclusive. React Router minimal/full gzip decreases 6/9 bytes to 85786/89376; raw -35. All 18 fixture gzip deltas range -11 to +1 bytes. No public API, parser behavior or cache capacity changed. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(router-core): reduce middleware compilation memory Separate search middleware collection from recursive execution so Maglev does not build one large compiler graph for both. Preserve live route-option reads, ordering, validation, legacy filters and the empty-search fast path. Cover middleware replacement/removal across a previously used route branch. Native malloc profiling on macOS arm64, Node 24.8.0, using the existing CodSpeed flags and seven preparation calls (three fresh processes): - Vue navigation peak: mean 521664 -> 420776 bytes (-19.34%). - Vue interrupted-navigation peak: 733736 -> 733736 bytes (unchanged). These are local native allocations, not a new Linux CodSpeed CI run. Four paired React Link replicas: relative client CPU -2.79% [-4.37%, -1.18%]; shared/updater/middleware cases are inconclusive. Isolated SSR CPU means range -1.63% to +1.28%, all inconclusive. React Router minimal/full gzip: +15/+16 bytes; all 18 gzip deltas -6..+20. Keep all benchmark JIT/GC flags and operation counts unchanged. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/chatty-streets-strive.md | 5 + .changeset/chubby-wasps-yawn.md | 5 + .changeset/violet-emus-teach.md | 5 + packages/router-core/src/router.ts | 86 ++++++++++-------- .../router-core/tests/build-location.test.ts | 91 ++++++++++++++++++- .../tests/lightweight-location.bench.ts | 64 +++++++++++++ .../tests/path-interpolation.bench.ts | 19 ++-- packages/router-core/tests/path.test.ts | 23 ++++- .../tests/route-tree-caches.test.ts | 27 ++++++ 9 files changed, 273 insertions(+), 52 deletions(-) create mode 100644 .changeset/chatty-streets-strive.md create mode 100644 .changeset/chubby-wasps-yawn.md create mode 100644 .changeset/violet-emus-teach.md create mode 100644 packages/router-core/tests/lightweight-location.bench.ts diff --git a/.changeset/chatty-streets-strive.md b/.changeset/chatty-streets-strive.md new file mode 100644 index 0000000000..7b94c9aa32 --- /dev/null +++ b/.changeset/chatty-streets-strive.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Reuse the already-owned raw-param snapshot during lightweight source matching instead of copying it again. diff --git a/.changeset/chubby-wasps-yawn.md b/.changeset/chubby-wasps-yawn.md new file mode 100644 index 0000000000..9d52402d19 --- /dev/null +++ b/.changeset/chubby-wasps-yawn.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Reduce transient JIT compilation memory during navigation by separating search middleware collection from recursive execution. diff --git a/.changeset/violet-emus-teach.md b/.changeset/violet-emus-teach.md new file mode 100644 index 0000000000..2b38e22fd7 --- /dev/null +++ b/.changeset/violet-emus-teach.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Cache normalized route pathnames so repeated Link destinations do not decode the same interpolation result again. diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 7f1145f02f..36b9c32015 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -1861,10 +1861,8 @@ export class RouterCore< params = lastStateMatch.params } else { // Parse params through the route chain - const strictParams: Record = Object.assign( - Object.create(null), - rawParams, - ) + // getMatchedRoutes already copied the cached raw params. + const strictParams: Record = rawParams for (const route of matchedRoutes) { try { extractStrictParams(route, strictParams) @@ -1926,8 +1924,32 @@ export class RouterCore< for (const name of keys) { const value = params[name] if (typeof value !== 'string' && value !== undefined) { - return ( - interpolated || + return normalizeProtocolRelative( + decodePath( + interpolated || + (isServer === undefined + ? interpolatePath( + path, + params, + decoder, + undefined, + undefined, + this.isServer, + ) + : interpolatePath(path, params, decoder)), + ), + ) + } + key = keys.length === 1 ? value : key! + value?.length + ':' + value + } + const cached = paths.get(key) + if (cached) { + return cached + } + // Cache canonical pathnames, not the encoded interpolation output. + interpolated = normalizeProtocolRelative( + decodePath( + interpolated || (isServer === undefined ? interpolatePath( path, @@ -1937,29 +1959,10 @@ export class RouterCore< undefined, this.isServer, ) - : interpolatePath(path, params, decoder)) - ) - } - key = keys.length === 1 ? value : key! + value?.length + ':' + value - } - const cached = paths.get(key) - if (cached) { - return cached - } - paths.set( - key, - (interpolated ||= - isServer === undefined - ? interpolatePath( - path, - params, - decoder, - undefined, - undefined, - this.isServer, - ) - : interpolatePath(path, params, decoder)), + : interpolatePath(path, params, decoder)), + ), ) + paths.set(key, interpolated) return interpolated } @@ -2091,15 +2094,9 @@ export class RouterCore< const nextPathname = opts.leaveParams ? // Keep path params uninterpolated for matchRoute/template matching. nextTo - : decodePath( - // A splat can produce a path like "//evil.example". - // Normalize it to "/evil.example" to keep it on the current origin. - normalizeProtocolRelative( - nextTo.includes('$') - ? this.interpolatePath(nextTo, nextParams, destRoute) - : nextTo, - ), - ) + : nextTo.includes('$') + ? this.interpolatePath(nextTo, nextParams, destRoute) + : normalizeProtocolRelative(decodePath(nextTo)) if ( process.env.NODE_ENV !== 'production' && @@ -2914,9 +2911,8 @@ function resolveNextParams( return Object.assign(next, base, spec) } -function applySearchMiddleware( - search: any, - dest: BuildNextOptions, +// Keep this separate from recursive execution to limit JIT compiler memory. +function getSearchMiddlewares( destRoutes: ReadonlyArray, includeValidateSearch: boolean | undefined, ) { @@ -2976,6 +2972,16 @@ function applySearchMiddleware( } } + return middlewares +} + +function applySearchMiddleware( + search: any, + dest: BuildNextOptions, + destRoutes: ReadonlyArray, + includeValidateSearch: boolean | undefined, +) { + const middlewares = getSearchMiddlewares(destRoutes, includeValidateSearch) const applyNext = ( index: number, currentSearch: any, diff --git a/packages/router-core/tests/build-location.test.ts b/packages/router-core/tests/build-location.test.ts index 35dc8a1f61..5a56d47556 100644 --- a/packages/router-core/tests/build-location.test.ts +++ b/packages/router-core/tests/build-location.test.ts @@ -8,9 +8,9 @@ import { retainSearchParams, stripSearchParams, } from '../src' -import type { SearchMiddleware } from '../src' import { _getUserHistoryState } from '../src/router' import { createTestRouter } from './routerTestUtils' +import type { SearchMiddleware } from '../src' test('_getUserHistoryState removes volatile router bookkeeping but keeps mask payloads', () => { expect( @@ -303,6 +303,45 @@ describe('buildLocation - params function receives parsed params', () => { }) describe('buildLocation - search params', () => { + test('collects updated middleware options from the whole route branch', () => { + const rootRoute = new BaseRootRoute({ + search: { + middlewares: [({ search, next }) => next({ ...search, root: true })], + }, + }) + const route = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/', + search: { + middlewares: [ + ({ search, next }) => ({ ...next(search), value: 'initial' }), + ], + }, + }) + const router = createTestRouter({ + routeTree: rootRoute.addChildren([route]), + history: createMemoryHistory({ initialEntries: ['/'] }), + }) + const buildSearch = () => + router.buildLocation({ to: '/', search: true }).search + + expect(buildSearch()).toEqual({ root: true, value: 'initial' }) + + route.update({ + search: { + middlewares: [ + ({ search, next }) => ({ ...next(search), value: 'updated' }), + ], + }, + }) + expect(buildSearch()).toEqual({ root: true, value: 'updated' }) + + route.update({ search: { middlewares: [] } }) + expect(buildSearch()).toEqual({ root: true }) + rootRoute.update({ search: { middlewares: [] } }) + expect(buildSearch()).toEqual({}) + }) + test('only applies route validation when requested', async () => { const events: Array = [] const validateSearch = vi.fn((search: Record) => { @@ -1722,6 +1761,56 @@ describe('buildLocation - basepath', () => { }) describe('buildLocation - params edge cases', () => { + test.each([false, true])( + 'keeps cached raw params intact across mutating lightweight parsers (throws: %s)', + (throws) => { + const root = new BaseRootRoute({}) + const parse = vi.fn((params: Record) => { + expect(params.id).toBe('original') + params.id = 'parsed' + if (throws) { + throw new Error('parse failed') + } + return { id: params.id } + }) + const item = new BaseRoute({ + getParentRoute: () => root, + path: '/items/$id', + }) + const history = createMemoryHistory({ + initialEntries: ['/items/original'], + }) + const router = createTestRouter({ + routeTree: root.addChildren([item]), + history, + }) + // Isolate live lightweight parsing from the matcher's captured route gate. + item.options.params = { parse } + const update = vi.fn((params: Record) => { + expect(params.id).toBe('parsed') + return { id: 'target' } + }) + try { + for (let repeat = 0; repeat < 2; repeat++) { + const location = router.buildLocation({ + to: '/items/$id', + _fromLocation: { ...router.latestLocation }, + params: update, + }) + expect(location.pathname).toBe('/items/target') + expect(router.getMatchedRoutes('/items/original')[1]).toEqual({ + id: 'original', + }) + } + expect(parse).toHaveBeenCalledTimes(2) + expect(parse.mock.calls[0]![0]).not.toBe(parse.mock.calls[1]![0]) + expect(update).toHaveBeenCalledTimes(2) + } finally { + history.destroy() + } + }, + ) + test('isolates mutating params updaters while preserving inherit and clear modes', () => { const rootRoute = new BaseRootRoute({}) const userRoute = new BaseRoute({ diff --git a/packages/router-core/tests/lightweight-location.bench.ts b/packages/router-core/tests/lightweight-location.bench.ts new file mode 100644 index 0000000000..a9189801c8 --- /dev/null +++ b/packages/router-core/tests/lightweight-location.bench.ts @@ -0,0 +1,64 @@ +import { bench, describe, expect } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute, BaseRoute } from '../src' +import { createTestRouter } from './routerTestUtils' + +if (process.env.TSR_LINK_PERF === '1') { + describe.each([false, true])( + 'cold lightweight locations (server: %s)', + (isServer) => { + for (const count of [1, 8, 32]) { + const root = new BaseRootRoute({}) + const segments = Array.from( + { length: count }, + (_, index) => `$p${index}`, + ) + const source = new BaseRoute({ + getParentRoute: () => root, + path: `/source/${segments.join('/')}`, + }) + const target = new BaseRoute({ + getParentRoute: () => root, + path: '/target', + }) + const history = createMemoryHistory({ initialEntries: ['/'] }) + const router = createTestRouter({ + routeTree: root.addChildren([source, target]), + history, + isServer, + scrollRestoration: false, + }) + history.destroy() + const pathname = `/source/${segments.map((_, index) => String(index)).join('/')}` + const location = { + ...router.latestLocation, + pathname, + href: pathname, + publicHref: pathname, + } + let checksum = 0 + const iterations = 256 + function run() { + checksum = 0 + for (let index = 0; index < iterations; index++) { + checksum += router.buildLocation({ + to: '/target', + params: true, + _fromLocation: { ...location }, + }).pathname.length + } + } + run() + expect(checksum).toBe(iterations * '/target'.length) + bench(`${count} source params`, run, { + time: 1000, + warmupTime: 200, + throws: true, + teardown: () => { + expect(checksum).toBe(iterations * '/target'.length) + }, + }) + } + }, + ) +} diff --git a/packages/router-core/tests/path-interpolation.bench.ts b/packages/router-core/tests/path-interpolation.bench.ts index 8f4b6c1e5c..ec3bbfaeac 100644 --- a/packages/router-core/tests/path-interpolation.bench.ts +++ b/packages/router-core/tests/path-interpolation.bench.ts @@ -2,6 +2,7 @@ import { bench, describe, expect } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { compileDecodeCharMap, interpolatePath } from '../src/path' +import { decodePath } from '../src/utils' import { createTestRouter } from './routerTestUtils' import type { PathInterpolationTestOptions } from './routerTestUtils' @@ -146,13 +147,15 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { path: input.path || '/', params: input.params, route: register ? routes.get(input.path || '/') : undefined, - expected: interpolatePath( - input.path, - input.params, - input.decoder, - undefined, - undefined, - input.server, + expected: decodePath( + interpolatePath( + input.path, + input.params, + input.decoder, + undefined, + undefined, + input.server, + ), ), })) let checksum = 0 @@ -182,7 +185,7 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { } bench( - 'shared interpolation batch', + 'shared interpolation and normalization batch', () => { let length = 0 for (const call of calls) { diff --git a/packages/router-core/tests/path.test.ts b/packages/router-core/tests/path.test.ts index b67d5fe1e2..fc3f806fc7 100644 --- a/packages/router-core/tests/path.test.ts +++ b/packages/router-core/tests/path.test.ts @@ -37,6 +37,7 @@ describe.each([false, true])( path: '/users/$id', params: { id: 'cafe\u0301' }, expected: '/users/cafe%CC%81', + normalized: '/users/cafe\u0301', }, { path: '/users/{$id}.json', @@ -68,6 +69,7 @@ describe.each([false, true])( path: '/files/$', params: { _splat: 'a b/c+d' }, expected: '/files/a%20b/c%2Bd', + normalized: '/files/a b/c%2Bd', }, { path: '/files/prefix{$}suffix', @@ -82,7 +84,7 @@ describe.each([false, true])( }, ])( 'interpolates and caches $path with $params', - ({ path, params, expected }) => { + ({ path, params, expected, normalized }) => { const interpolate = createPathInterpolator() const options = { path, params, server } expect( @@ -95,9 +97,9 @@ describe.each([false, true])( server, ), ).toBe(expected) - expect(interpolate(options)).toBe(expected) + expect(interpolate(options)).toBe(normalized ?? expected) expect(interpolate({ ...options, params: { ...params } })).toBe( - expected, + normalized ?? expected, ) }, ) @@ -127,6 +129,21 @@ describe.each([false, true])( expect(decoder).toHaveBeenCalledTimes(2) }) + it('normalizes non-string fallbacks without memoizing object coercion', () => { + const interpolate = createPathInterpolator() + const toString = vi.fn(() => 'one two') + const options = { + path: '/users/$id', + params: { id: { toString } }, + server, + } + expect(interpolate(options)).toBe('/users/one two') + expect(toString).toHaveBeenCalledOnce() + toString.mockReturnValue('next value') + expect(interpolate(options)).toBe('/users/next value') + expect(toString).toHaveBeenCalledTimes(2) + }) + it('invalidates results when allowed-character decoding changes', () => { const interpolate = createPathInterpolator() const options = { diff --git a/packages/router-core/tests/route-tree-caches.test.ts b/packages/router-core/tests/route-tree-caches.test.ts index 85ea2ec1af..fa222d51e2 100644 --- a/packages/router-core/tests/route-tree-caches.test.ts +++ b/packages/router-core/tests/route-tree-caches.test.ts @@ -37,6 +37,33 @@ function history() { return result } +test.each([false, true])( + 'caches the canonical pathname without changing hrefs (server: %s)', + (isServer) => { + const { routeTree, item } = createRoutes() + const router = createTestRouter({ routeTree, history: history(), isServer }) + for (const [id, pathname, href] of [ + ['one two', '/items/one two', '/items/one%20two'], + ['caf\u00e9', '/items/caf\u00e9', '/items/caf%C3%A9'], + ['a/b', '/items/a%2Fb', '/items/a%2Fb'], + ['%2F', '/items/%252F', '/items/%252F'], + ['a\\b', '/items/a%5Cb', '/items/a%5Cb'], + ['a?b#c', '/items/a%3Fb%23c', '/items/a%3Fb%23c'], + ['a\tb', '/items/a%09b', '/items/a%09b'], + ] as const) { + for (let repeat = 0; repeat < 2; repeat++) { + const result = router.buildLocation({ + to: '/items/$id', + params: { id }, + }) + expect(result.pathname).toBe(pathname) + expect(result.href).toBe(href) + expect(item._pathCache?.[1].get(id)).toBe(pathname) + } + } + }, +) + test('reuses route caches after server request cleanup without sharing match state', async () => { const { routeTree, item, root } = createRoutes() const routers: Array = [] From cb8749e9fcd32d2290bf6c957b2701c3c0a14da5 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:04 +0200 Subject: [PATCH 014/175] perf(vue-router): remove redundant match fragment (#8326) Remove the inner Fragment around scroll restoration while retaining the outer Fragment, script/null condition and fresh shell-slot VNodes. Cover child state across shell updates/invalidation and SSR script selectors/nonces. Native malloc profiling on macOS arm64, Node 24.8.0, with the existing CodSpeed flags, seven preparation calls and three fresh final captures: - Interrupted peak after middleware split: 733736 -> 295024 bytes (-59.79%). - Navigation peak after middleware split: 420776 -> 420896 (+120 bytes). - Composed vs f2530bf453: interrupted -59.79%, navigation -19.32%, unique-location churn effectively unchanged (-0.016%). These are local native measurements, not a Linux CodSpeed CI result. Navigation end-of-region outstanding malloc increases 12472 bytes versus the middleware-only control; this endpoint is before teardown, not retained JS heap. Total allocated native bytes decrease. Standalone Vue canonical Link CPU: 5.32037 -> 5.30865 ms/batch, -0.22% [-4.04%, +3.75%], inconclusive across four isolated process pairs. Incremental gzip: Vue Router minimal/full +1/+1 byte, Vue Start 0/-2. All four Vue bundles remove 12 raw bytes; other 14 fixtures are identical. No benchmark flags, workload counts, public APIs or features changed. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/cyan-beers-kneel.md | 5 ++ packages/vue-router/src/Match.tsx | 8 +- packages/vue-router/tests/Match.test.tsx | 107 +++++++++++++++++++++++ 3 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 .changeset/cyan-beers-kneel.md create mode 100644 packages/vue-router/tests/Match.test.tsx diff --git a/.changeset/cyan-beers-kneel.md b/.changeset/cyan-beers-kneel.md new file mode 100644 index 0000000000..1bdbfe6ded --- /dev/null +++ b/.changeset/cyan-beers-kneel.md @@ -0,0 +1,5 @@ +--- +'@tanstack/vue-router': patch +--- + +Remove an unnecessary match Fragment to reduce VNode allocation and transient JIT compilation memory while preserving route content and scroll restoration. diff --git a/packages/vue-router/src/Match.tsx b/packages/vue-router/src/Match.tsx index 552dcc2e30..de1bcfa67a 100644 --- a/packages/vue-router/src/Match.tsx +++ b/packages/vue-router/src/Match.tsx @@ -129,11 +129,9 @@ export const Match = Vue.defineComponent({ return Vue.h(Vue.Fragment, null, [ content, - Vue.h(Vue.Fragment, null, [ - (isServer ?? router.isServer) && router.options.scrollRestoration - ? Vue.h(ScrollRestoration) - : null, - ]), + (isServer ?? router.isServer) && router.options.scrollRestoration + ? Vue.h(ScrollRestoration) + : null, ]) } diff --git a/packages/vue-router/tests/Match.test.tsx b/packages/vue-router/tests/Match.test.tsx new file mode 100644 index 0000000000..0d2e7b6f15 --- /dev/null +++ b/packages/vue-router/tests/Match.test.tsx @@ -0,0 +1,107 @@ +import * as Vue from 'vue' +import { renderToString } from 'vue/server-renderer' +import { afterEach, expect, test, vi } from 'vitest' +import { cleanup, fireEvent, render } from '@testing-library/vue' +import { + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, +} from '../src' + +afterEach(cleanup) + +function createTestRouter( + scrollRestoration: boolean | (() => boolean), + isServer = false, +) { + const revision = Vue.ref(0) + const mounted = vi.fn() + const Child = Vue.defineComponent({ + setup() { + const count = Vue.ref(0) + Vue.onMounted(mounted) + return () => + }, + }) + const Shell = Vue.defineComponent({ + setup(_, { slots }) { + return () => ( +
+ {slots.default?.()} +
+ ) + }, + }) + const root = createRootRoute({ + shellComponent: Shell, + component: () => ( +
+ +
+ ), + }) + const child = createRoute({ + getParentRoute: () => root, + path: '/child', + component: Child, + }) + const router = createRouter({ + routeTree: root.addChildren([child]), + history: createMemoryHistory({ initialEntries: ['/child'] }), + isServer, + scrollRestoration, + ssr: { nonce: 'test-nonce' }, + }) + return { router, revision, mounted } +} + +test.each([false, true])( + 'preserves root child state through shell updates (scroll restoration: %s)', + async (scrollRestoration) => { + const { router, revision, mounted } = createTestRouter(scrollRestoration) + const app = render() + const button = await app.findByRole('button') + + await fireEvent.click(button) + revision.value++ + router.update({ scrollRestoration: !scrollRestoration }) + await router.invalidate() + await Vue.nextTick() + + expect(app.getByRole('button')).toBe(button) + expect(button).toHaveTextContent('1') + expect(mounted).toHaveBeenCalledOnce() + expect(app.getByTestId('shell')).toHaveAttribute('data-revision', '1') + }, +) + +test.each([ + ['disabled', false, false], + ['enabled', true, true], + ['skipped by selector', (): boolean => false, false], + ['enabled by selector', (): boolean => true, true], +] as const)( + 'renders root child content and the restoration script on the server (%s)', + async (_, scrollRestoration, hasScript) => { + const { router } = createTestRouter(scrollRestoration, true) + await router.load() + const html = await renderToString( + Vue.createSSRApp(() => ), + ) + const container = document.createElement('div') + container.innerHTML = html + + expect(container.querySelector('main > button')).toHaveTextContent('0') + const scripts = container.querySelectorAll('main > script') + expect(scripts).toHaveLength(hasScript ? 1 : 0) + if (hasScript) { + expect(scripts[0]).toHaveAttribute('nonce', 'test-nonce') + expect(scripts[0]?.textContent).toContain( + 'document.currentScript.remove()', + ) + } + }, +) From 634da9176e16fa8aa49af459bbb054fcae7d85ef Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:04 +0200 Subject: [PATCH 015/175] perf(router-core): streamline route initialization (#8327) * perf(router-core): reuse parsed route segments for interpolation Capture original template segments during the existing route-tree parse. Interpolation only substitutes current values and produces fresh metadata; it never reparses known routes, including first use and trailing-slash variants. Rebuild the captured data with the tree for HMR. Parse unknown templates once per bounded entry and reuse their segments across decoder changes. Update Devtools and internal test consumers. Remove internal undefined-path/server-flag compatibility and the divergent SSR scanner. Both runtimes follow the canonical splat grammar. Keep the 128-result route cache after measuring its removal rather than adding an unproven configuration option. Measured against 41e42009be with frozen production bundles: - 26 client/SSR Link cases, 4 paired replicas each: client unique params -3.94% CPU [95% CI -6.30,-1.52], optionals -2.58% [-4.34,-0.78]. Other cases inconclusive; no supported end-to-end slowdown. - 1000-route client high-cardinality interpolation -18.55..-24.83%; matching with fresh metadata -14.69..-19.12% (5 process samples). - 1000-route client setup costs an extra 0.084..0.192 ms; sparse first use costs about 0.23..0.28 us/call. Retained segment data adds about 200..298 B per dynamic route in the measured fixtures. - All 18 bundle cases add 303..392 gzip B; React minimal/full +311/+326 B. - Cache-off saves 0.8..0.9 MiB per 1000 used routes and 1.2..1.5 MiB after growth, but client encoding/splat Links regress 25.31%/12.71% and SSR encoding/splats regress 21.76%/25.37%; retain result caching. - Shared-value sampled allocations rise 2.18% client/5.23% SSR without that cache. Native Vue peaks remain effectively unchanged (macOS captures, not a new Linux CodSpeed CI run). Benchmark counts/JIT/GC flags unchanged. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(router-core): avoid temporary route initialization joins Build route IDs and full paths with direct string assembly and the existing cleanPath normalizer. Avoid temporary filter/join arrays and the second ID normalization. Pathless layouts keep the parent's fullPath unchanged. Add a focused construction benchmark with fresh route objects and separate processing-only / allocation-plus-processing cases at 100/1000/10000 routes. Document why client-nav route-tree-scale is not a construction benchmark. Standalone attribution against 41e42009be, otherwise unchanged Uint16Array parser, 7 fresh process replicas and 1000 routes per tree: - Client processRouteTree+route.init CPU improves 11.48-19.57% across static, dynamic, nested and mixed trees (all 95% intervals below zero). - Server CPU improves 9.39-22.29% (all 95% intervals below zero). - React Router minimal gzip +6 bytes; the composed parse-once implementation is measured separately against the required original bundle budget. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(router-core): reuse stable path parameter decoders Compare allowed-character values rather than recompiling the decoder on every provider-style options update. Equivalent arrays retain warm route paths; in-place edits and option removal update encoding correctly. Publish the configuration key only after successful compilation, and declare optional state without forcing an unused instance field. Isolated against 3e0b23f46c with the same path-decoder.bench.ts, seven alternating independent process pairs (200 locations per batch): - Stable provider updates: 143.3707 -> 122.5572 us, -14.52% (95% process interval -15.51% to -13.52%). - No-update control: 119.1170 -> 118.8155 us, -0.25% (interval -1.05% to +0.55%). - Deliberately changing configuration every batch: 143.8213 -> 147.7340 us, +2.72% (interval +1.38% to +4.08%). Reconfiguration remains the cold path. These are decoder/update mechanism measurements, not a claim about every React Link render. Standalone React minimal gzip: 86121 -> 86142 bytes (+21); raw +48 bytes, Brotli +10 bytes. Add coverage for equivalent options, mutation, removal, direct overrides and retrying failed compilation. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(router-core): simplify route-owned path interpolation Share one canonical scanner between tree processing and unknown templates. Retain compact dynamic records and derive original parameter names lazily, instead of reconstructing them during matching. Keep initialization/indexing and traversal in processRouteTree, including existing nested-mask behavior. Make pathParamsAllowedCharacters initialization-only, as requested. Compile the readonly decoder once, remove decoder keys/stamps/update invalidation, and keep path results on each route. Preserve the shared bounded unmatched template cache across SSR requests; lightweight matching stays router-local. Do not add an encoding-specific cache, router-level route map or bulk clear. Move Devtools-only navigation availability outside the hot formatter. Preserve legacy standalone fallback match identity and cache behavior, including inherited params and route-tree replacement. Retain useful encoding comments and explicit tuple-slot labels. Final measurements (Node 24.8.0, built production JS, unchanged workloads): - Original React client-nav Link loop versus 41e42009be, four balanced fresh-process pairs: CPU 2.5015016 -> 2.4370936 ms per 8-navigation batch, -2.57% (95% process interval -3.72% to -1.42%). Wall -2.58%. - Fresh 1000-route client processing/init: static -12.39%, dynamic -5.34%, nested -6.54%, mixed -2.59%. Server static -9.12%; remaining intervals are reported separately and the mixed-server result is inconclusive. - All 18 gzip fixtures are below 41e by 47-88 bytes. React minimal: 85801 -> 85731; full: 89392 -> 89318. Raw JS -533..-697 bytes; Brotli varies by fixture rather than uniformly shrinking. - Full 26-case paired client/SSR Link suite: no supported regressions; most small changes are inconclusive, not claimed as universal speedups. - Warm retained path-cache heap saves about 7.8 KiB per 1000 routes in default/custom configurations. Native Vue peaks remain near baseline; peak, allocation totals and end outstanding are measured separately. Existing literal grammar/URL/matching expectations are preserved. The independent oracle covers 49638 segment cases and 338 matching/mask traces within the old offset range. Initialization-only encoding deliberately supersedes the previous live-update contract. Detailed measurements and rejected experiments remain in uncommitted session reports and LOG.md. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(router-core): initialize routes directly during tree processing Remove the optional initRoute callback and unconditionally call route.init({ originalIndex: index }) at the start of the parent-first visit, before indexing or parsing the route. Require init on this function's input without imposing it on masks or the shared template-scanning RouteLike type. Remove the Router and construction-benchmark forwarding wrappers. Adapt preinitialized matcher fixtures through one test-only helper with a non-enumerable no-op init; do not normalize their paths/IDs or change their expected grammar/matching results. Add real-route initialization order, index and exactly-once coverage. Performance versus bc71b06207, seven independent process pairs per shape/mode using the same built-JS entry and fresh route objects: - Server static 1000-route processing/init: 0.7781686 -> 0.7623686 ms/tree, CPU -2.06% (95% interval -3.26% to -0.84%); wall -2.10%. - Other construction cells are inconclusive, with no supported slowdown. - All 18 gzip fixtures improve by 10-26 bytes. React minimal: 85731 -> 85712 bytes (-19). Raw -20 bytes (-59 for Rsbuild); Brotli remains fixture-dependent. Object creation and forced GC are outside processing timers. The common measurement entry's obsolete third argument is ignored by the new code, so once-per-tree callback allocation savings are not overstated. Full measurements and logs remain in the session's direct-route-init-20260909 artifacts and uncommitted LOG.md. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(router-core): pass route initialization indexes directly Change the internal initializer to route.init(originalIndex). Update the Route interface, BaseRoute implementation, processRouteTree contract and both production call sites, including the standalone legacy fallback. Remove object-literal arguments without adding compatibility wrappers. Keep route ordering and stored indexes unchanged. Cover primitive arguments, index zero and the large legacy fallback index explicitly. Performance versus f2c2d55f99: - Seven independent fresh-process construction comparisons per shape/mode (100, 1000 and 10000 routes; static/dynamic/nested/mixed) show no statistically supported timing difference. Do not claim an unproven CPU or heap-byte improvement from the removed object literals. - All 18 gzip fixtures improve by 7-13 bytes. React minimal: 85712 -> 85702 (-10); full: 89303 -> 89291 (-12). - Raw JS decreases by 46 bytes in every fixture. Brotli varies. The same production-JS phase entry and workloads are used on both sides. Object creation and forced GC are outside processing timers. Detailed samples, intervals and logs remain in numeric-route-init-20260909 session artifacts and uncommitted LOG.md. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * update route trees * ci: apply automated fixes --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- .changeset/old-turkeys-fall.md | 8 + .changeset/pretty-lies-tan.md | 5 + .changeset/soft-pandas-burn.md | 5 + .changeset/soft-parts-count.md | 6 + .changeset/whole-ants-battle.md | 6 + .changeset/yummy-days-poke.md | 5 + benchmarks/client-nav/README.md | 18 + .../async-pipeline/vue/src/routeTree.gen.ts | 62 +- .../control-flow/vue/src/routeTree.gen.ts | 88 +- .../scenarios/head/vue/src/routeTree.gen.ts | 62 +- .../history/vue/src/routeTree.gen.ts | 44 +- .../scenarios/links/vue/src/routeTree.gen.ts | 26 +- .../loaders/vue/src/routeTree.gen.ts | 44 +- .../scenarios/mount/vue/src/routeTree.gen.ts | 162 ++-- .../preload/vue/src/routeTree.gen.ts | 26 +- .../route-tree-scale/vue/src/routeTree.gen.ts | 848 +++++++++--------- .../search-params/vue/src/routeTree.gen.ts | 36 +- docs/router/api/router/RouterOptionsType.md | 3 +- docs/router/api/router/RouterType.md | 3 +- docs/router/api/router/linkComponent.md | 2 +- docs/router/guide/path-params.md | 2 + packages/react-router/src/RouterProvider.tsx | 6 +- packages/react-router/tests/link.bench.tsx | 8 +- packages/router-core/src/index.ts | 2 + .../router-core/src/new-process-route-tree.ts | 765 ++++++++-------- packages/router-core/src/path.ts | 242 ++--- packages/router-core/src/route.ts | 35 +- packages/router-core/src/router.ts | 145 ++- .../router-core/tests/build-location.test.ts | 46 +- .../tests/curly-params-smoke.test.ts | 3 +- .../legacy-not-found-interpolation.test.ts | 105 +++ .../router-core/tests/match-by-path.test.ts | 6 +- .../router-core/tests/match-params.test.ts | 7 +- .../tests/new-process-route-tree.test.ts | 118 ++- .../tests/optional-path-params-clean.test.ts | 48 +- .../tests/optional-path-params.test.ts | 36 +- .../tests/original-param-names.test.ts | 139 +++ .../router-core/tests/parse-segment.test.ts | 52 ++ .../router-core/tests/path-decoder.bench.ts | 63 ++ .../router-core/tests/path-decoder.test.ts | 96 ++ .../tests/path-interpolation.bench.ts | 68 +- packages/router-core/tests/path.test.ts | 236 +++-- .../tests/route-initialization.test.ts | 60 ++ .../tests/route-interpolation.test.ts | 261 ++++++ .../tests/route-tree-caches.test.ts | 182 +++- .../tests/route-tree-construction.bench.ts | 100 +++ packages/router-core/tests/routerTestUtils.ts | 124 ++- .../src/BaseTanStackRouterDevtoolsPanel.tsx | 25 +- packages/solid-router/src/RouterProvider.tsx | 2 +- packages/solid-router/tests/link.bench.tsx | 8 +- packages/vue-router/src/RouterProvider.tsx | 2 +- packages/vue-router/tests/link.bench.tsx | 8 +- 52 files changed, 2727 insertions(+), 1732 deletions(-) create mode 100644 .changeset/old-turkeys-fall.md create mode 100644 .changeset/pretty-lies-tan.md create mode 100644 .changeset/soft-pandas-burn.md create mode 100644 .changeset/soft-parts-count.md create mode 100644 .changeset/whole-ants-battle.md create mode 100644 .changeset/yummy-days-poke.md create mode 100644 packages/router-core/tests/legacy-not-found-interpolation.test.ts create mode 100644 packages/router-core/tests/original-param-names.test.ts create mode 100644 packages/router-core/tests/parse-segment.test.ts create mode 100644 packages/router-core/tests/path-decoder.bench.ts create mode 100644 packages/router-core/tests/path-decoder.test.ts create mode 100644 packages/router-core/tests/route-initialization.test.ts create mode 100644 packages/router-core/tests/route-interpolation.test.ts create mode 100644 packages/router-core/tests/route-tree-construction.bench.ts diff --git a/.changeset/old-turkeys-fall.md b/.changeset/old-turkeys-fall.md new file mode 100644 index 0000000000..2c87a166d8 --- /dev/null +++ b/.changeset/old-turkeys-fall.md @@ -0,0 +1,8 @@ +--- +'@tanstack/router-core': patch +'@tanstack/react-router': patch +'@tanstack/solid-router': patch +'@tanstack/vue-router': patch +--- + +Make `pathParamsAllowedCharacters` initialization-only. Configure it when creating the router; changing allowed characters requires a new router instance. Remove decoder-update bookkeeping and decoder-change checks from route-owned path caches. diff --git a/.changeset/pretty-lies-tan.md b/.changeset/pretty-lies-tan.md new file mode 100644 index 0000000000..97bd55a286 --- /dev/null +++ b/.changeset/pretty-lies-tan.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Initialize routes directly during route-tree processing, removing the callback indirection while preserving parent-first initialization and route indexes. diff --git a/.changeset/soft-pandas-burn.md b/.changeset/soft-pandas-burn.md new file mode 100644 index 0000000000..c39081f749 --- /dev/null +++ b/.changeset/soft-pandas-burn.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Reduce route-tree initialization work by avoiding temporary path-joining arrays and duplicate ID normalization. diff --git a/.changeset/soft-parts-count.md b/.changeset/soft-parts-count.md new file mode 100644 index 0000000000..76d7d423ac --- /dev/null +++ b/.changeset/soft-parts-count.md @@ -0,0 +1,6 @@ +--- +'@tanstack/router-core': patch +'@tanstack/router-devtools-core': patch +--- + +Reuse parsed route segments when generating paths for navigation, Links, and Devtools. Preserve interpolation metadata and refresh segments when the route tree is rebuilt, without reparsing templates for new parameter values. diff --git a/.changeset/whole-ants-battle.md b/.changeset/whole-ants-battle.md new file mode 100644 index 0000000000..bdf6ed05bc --- /dev/null +++ b/.changeset/whole-ants-battle.md @@ -0,0 +1,6 @@ +--- +'@tanstack/router-core': patch +'@tanstack/router-devtools-core': patch +--- + +Share compact parsed route segments between matching and interpolation, preserve original parameter names, and avoid reparsing templates while building paths. Simplify route-tree traversal, reuse existing path helpers, and keep Devtools-only navigation validation out of the production formatter. Preserve dynamic match identity for standalone legacy fallback routes. diff --git a/.changeset/yummy-days-poke.md b/.changeset/yummy-days-poke.md new file mode 100644 index 0000000000..ae92d1a194 --- /dev/null +++ b/.changeset/yummy-days-poke.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Pass route initialization indexes directly instead of wrapping each index in an options object. diff --git a/benchmarks/client-nav/README.md b/benchmarks/client-nav/README.md index c2e6616d76..76e3d3e238 100644 --- a/benchmarks/client-nav/README.md +++ b/benchmarks/client-nav/README.md @@ -116,6 +116,24 @@ Typecheck benchmark sources (baseline + scenarios): CI=1 NX_DAEMON=false pnpm nx run @benchmarks/client-nav:test:types --outputStyle=stream --skipRemoteCache ``` +## Isolated route-tree construction + +`scenarios/route-tree-scale` measures navigation over an existing tree, not +construction. `scenarios/mount` includes construction but also rendering and +loading. To isolate initialization, use the core construction benchmark: + +```bash +TSR_LINK_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @tanstack/router-core:test:unit --outputStyle=stream --skipRemoteCache -- bench tests/route-tree-construction.bench.ts --run --testNamePattern=1000.routes --outputJson /tmp/route-tree-construction.json +``` + +It covers 100, 1,000, and 10,000 static, dynamic, nested, or mixed routes. +The processing-only case creates fresh route objects in an untimed +`beforeEach`, then measures `processRouteTree` and `route.init`. A separate +case includes route-object creation. Neither case measures first interpolation +or navigation. Remove the name filter to run all sizes. Compare identical +benchmark sources in separate checkouts and repeat fresh processes; a cached +router or repeatedly initialized tree is not a construction baseline. + ## Opt-in React Link performance suite `link-performance/` contains additional client-navigation and SSR workloads for diff --git a/benchmarks/client-nav/scenarios/async-pipeline/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/async-pipeline/vue/src/routeTree.gen.ts index ce26dc62d1..66b9efd7aa 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/vue/src/routeTree.gen.ts @@ -9,25 +9,25 @@ // 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 NestedRouteImport } from './routes/nested' import { Route as IndexRouteImport } from './routes/index' -import { Route as SlowIdRouteImport } from './routes/slow.$id' -import { Route as NestedIdRouteImport } from './routes/nested.$id' +import { Route as NestedRouteImport } from './routes/nested' import { Route as CtxIdRouteImport } from './routes/ctx.$id' +import { Route as NestedIdRouteImport } from './routes/nested.$id' +import { Route as SlowIdRouteImport } from './routes/slow.$id' -const NestedRoute = NestedRouteImport.update({ - id: '/nested', - path: '/nested', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const SlowIdRoute = SlowIdRouteImport.update({ - id: '/slow/$id', - path: '/slow/$id', +const NestedRoute = NestedRouteImport.update({ + id: '/nested', + path: '/nested', + getParentRoute: () => rootRouteImport, +} as any) +const CtxIdRoute = CtxIdRouteImport.update({ + id: '/ctx/$id', + path: '/ctx/$id', getParentRoute: () => rootRouteImport, } as any) const NestedIdRoute = NestedIdRouteImport.update({ @@ -35,9 +35,9 @@ const NestedIdRoute = NestedIdRouteImport.update({ path: '/$id', getParentRoute: () => NestedRoute, } as any) -const CtxIdRoute = CtxIdRouteImport.update({ - id: '/ctx/$id', - path: '/ctx/$id', +const SlowIdRoute = SlowIdRouteImport.update({ + id: '/slow/$id', + path: '/slow/$id', getParentRoute: () => rootRouteImport, } as any) @@ -80,13 +80,6 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/nested': { - id: '/nested' - path: '/nested' - fullPath: '/nested' - preLoaderRoute: typeof NestedRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -94,11 +87,18 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/slow/$id': { - id: '/slow/$id' - path: '/slow/$id' - fullPath: '/slow/$id' - preLoaderRoute: typeof SlowIdRouteImport + '/nested': { + id: '/nested' + path: '/nested' + fullPath: '/nested' + preLoaderRoute: typeof NestedRouteImport + parentRoute: typeof rootRouteImport + } + '/ctx/$id': { + id: '/ctx/$id' + path: '/ctx/$id' + fullPath: '/ctx/$id' + preLoaderRoute: typeof CtxIdRouteImport parentRoute: typeof rootRouteImport } '/nested/$id': { @@ -108,11 +108,11 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof NestedIdRouteImport parentRoute: typeof NestedRoute } - '/ctx/$id': { - id: '/ctx/$id' - path: '/ctx/$id' - fullPath: '/ctx/$id' - preLoaderRoute: typeof CtxIdRouteImport + '/slow/$id': { + id: '/slow/$id' + path: '/slow/$id' + fullPath: '/slow/$id' + preLoaderRoute: typeof SlowIdRouteImport parentRoute: typeof rootRouteImport } } diff --git a/benchmarks/client-nav/scenarios/control-flow/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/control-flow/vue/src/routeTree.gen.ts index 60fc846f89..6b53a6a203 100644 --- a/benchmarks/client-nav/scenarios/control-flow/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/control-flow/vue/src/routeTree.gen.ts @@ -9,26 +9,16 @@ // 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 TargetRouteImport } from './routes/target' -import { Route as Hop2RouteImport } from './routes/hop2' -import { Route as Hop1RouteImport } from './routes/hop1' -import { Route as BrokenRouteImport } from './routes/broken' import { Route as IndexRouteImport } from './routes/index' +import { Route as BrokenRouteImport } from './routes/broken' +import { Route as Hop1RouteImport } from './routes/hop1' +import { Route as Hop2RouteImport } from './routes/hop2' +import { Route as TargetRouteImport } from './routes/target' import { Route as MissingIdRouteImport } from './routes/missing.$id' -const TargetRoute = TargetRouteImport.update({ - id: '/target', - path: '/target', - getParentRoute: () => rootRouteImport, -} as any) -const Hop2Route = Hop2RouteImport.update({ - id: '/hop2', - path: '/hop2', - getParentRoute: () => rootRouteImport, -} as any) -const Hop1Route = Hop1RouteImport.update({ - id: '/hop1', - path: '/hop1', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const BrokenRoute = BrokenRouteImport.update({ @@ -36,9 +26,19 @@ const BrokenRoute = BrokenRouteImport.update({ path: '/broken', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const Hop1Route = Hop1RouteImport.update({ + id: '/hop1', + path: '/hop1', + getParentRoute: () => rootRouteImport, +} as any) +const Hop2Route = Hop2RouteImport.update({ + id: '/hop2', + path: '/hop2', + getParentRoute: () => rootRouteImport, +} as any) +const TargetRoute = TargetRouteImport.update({ + id: '/target', + path: '/target', getParentRoute: () => rootRouteImport, } as any) const MissingIdRoute = MissingIdRouteImport.update({ @@ -98,25 +98,11 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/target': { - id: '/target' - path: '/target' - fullPath: '/target' - preLoaderRoute: typeof TargetRouteImport - parentRoute: typeof rootRouteImport - } - '/hop2': { - id: '/hop2' - path: '/hop2' - fullPath: '/hop2' - preLoaderRoute: typeof Hop2RouteImport - parentRoute: typeof rootRouteImport - } - '/hop1': { - id: '/hop1' - path: '/hop1' - fullPath: '/hop1' - preLoaderRoute: typeof Hop1RouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/broken': { @@ -126,11 +112,25 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof BrokenRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/hop1': { + id: '/hop1' + path: '/hop1' + fullPath: '/hop1' + preLoaderRoute: typeof Hop1RouteImport + parentRoute: typeof rootRouteImport + } + '/hop2': { + id: '/hop2' + path: '/hop2' + fullPath: '/hop2' + preLoaderRoute: typeof Hop2RouteImport + parentRoute: typeof rootRouteImport + } + '/target': { + id: '/target' + path: '/target' + fullPath: '/target' + preLoaderRoute: typeof TargetRouteImport parentRoute: typeof rootRouteImport } '/missing/$id': { diff --git a/benchmarks/client-nav/scenarios/head/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/head/vue/src/routeTree.gen.ts index b115854c26..161f99a65c 100644 --- a/benchmarks/client-nav/scenarios/head/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/head/vue/src/routeTree.gen.ts @@ -9,15 +9,15 @@ // 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 SettingsRouteImport } from './routes/settings' -import { Route as DocsRouteImport } from './routes/docs' import { Route as IndexRouteImport } from './routes/index' -import { Route as DocsSectionRouteImport } from './routes/docs.$section' +import { Route as DocsRouteImport } from './routes/docs' +import { Route as SettingsRouteImport } from './routes/settings' import { Route as ArticlesIdRouteImport } from './routes/articles.$id' +import { Route as DocsSectionRouteImport } from './routes/docs.$section' -const SettingsRoute = SettingsRouteImport.update({ - id: '/settings', - path: '/settings', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const DocsRoute = DocsRouteImport.update({ @@ -25,9 +25,14 @@ const DocsRoute = DocsRouteImport.update({ path: '/docs', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const SettingsRoute = SettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => rootRouteImport, +} as any) +const ArticlesIdRoute = ArticlesIdRouteImport.update({ + id: '/articles/$id', + path: '/articles/$id', getParentRoute: () => rootRouteImport, } as any) const DocsSectionRoute = DocsSectionRouteImport.update({ @@ -35,11 +40,6 @@ const DocsSectionRoute = DocsSectionRouteImport.update({ path: '/$section', getParentRoute: () => DocsRoute, } as any) -const ArticlesIdRoute = ArticlesIdRouteImport.update({ - id: '/articles/$id', - path: '/articles/$id', - getParentRoute: () => rootRouteImport, -} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -86,11 +86,11 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/settings': { - id: '/settings' - path: '/settings' - fullPath: '/settings' - preLoaderRoute: typeof SettingsRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/docs': { @@ -100,11 +100,18 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof DocsRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/settings': { + id: '/settings' + path: '/settings' + fullPath: '/settings' + preLoaderRoute: typeof SettingsRouteImport + parentRoute: typeof rootRouteImport + } + '/articles/$id': { + id: '/articles/$id' + path: '/articles/$id' + fullPath: '/articles/$id' + preLoaderRoute: typeof ArticlesIdRouteImport parentRoute: typeof rootRouteImport } '/docs/$section': { @@ -114,13 +121,6 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof DocsSectionRouteImport parentRoute: typeof DocsRoute } - '/articles/$id': { - id: '/articles/$id' - path: '/articles/$id' - fullPath: '/articles/$id' - preLoaderRoute: typeof ArticlesIdRouteImport - parentRoute: typeof rootRouteImport - } } } diff --git a/benchmarks/client-nav/scenarios/history/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/history/vue/src/routeTree.gen.ts index cee1b68870..519aef7c8f 100644 --- a/benchmarks/client-nav/scenarios/history/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/history/vue/src/routeTree.gen.ts @@ -9,24 +9,19 @@ // 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 GalleryRouteImport } from './routes/gallery' import { Route as IndexRouteImport } from './routes/index' -import { Route as PhotosPhotoIdRouteImport } from './routes/photos.$photoId' +import { Route as GalleryRouteImport } from './routes/gallery' import { Route as PagesNRouteImport } from './routes/pages.$n' +import { Route as PhotosPhotoIdRouteImport } from './routes/photos.$photoId' -const GalleryRoute = GalleryRouteImport.update({ - id: '/gallery', - path: '/gallery', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const PhotosPhotoIdRoute = PhotosPhotoIdRouteImport.update({ - id: '/photos/$photoId', - path: '/photos/$photoId', +const GalleryRoute = GalleryRouteImport.update({ + id: '/gallery', + path: '/gallery', getParentRoute: () => rootRouteImport, } as any) const PagesNRoute = PagesNRouteImport.update({ @@ -34,6 +29,11 @@ const PagesNRoute = PagesNRouteImport.update({ path: '/pages/$n', getParentRoute: () => rootRouteImport, } as any) +const PhotosPhotoIdRoute = PhotosPhotoIdRouteImport.update({ + id: '/photos/$photoId', + path: '/photos/$photoId', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -71,13 +71,6 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/gallery': { - id: '/gallery' - path: '/gallery' - fullPath: '/gallery' - preLoaderRoute: typeof GalleryRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -85,11 +78,11 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/photos/$photoId': { - id: '/photos/$photoId' - path: '/photos/$photoId' - fullPath: '/photos/$photoId' - preLoaderRoute: typeof PhotosPhotoIdRouteImport + '/gallery': { + id: '/gallery' + path: '/gallery' + fullPath: '/gallery' + preLoaderRoute: typeof GalleryRouteImport parentRoute: typeof rootRouteImport } '/pages/$n': { @@ -99,6 +92,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof PagesNRouteImport parentRoute: typeof rootRouteImport } + '/photos/$photoId': { + id: '/photos/$photoId' + path: '/photos/$photoId' + fullPath: '/photos/$photoId' + preLoaderRoute: typeof PhotosPhotoIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/client-nav/scenarios/links/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/links/vue/src/routeTree.gen.ts index cee64be43c..7d2b1e9bbb 100644 --- a/benchmarks/client-nav/scenarios/links/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/links/vue/src/routeTree.gen.ts @@ -9,20 +9,20 @@ // 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 AboutRouteImport } from './routes/about' import { Route as IndexRouteImport } from './routes/index' +import { Route as AboutRouteImport } from './routes/about' import { Route as ItemsIdRouteImport } from './routes/items.$id' -const AboutRoute = AboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) +const AboutRoute = AboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => rootRouteImport, +} as any) const ItemsIdRoute = ItemsIdRouteImport.update({ id: '/items/$id', path: '/items/$id', @@ -61,13 +61,6 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/about': { - id: '/about' - path: '/about' - fullPath: '/about' - preLoaderRoute: typeof AboutRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -75,6 +68,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } + '/about': { + id: '/about' + path: '/about' + fullPath: '/about' + preLoaderRoute: typeof AboutRouteImport + parentRoute: typeof rootRouteImport + } '/items/$id': { id: '/items/$id' path: '/items/$id' diff --git a/benchmarks/client-nav/scenarios/loaders/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/loaders/vue/src/routeTree.gen.ts index 25a82df477..10cb8f2aca 100644 --- a/benchmarks/client-nav/scenarios/loaders/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/loaders/vue/src/routeTree.gen.ts @@ -9,24 +9,19 @@ // 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 DepsRouteImport } from './routes/deps' import { Route as IndexRouteImport } from './routes/index' -import { Route as FreshIdRouteImport } from './routes/fresh.$id' +import { Route as DepsRouteImport } from './routes/deps' import { Route as CachedIdRouteImport } from './routes/cached.$id' +import { Route as FreshIdRouteImport } from './routes/fresh.$id' -const DepsRoute = DepsRouteImport.update({ - id: '/deps', - path: '/deps', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const FreshIdRoute = FreshIdRouteImport.update({ - id: '/fresh/$id', - path: '/fresh/$id', +const DepsRoute = DepsRouteImport.update({ + id: '/deps', + path: '/deps', getParentRoute: () => rootRouteImport, } as any) const CachedIdRoute = CachedIdRouteImport.update({ @@ -34,6 +29,11 @@ const CachedIdRoute = CachedIdRouteImport.update({ path: '/cached/$id', getParentRoute: () => rootRouteImport, } as any) +const FreshIdRoute = FreshIdRouteImport.update({ + id: '/fresh/$id', + path: '/fresh/$id', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -71,13 +71,6 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/deps': { - id: '/deps' - path: '/deps' - fullPath: '/deps' - preLoaderRoute: typeof DepsRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -85,11 +78,11 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/fresh/$id': { - id: '/fresh/$id' - path: '/fresh/$id' - fullPath: '/fresh/$id' - preLoaderRoute: typeof FreshIdRouteImport + '/deps': { + id: '/deps' + path: '/deps' + fullPath: '/deps' + preLoaderRoute: typeof DepsRouteImport parentRoute: typeof rootRouteImport } '/cached/$id': { @@ -99,6 +92,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof CachedIdRouteImport parentRoute: typeof rootRouteImport } + '/fresh/$id': { + id: '/fresh/$id' + path: '/fresh/$id' + fullPath: '/fresh/$id' + preLoaderRoute: typeof FreshIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/client-nav/scenarios/mount/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/mount/vue/src/routeTree.gen.ts index 98643d63c9..cd27c917e1 100644 --- a/benchmarks/client-nav/scenarios/mount/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/mount/vue/src/routeTree.gen.ts @@ -9,35 +9,20 @@ // 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 ShopRouteImport } from './routes/shop' -import { Route as SettingsRouteImport } from './routes/settings' -import { Route as SearchRouteImport } from './routes/search' -import { Route as BlogRouteImport } from './routes/blog' -import { Route as AboutRouteImport } from './routes/about' import { Route as IndexRouteImport } from './routes/index' -import { Route as ShopIndexRouteImport } from './routes/shop.index' +import { Route as AboutRouteImport } from './routes/about' +import { Route as BlogRouteImport } from './routes/blog' +import { Route as SearchRouteImport } from './routes/search' +import { Route as SettingsRouteImport } from './routes/settings' +import { Route as ShopRouteImport } from './routes/shop' import { Route as BlogIndexRouteImport } from './routes/blog.index' -import { Route as ShopProductIdRouteImport } from './routes/shop.$productId' import { Route as BlogSlugRouteImport } from './routes/blog.$slug' +import { Route as ShopIndexRouteImport } from './routes/shop.index' +import { Route as ShopProductIdRouteImport } from './routes/shop.$productId' -const ShopRoute = ShopRouteImport.update({ - id: '/shop', - path: '/shop', - getParentRoute: () => rootRouteImport, -} as any) -const SettingsRoute = SettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => rootRouteImport, -} as any) -const SearchRoute = SearchRouteImport.update({ - id: '/search', - path: '/search', - getParentRoute: () => rootRouteImport, -} as any) -const BlogRoute = BlogRouteImport.update({ - id: '/blog', - path: '/blog', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const AboutRoute = AboutRouteImport.update({ @@ -45,31 +30,46 @@ const AboutRoute = AboutRouteImport.update({ path: '/about', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const BlogRoute = BlogRouteImport.update({ + id: '/blog', + path: '/blog', getParentRoute: () => rootRouteImport, } as any) -const ShopIndexRoute = ShopIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => ShopRoute, +const SearchRoute = SearchRouteImport.update({ + id: '/search', + path: '/search', + getParentRoute: () => rootRouteImport, +} as any) +const SettingsRoute = SettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => rootRouteImport, +} as any) +const ShopRoute = ShopRouteImport.update({ + id: '/shop', + path: '/shop', + getParentRoute: () => rootRouteImport, } as any) const BlogIndexRoute = BlogIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => BlogRoute, } as any) -const ShopProductIdRoute = ShopProductIdRouteImport.update({ - id: '/$productId', - path: '/$productId', - getParentRoute: () => ShopRoute, -} as any) const BlogSlugRoute = BlogSlugRouteImport.update({ id: '/$slug', path: '/$slug', getParentRoute: () => BlogRoute, } as any) +const ShopIndexRoute = ShopIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => ShopRoute, +} as any) +const ShopProductIdRoute = ShopProductIdRouteImport.update({ + id: '/$productId', + path: '/$productId', + getParentRoute: () => ShopRoute, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -154,32 +154,11 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/shop': { - id: '/shop' - path: '/shop' - fullPath: '/shop' - preLoaderRoute: typeof ShopRouteImport - parentRoute: typeof rootRouteImport - } - '/settings': { - id: '/settings' - path: '/settings' - fullPath: '/settings' - preLoaderRoute: typeof SettingsRouteImport - parentRoute: typeof rootRouteImport - } - '/search': { - id: '/search' - path: '/search' - fullPath: '/search' - preLoaderRoute: typeof SearchRouteImport - parentRoute: typeof rootRouteImport - } - '/blog': { - id: '/blog' - path: '/blog' - fullPath: '/blog' - preLoaderRoute: typeof BlogRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/about': { @@ -189,19 +168,33 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/blog': { + id: '/blog' + path: '/blog' + fullPath: '/blog' + preLoaderRoute: typeof BlogRouteImport parentRoute: typeof rootRouteImport } - '/shop/': { - id: '/shop/' - path: '/' - fullPath: '/shop/' - preLoaderRoute: typeof ShopIndexRouteImport - parentRoute: typeof ShopRoute + '/search': { + id: '/search' + path: '/search' + fullPath: '/search' + preLoaderRoute: typeof SearchRouteImport + parentRoute: typeof rootRouteImport + } + '/settings': { + id: '/settings' + path: '/settings' + fullPath: '/settings' + preLoaderRoute: typeof SettingsRouteImport + parentRoute: typeof rootRouteImport + } + '/shop': { + id: '/shop' + path: '/shop' + fullPath: '/shop' + preLoaderRoute: typeof ShopRouteImport + parentRoute: typeof rootRouteImport } '/blog/': { id: '/blog/' @@ -210,13 +203,6 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof BlogIndexRouteImport parentRoute: typeof BlogRoute } - '/shop/$productId': { - id: '/shop/$productId' - path: '/$productId' - fullPath: '/shop/$productId' - preLoaderRoute: typeof ShopProductIdRouteImport - parentRoute: typeof ShopRoute - } '/blog/$slug': { id: '/blog/$slug' path: '/$slug' @@ -224,6 +210,20 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof BlogSlugRouteImport parentRoute: typeof BlogRoute } + '/shop/': { + id: '/shop/' + path: '/' + fullPath: '/shop/' + preLoaderRoute: typeof ShopIndexRouteImport + parentRoute: typeof ShopRoute + } + '/shop/$productId': { + id: '/shop/$productId' + path: '/$productId' + fullPath: '/shop/$productId' + preLoaderRoute: typeof ShopProductIdRouteImport + parentRoute: typeof ShopRoute + } } } diff --git a/benchmarks/client-nav/scenarios/preload/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/preload/vue/src/routeTree.gen.ts index 05a751060b..5f95d09da0 100644 --- a/benchmarks/client-nav/scenarios/preload/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/preload/vue/src/routeTree.gen.ts @@ -9,20 +9,20 @@ // 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 DocsRouteImport } from './routes/docs' import { Route as IndexRouteImport } from './routes/index' +import { Route as DocsRouteImport } from './routes/docs' import { Route as SectionsSectionRouteImport } from './routes/sections.$section' -const DocsRoute = DocsRouteImport.update({ - id: '/docs', - path: '/docs', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) +const DocsRoute = DocsRouteImport.update({ + id: '/docs', + path: '/docs', + getParentRoute: () => rootRouteImport, +} as any) const SectionsSectionRoute = SectionsSectionRouteImport.update({ id: '/sections/$section', path: '/sections/$section', @@ -61,13 +61,6 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/docs': { - id: '/docs' - path: '/docs' - fullPath: '/docs' - preLoaderRoute: typeof DocsRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -75,6 +68,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } + '/docs': { + id: '/docs' + path: '/docs' + fullPath: '/docs' + preLoaderRoute: typeof DocsRouteImport + parentRoute: typeof rootRouteImport + } '/sections/$section': { id: '/sections/$section' path: '/sections/$section' diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routeTree.gen.ts index a03c051a79..a12f981bb4 100644 --- a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routeTree.gen.ts @@ -9,68 +9,52 @@ // 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 SecFRouteImport } from './routes/sec-f' -import { Route as SecERouteImport } from './routes/sec-e' -import { Route as SecDRouteImport } from './routes/sec-d' -import { Route as SecCRouteImport } from './routes/sec-c' -import { Route as SecBRouteImport } from './routes/sec-b' -import { Route as SecARouteImport } from './routes/sec-a' -import { Route as LayoutRouteImport } from './routes/_layout' import { Route as IndexRouteImport } from './routes/index' -import { Route as SecFIndexRouteImport } from './routes/sec-f.index' -import { Route as SecEIndexRouteImport } from './routes/sec-e.index' -import { Route as SecDIndexRouteImport } from './routes/sec-d.index' -import { Route as SecCIndexRouteImport } from './routes/sec-c.index' -import { Route as SecBIndexRouteImport } from './routes/sec-b.index' -import { Route as SecAIndexRouteImport } from './routes/sec-a.index' -import { Route as SecFSettingsRouteImport } from './routes/sec-f.settings' -import { Route as SecFAboutRouteImport } from './routes/sec-f.about' -import { Route as SecFIdRouteImport } from './routes/sec-f.$id' -import { Route as SecESettingsRouteImport } from './routes/sec-e.settings' -import { Route as SecEAboutRouteImport } from './routes/sec-e.about' -import { Route as SecEIdRouteImport } from './routes/sec-e.$id' -import { Route as SecDSettingsRouteImport } from './routes/sec-d.settings' -import { Route as SecDAboutRouteImport } from './routes/sec-d.about' -import { Route as SecDIdRouteImport } from './routes/sec-d.$id' -import { Route as SecCSettingsRouteImport } from './routes/sec-c.settings' -import { Route as SecCAboutRouteImport } from './routes/sec-c.about' -import { Route as SecCIdRouteImport } from './routes/sec-c.$id' -import { Route as SecBSettingsRouteImport } from './routes/sec-b.settings' -import { Route as SecBAboutRouteImport } from './routes/sec-b.about' -import { Route as SecBIdRouteImport } from './routes/sec-b.$id' -import { Route as SecASettingsRouteImport } from './routes/sec-a.settings' -import { Route as SecAAboutRouteImport } from './routes/sec-a.about' -import { Route as SecAIdRouteImport } from './routes/sec-a.$id' -import { Route as ReleaseVChar123versionChar125RouteImport } from './routes/release.v{$version}' -import { Route as FilesSplatRouteImport } from './routes/files.$' -import { Route as LayoutBetaRouteImport } from './routes/_layout.beta' -import { Route as LayoutAlphaRouteImport } from './routes/_layout.alpha' -import { Route as marketingPromoRouteImport } from './routes/(marketing)/promo' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as SecARouteImport } from './routes/sec-a' +import { Route as SecBRouteImport } from './routes/sec-b' +import { Route as SecCRouteImport } from './routes/sec-c' +import { Route as SecDRouteImport } from './routes/sec-d' +import { Route as SecERouteImport } from './routes/sec-e' +import { Route as SecFRouteImport } from './routes/sec-f' import { Route as marketingPricingRouteImport } from './routes/(marketing)/pricing' +import { Route as marketingPromoRouteImport } from './routes/(marketing)/promo' +import { Route as LayoutAlphaRouteImport } from './routes/_layout.alpha' +import { Route as LayoutBetaRouteImport } from './routes/_layout.beta' +import { Route as FilesSplatRouteImport } from './routes/files.$' +import { Route as ReleaseVChar123versionChar125RouteImport } from './routes/release.v{$version}' +import { Route as SecAIndexRouteImport } from './routes/sec-a.index' +import { Route as SecAIdRouteImport } from './routes/sec-a.$id' +import { Route as SecAAboutRouteImport } from './routes/sec-a.about' +import { Route as SecASettingsRouteImport } from './routes/sec-a.settings' +import { Route as SecBIndexRouteImport } from './routes/sec-b.index' +import { Route as SecBIdRouteImport } from './routes/sec-b.$id' +import { Route as SecBAboutRouteImport } from './routes/sec-b.about' +import { Route as SecBSettingsRouteImport } from './routes/sec-b.settings' +import { Route as SecCIndexRouteImport } from './routes/sec-c.index' +import { Route as SecCIdRouteImport } from './routes/sec-c.$id' +import { Route as SecCAboutRouteImport } from './routes/sec-c.about' +import { Route as SecCSettingsRouteImport } from './routes/sec-c.settings' +import { Route as SecDIndexRouteImport } from './routes/sec-d.index' +import { Route as SecDIdRouteImport } from './routes/sec-d.$id' +import { Route as SecDAboutRouteImport } from './routes/sec-d.about' +import { Route as SecDSettingsRouteImport } from './routes/sec-d.settings' +import { Route as SecEIndexRouteImport } from './routes/sec-e.index' +import { Route as SecEIdRouteImport } from './routes/sec-e.$id' +import { Route as SecEAboutRouteImport } from './routes/sec-e.about' +import { Route as SecESettingsRouteImport } from './routes/sec-e.settings' +import { Route as SecFIndexRouteImport } from './routes/sec-f.index' +import { Route as SecFIdRouteImport } from './routes/sec-f.$id' +import { Route as SecFAboutRouteImport } from './routes/sec-f.about' +import { Route as SecFSettingsRouteImport } from './routes/sec-f.settings' -const SecFRoute = SecFRouteImport.update({ - id: '/sec-f', - path: '/sec-f', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) -const SecERoute = SecERouteImport.update({ - id: '/sec-e', - path: '/sec-e', - getParentRoute: () => rootRouteImport, -} as any) -const SecDRoute = SecDRouteImport.update({ - id: '/sec-d', - path: '/sec-d', - getParentRoute: () => rootRouteImport, -} as any) -const SecCRoute = SecCRouteImport.update({ - id: '/sec-c', - path: '/sec-c', - getParentRoute: () => rootRouteImport, -} as any) -const SecBRoute = SecBRouteImport.update({ - id: '/sec-b', - path: '/sec-b', +const LayoutRoute = LayoutRouteImport.update({ + id: '/_layout', getParentRoute: () => rootRouteImport, } as any) const SecARoute = SecARouteImport.update({ @@ -78,134 +62,55 @@ const SecARoute = SecARouteImport.update({ path: '/sec-a', getParentRoute: () => rootRouteImport, } as any) -const LayoutRoute = LayoutRouteImport.update({ - id: '/_layout', +const SecBRoute = SecBRouteImport.update({ + id: '/sec-b', + path: '/sec-b', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const SecCRoute = SecCRouteImport.update({ + id: '/sec-c', + path: '/sec-c', getParentRoute: () => rootRouteImport, } as any) -const SecFIndexRoute = SecFIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecFRoute, +const SecDRoute = SecDRouteImport.update({ + id: '/sec-d', + path: '/sec-d', + getParentRoute: () => rootRouteImport, } as any) -const SecEIndexRoute = SecEIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecERoute, +const SecERoute = SecERouteImport.update({ + id: '/sec-e', + path: '/sec-e', + getParentRoute: () => rootRouteImport, } as any) -const SecDIndexRoute = SecDIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecDRoute, +const SecFRoute = SecFRouteImport.update({ + id: '/sec-f', + path: '/sec-f', + getParentRoute: () => rootRouteImport, } as any) -const SecCIndexRoute = SecCIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecCRoute, +const marketingPricingRoute = marketingPricingRouteImport.update({ + id: '/(marketing)/pricing', + path: '/pricing', + getParentRoute: () => rootRouteImport, } as any) -const SecBIndexRoute = SecBIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecBRoute, +const marketingPromoRoute = marketingPromoRouteImport.update({ + id: '/(marketing)/promo', + path: '/promo', + getParentRoute: () => rootRouteImport, } as any) -const SecAIndexRoute = SecAIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecARoute, +const LayoutAlphaRoute = LayoutAlphaRouteImport.update({ + id: '/alpha', + path: '/alpha', + getParentRoute: () => LayoutRoute, } as any) -const SecFSettingsRoute = SecFSettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecFRoute, +const LayoutBetaRoute = LayoutBetaRouteImport.update({ + id: '/beta', + path: '/beta', + getParentRoute: () => LayoutRoute, } as any) -const SecFAboutRoute = SecFAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecFRoute, -} as any) -const SecFIdRoute = SecFIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecFRoute, -} as any) -const SecESettingsRoute = SecESettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecERoute, -} as any) -const SecEAboutRoute = SecEAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecERoute, -} as any) -const SecEIdRoute = SecEIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecERoute, -} as any) -const SecDSettingsRoute = SecDSettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecDRoute, -} as any) -const SecDAboutRoute = SecDAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecDRoute, -} as any) -const SecDIdRoute = SecDIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecDRoute, -} as any) -const SecCSettingsRoute = SecCSettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecCRoute, -} as any) -const SecCAboutRoute = SecCAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecCRoute, -} as any) -const SecCIdRoute = SecCIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecCRoute, -} as any) -const SecBSettingsRoute = SecBSettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecBRoute, -} as any) -const SecBAboutRoute = SecBAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecBRoute, -} as any) -const SecBIdRoute = SecBIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecBRoute, -} as any) -const SecASettingsRoute = SecASettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecARoute, -} as any) -const SecAAboutRoute = SecAAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecARoute, -} as any) -const SecAIdRoute = SecAIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecARoute, +const FilesSplatRoute = FilesSplatRouteImport.update({ + id: '/files/$', + path: '/files/$', + getParentRoute: () => rootRouteImport, } as any) const ReleaseVChar123versionChar125Route = ReleaseVChar123versionChar125RouteImport.update({ @@ -213,30 +118,125 @@ const ReleaseVChar123versionChar125Route = path: '/release/v{$version}', getParentRoute: () => rootRouteImport, } as any) -const FilesSplatRoute = FilesSplatRouteImport.update({ - id: '/files/$', - path: '/files/$', - getParentRoute: () => rootRouteImport, +const SecAIndexRoute = SecAIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecARoute, } as any) -const LayoutBetaRoute = LayoutBetaRouteImport.update({ - id: '/beta', - path: '/beta', - getParentRoute: () => LayoutRoute, +const SecAIdRoute = SecAIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecARoute, } as any) -const LayoutAlphaRoute = LayoutAlphaRouteImport.update({ - id: '/alpha', - path: '/alpha', - getParentRoute: () => LayoutRoute, +const SecAAboutRoute = SecAAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecARoute, } as any) -const marketingPromoRoute = marketingPromoRouteImport.update({ - id: '/(marketing)/promo', - path: '/promo', - getParentRoute: () => rootRouteImport, +const SecASettingsRoute = SecASettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecARoute, } as any) -const marketingPricingRoute = marketingPricingRouteImport.update({ - id: '/(marketing)/pricing', - path: '/pricing', - getParentRoute: () => rootRouteImport, +const SecBIndexRoute = SecBIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecBRoute, +} as any) +const SecBIdRoute = SecBIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecBRoute, +} as any) +const SecBAboutRoute = SecBAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecBRoute, +} as any) +const SecBSettingsRoute = SecBSettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecBRoute, +} as any) +const SecCIndexRoute = SecCIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecCRoute, +} as any) +const SecCIdRoute = SecCIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecCRoute, +} as any) +const SecCAboutRoute = SecCAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecCRoute, +} as any) +const SecCSettingsRoute = SecCSettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecCRoute, +} as any) +const SecDIndexRoute = SecDIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecDRoute, +} as any) +const SecDIdRoute = SecDIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecDRoute, +} as any) +const SecDAboutRoute = SecDAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecDRoute, +} as any) +const SecDSettingsRoute = SecDSettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecDRoute, +} as any) +const SecEIndexRoute = SecEIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecERoute, +} as any) +const SecEIdRoute = SecEIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecERoute, +} as any) +const SecEAboutRoute = SecEAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecERoute, +} as any) +const SecESettingsRoute = SecESettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecERoute, +} as any) +const SecFIndexRoute = SecFIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecFRoute, +} as any) +const SecFIdRoute = SecFIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecFRoute, +} as any) +const SecFAboutRoute = SecFAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecFRoute, +} as any) +const SecFSettingsRoute = SecFSettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecFRoute, } as any) export interface FileRoutesByFullPath { @@ -484,46 +484,11 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/sec-f': { - id: '/sec-f' - path: '/sec-f' - fullPath: '/sec-f' - preLoaderRoute: typeof SecFRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-e': { - id: '/sec-e' - path: '/sec-e' - fullPath: '/sec-e' - preLoaderRoute: typeof SecERouteImport - parentRoute: typeof rootRouteImport - } - '/sec-d': { - id: '/sec-d' - path: '/sec-d' - fullPath: '/sec-d' - preLoaderRoute: typeof SecDRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-c': { - id: '/sec-c' - path: '/sec-c' - fullPath: '/sec-c' - preLoaderRoute: typeof SecCRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-b': { - id: '/sec-b' - path: '/sec-b' - fullPath: '/sec-b' - preLoaderRoute: typeof SecBRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-a': { - id: '/sec-a' - path: '/sec-a' - fullPath: '/sec-a' - preLoaderRoute: typeof SecARouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/_layout': { @@ -533,47 +498,89 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/sec-a': { + id: '/sec-a' + path: '/sec-a' + fullPath: '/sec-a' + preLoaderRoute: typeof SecARouteImport parentRoute: typeof rootRouteImport } - '/sec-f/': { - id: '/sec-f/' - path: '/' - fullPath: '/sec-f/' - preLoaderRoute: typeof SecFIndexRouteImport - parentRoute: typeof SecFRoute + '/sec-b': { + id: '/sec-b' + path: '/sec-b' + fullPath: '/sec-b' + preLoaderRoute: typeof SecBRouteImport + parentRoute: typeof rootRouteImport } - '/sec-e/': { - id: '/sec-e/' - path: '/' - fullPath: '/sec-e/' - preLoaderRoute: typeof SecEIndexRouteImport - parentRoute: typeof SecERoute + '/sec-c': { + id: '/sec-c' + path: '/sec-c' + fullPath: '/sec-c' + preLoaderRoute: typeof SecCRouteImport + parentRoute: typeof rootRouteImport } - '/sec-d/': { - id: '/sec-d/' - path: '/' - fullPath: '/sec-d/' - preLoaderRoute: typeof SecDIndexRouteImport - parentRoute: typeof SecDRoute + '/sec-d': { + id: '/sec-d' + path: '/sec-d' + fullPath: '/sec-d' + preLoaderRoute: typeof SecDRouteImport + parentRoute: typeof rootRouteImport } - '/sec-c/': { - id: '/sec-c/' - path: '/' - fullPath: '/sec-c/' - preLoaderRoute: typeof SecCIndexRouteImport - parentRoute: typeof SecCRoute + '/sec-e': { + id: '/sec-e' + path: '/sec-e' + fullPath: '/sec-e' + preLoaderRoute: typeof SecERouteImport + parentRoute: typeof rootRouteImport } - '/sec-b/': { - id: '/sec-b/' - path: '/' - fullPath: '/sec-b/' - preLoaderRoute: typeof SecBIndexRouteImport - parentRoute: typeof SecBRoute + '/sec-f': { + id: '/sec-f' + path: '/sec-f' + fullPath: '/sec-f' + preLoaderRoute: typeof SecFRouteImport + parentRoute: typeof rootRouteImport + } + '/(marketing)/pricing': { + id: '/(marketing)/pricing' + path: '/pricing' + fullPath: '/pricing' + preLoaderRoute: typeof marketingPricingRouteImport + parentRoute: typeof rootRouteImport + } + '/(marketing)/promo': { + id: '/(marketing)/promo' + path: '/promo' + fullPath: '/promo' + preLoaderRoute: typeof marketingPromoRouteImport + parentRoute: typeof rootRouteImport + } + '/_layout/alpha': { + id: '/_layout/alpha' + path: '/alpha' + fullPath: '/alpha' + preLoaderRoute: typeof LayoutAlphaRouteImport + parentRoute: typeof LayoutRoute + } + '/_layout/beta': { + id: '/_layout/beta' + path: '/beta' + fullPath: '/beta' + preLoaderRoute: typeof LayoutBetaRouteImport + parentRoute: typeof LayoutRoute + } + '/files/$': { + id: '/files/$' + path: '/files/$' + fullPath: '/files/$' + preLoaderRoute: typeof FilesSplatRouteImport + parentRoute: typeof rootRouteImport + } + '/release/v{$version}': { + id: '/release/v{$version}' + path: '/release/v{$version}' + fullPath: '/release/v{$version}' + preLoaderRoute: typeof ReleaseVChar123versionChar125RouteImport + parentRoute: typeof rootRouteImport } '/sec-a/': { id: '/sec-a/' @@ -582,125 +589,6 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof SecAIndexRouteImport parentRoute: typeof SecARoute } - '/sec-f/settings': { - id: '/sec-f/settings' - path: '/settings' - fullPath: '/sec-f/settings' - preLoaderRoute: typeof SecFSettingsRouteImport - parentRoute: typeof SecFRoute - } - '/sec-f/about': { - id: '/sec-f/about' - path: '/about' - fullPath: '/sec-f/about' - preLoaderRoute: typeof SecFAboutRouteImport - parentRoute: typeof SecFRoute - } - '/sec-f/$id': { - id: '/sec-f/$id' - path: '/$id' - fullPath: '/sec-f/$id' - preLoaderRoute: typeof SecFIdRouteImport - parentRoute: typeof SecFRoute - } - '/sec-e/settings': { - id: '/sec-e/settings' - path: '/settings' - fullPath: '/sec-e/settings' - preLoaderRoute: typeof SecESettingsRouteImport - parentRoute: typeof SecERoute - } - '/sec-e/about': { - id: '/sec-e/about' - path: '/about' - fullPath: '/sec-e/about' - preLoaderRoute: typeof SecEAboutRouteImport - parentRoute: typeof SecERoute - } - '/sec-e/$id': { - id: '/sec-e/$id' - path: '/$id' - fullPath: '/sec-e/$id' - preLoaderRoute: typeof SecEIdRouteImport - parentRoute: typeof SecERoute - } - '/sec-d/settings': { - id: '/sec-d/settings' - path: '/settings' - fullPath: '/sec-d/settings' - preLoaderRoute: typeof SecDSettingsRouteImport - parentRoute: typeof SecDRoute - } - '/sec-d/about': { - id: '/sec-d/about' - path: '/about' - fullPath: '/sec-d/about' - preLoaderRoute: typeof SecDAboutRouteImport - parentRoute: typeof SecDRoute - } - '/sec-d/$id': { - id: '/sec-d/$id' - path: '/$id' - fullPath: '/sec-d/$id' - preLoaderRoute: typeof SecDIdRouteImport - parentRoute: typeof SecDRoute - } - '/sec-c/settings': { - id: '/sec-c/settings' - path: '/settings' - fullPath: '/sec-c/settings' - preLoaderRoute: typeof SecCSettingsRouteImport - parentRoute: typeof SecCRoute - } - '/sec-c/about': { - id: '/sec-c/about' - path: '/about' - fullPath: '/sec-c/about' - preLoaderRoute: typeof SecCAboutRouteImport - parentRoute: typeof SecCRoute - } - '/sec-c/$id': { - id: '/sec-c/$id' - path: '/$id' - fullPath: '/sec-c/$id' - preLoaderRoute: typeof SecCIdRouteImport - parentRoute: typeof SecCRoute - } - '/sec-b/settings': { - id: '/sec-b/settings' - path: '/settings' - fullPath: '/sec-b/settings' - preLoaderRoute: typeof SecBSettingsRouteImport - parentRoute: typeof SecBRoute - } - '/sec-b/about': { - id: '/sec-b/about' - path: '/about' - fullPath: '/sec-b/about' - preLoaderRoute: typeof SecBAboutRouteImport - parentRoute: typeof SecBRoute - } - '/sec-b/$id': { - id: '/sec-b/$id' - path: '/$id' - fullPath: '/sec-b/$id' - preLoaderRoute: typeof SecBIdRouteImport - parentRoute: typeof SecBRoute - } - '/sec-a/settings': { - id: '/sec-a/settings' - path: '/settings' - fullPath: '/sec-a/settings' - preLoaderRoute: typeof SecASettingsRouteImport - parentRoute: typeof SecARoute - } - '/sec-a/about': { - id: '/sec-a/about' - path: '/about' - fullPath: '/sec-a/about' - preLoaderRoute: typeof SecAAboutRouteImport - parentRoute: typeof SecARoute - } '/sec-a/$id': { id: '/sec-a/$id' path: '/$id' @@ -708,47 +596,159 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof SecAIdRouteImport parentRoute: typeof SecARoute } - '/release/v{$version}': { - id: '/release/v{$version}' - path: '/release/v{$version}' - fullPath: '/release/v{$version}' - preLoaderRoute: typeof ReleaseVChar123versionChar125RouteImport - parentRoute: typeof rootRouteImport + '/sec-a/about': { + id: '/sec-a/about' + path: '/about' + fullPath: '/sec-a/about' + preLoaderRoute: typeof SecAAboutRouteImport + parentRoute: typeof SecARoute } - '/files/$': { - id: '/files/$' - path: '/files/$' - fullPath: '/files/$' - preLoaderRoute: typeof FilesSplatRouteImport - parentRoute: typeof rootRouteImport + '/sec-a/settings': { + id: '/sec-a/settings' + path: '/settings' + fullPath: '/sec-a/settings' + preLoaderRoute: typeof SecASettingsRouteImport + parentRoute: typeof SecARoute } - '/_layout/beta': { - id: '/_layout/beta' - path: '/beta' - fullPath: '/beta' - preLoaderRoute: typeof LayoutBetaRouteImport - parentRoute: typeof LayoutRoute + '/sec-b/': { + id: '/sec-b/' + path: '/' + fullPath: '/sec-b/' + preLoaderRoute: typeof SecBIndexRouteImport + parentRoute: typeof SecBRoute } - '/_layout/alpha': { - id: '/_layout/alpha' - path: '/alpha' - fullPath: '/alpha' - preLoaderRoute: typeof LayoutAlphaRouteImport - parentRoute: typeof LayoutRoute + '/sec-b/$id': { + id: '/sec-b/$id' + path: '/$id' + fullPath: '/sec-b/$id' + preLoaderRoute: typeof SecBIdRouteImport + parentRoute: typeof SecBRoute } - '/(marketing)/promo': { - id: '/(marketing)/promo' - path: '/promo' - fullPath: '/promo' - preLoaderRoute: typeof marketingPromoRouteImport - parentRoute: typeof rootRouteImport + '/sec-b/about': { + id: '/sec-b/about' + path: '/about' + fullPath: '/sec-b/about' + preLoaderRoute: typeof SecBAboutRouteImport + parentRoute: typeof SecBRoute } - '/(marketing)/pricing': { - id: '/(marketing)/pricing' - path: '/pricing' - fullPath: '/pricing' - preLoaderRoute: typeof marketingPricingRouteImport - parentRoute: typeof rootRouteImport + '/sec-b/settings': { + id: '/sec-b/settings' + path: '/settings' + fullPath: '/sec-b/settings' + preLoaderRoute: typeof SecBSettingsRouteImport + parentRoute: typeof SecBRoute + } + '/sec-c/': { + id: '/sec-c/' + path: '/' + fullPath: '/sec-c/' + preLoaderRoute: typeof SecCIndexRouteImport + parentRoute: typeof SecCRoute + } + '/sec-c/$id': { + id: '/sec-c/$id' + path: '/$id' + fullPath: '/sec-c/$id' + preLoaderRoute: typeof SecCIdRouteImport + parentRoute: typeof SecCRoute + } + '/sec-c/about': { + id: '/sec-c/about' + path: '/about' + fullPath: '/sec-c/about' + preLoaderRoute: typeof SecCAboutRouteImport + parentRoute: typeof SecCRoute + } + '/sec-c/settings': { + id: '/sec-c/settings' + path: '/settings' + fullPath: '/sec-c/settings' + preLoaderRoute: typeof SecCSettingsRouteImport + parentRoute: typeof SecCRoute + } + '/sec-d/': { + id: '/sec-d/' + path: '/' + fullPath: '/sec-d/' + preLoaderRoute: typeof SecDIndexRouteImport + parentRoute: typeof SecDRoute + } + '/sec-d/$id': { + id: '/sec-d/$id' + path: '/$id' + fullPath: '/sec-d/$id' + preLoaderRoute: typeof SecDIdRouteImport + parentRoute: typeof SecDRoute + } + '/sec-d/about': { + id: '/sec-d/about' + path: '/about' + fullPath: '/sec-d/about' + preLoaderRoute: typeof SecDAboutRouteImport + parentRoute: typeof SecDRoute + } + '/sec-d/settings': { + id: '/sec-d/settings' + path: '/settings' + fullPath: '/sec-d/settings' + preLoaderRoute: typeof SecDSettingsRouteImport + parentRoute: typeof SecDRoute + } + '/sec-e/': { + id: '/sec-e/' + path: '/' + fullPath: '/sec-e/' + preLoaderRoute: typeof SecEIndexRouteImport + parentRoute: typeof SecERoute + } + '/sec-e/$id': { + id: '/sec-e/$id' + path: '/$id' + fullPath: '/sec-e/$id' + preLoaderRoute: typeof SecEIdRouteImport + parentRoute: typeof SecERoute + } + '/sec-e/about': { + id: '/sec-e/about' + path: '/about' + fullPath: '/sec-e/about' + preLoaderRoute: typeof SecEAboutRouteImport + parentRoute: typeof SecERoute + } + '/sec-e/settings': { + id: '/sec-e/settings' + path: '/settings' + fullPath: '/sec-e/settings' + preLoaderRoute: typeof SecESettingsRouteImport + parentRoute: typeof SecERoute + } + '/sec-f/': { + id: '/sec-f/' + path: '/' + fullPath: '/sec-f/' + preLoaderRoute: typeof SecFIndexRouteImport + parentRoute: typeof SecFRoute + } + '/sec-f/$id': { + id: '/sec-f/$id' + path: '/$id' + fullPath: '/sec-f/$id' + preLoaderRoute: typeof SecFIdRouteImport + parentRoute: typeof SecFRoute + } + '/sec-f/about': { + id: '/sec-f/about' + path: '/about' + fullPath: '/sec-f/about' + preLoaderRoute: typeof SecFAboutRouteImport + parentRoute: typeof SecFRoute + } + '/sec-f/settings': { + id: '/sec-f/settings' + path: '/settings' + fullPath: '/sec-f/settings' + preLoaderRoute: typeof SecFSettingsRouteImport + parentRoute: typeof SecFRoute } } } diff --git a/benchmarks/client-nav/scenarios/search-params/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/search-params/vue/src/routeTree.gen.ts index b95b667803..f73b84ebe7 100644 --- a/benchmarks/client-nav/scenarios/search-params/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/search-params/vue/src/routeTree.gen.ts @@ -9,13 +9,13 @@ // 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 ProductsRouteImport } from './routes/products' -import { Route as CatalogRouteImport } from './routes/catalog' import { Route as IndexRouteImport } from './routes/index' +import { Route as CatalogRouteImport } from './routes/catalog' +import { Route as ProductsRouteImport } from './routes/products' -const ProductsRoute = ProductsRouteImport.update({ - id: '/products', - path: '/products', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const CatalogRoute = CatalogRouteImport.update({ @@ -23,9 +23,9 @@ const CatalogRoute = CatalogRouteImport.update({ path: '/catalog', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const ProductsRoute = ProductsRouteImport.update({ + id: '/products', + path: '/products', getParentRoute: () => rootRouteImport, } as any) @@ -61,11 +61,11 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/products': { - id: '/products' - path: '/products' - fullPath: '/products' - preLoaderRoute: typeof ProductsRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/catalog': { @@ -75,11 +75,11 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof CatalogRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/products': { + id: '/products' + path: '/products' + fullPath: '/products' + preLoaderRoute: typeof ProductsRouteImport parentRoute: typeof rootRouteImport } } diff --git a/docs/router/api/router/RouterOptionsType.md b/docs/router/api/router/RouterOptionsType.md index 3556f4ab24..31f410b208 100644 --- a/docs/router/api/router/RouterOptionsType.md +++ b/docs/router/api/router/RouterOptionsType.md @@ -375,9 +375,10 @@ const router = createRouter({ ### `pathParamsAllowedCharacters` property -- Type: `Array<';' | ':' | '@' | '&' | '=' | '+' | '$' | ','>` +- Type: `ReadonlyArray<';' | ':' | '@' | '&' | '=' | '+' | '$' | ','>` - Optional - Configures which URI characters are allowed in path params that would ordinarily be escaped by encodeURIComponent. +- Read only when the router is created. To change these characters, create a new router instance. Router option updates and provider props do not change this setting. ### `defaultStructuralSharing` property diff --git a/docs/router/api/router/RouterType.md b/docs/router/api/router/RouterType.md index cf8fdebeae..3fde90e32e 100644 --- a/docs/router/api/router/RouterType.md +++ b/docs/router/api/router/RouterType.md @@ -11,8 +11,9 @@ An instance of the `Router` has the following properties and methods: ### `.update` method -- Type: `(newOptions: RouterOptions) => void` +- Type: `(newOptions: Omit) => void` - Updates the router instance with new options. +- Initialization-only options such as `pathParamsAllowedCharacters` cannot be updated. Create a new router instance to change them. ### `state` property diff --git a/docs/router/api/router/linkComponent.md b/docs/router/api/router/linkComponent.md index a8227913b5..478271a208 100644 --- a/docs/router/api/router/linkComponent.md +++ b/docs/router/api/router/linkComponent.md @@ -43,7 +43,7 @@ By default, param values with characters such as `@` will be encoded in the URL: ``` -To opt-out, update the [pathParamsAllowedCharacters](../router/RouterOptionsType#pathparamsallowedcharacters-property) config on the router +To opt out, set [pathParamsAllowedCharacters](../router/RouterOptionsType#pathparamsallowedcharacters-property) when creating the router. This setting cannot be changed on an existing router instance. ```tsx import { createRouter } from '@tanstack/react-router' diff --git a/docs/router/guide/path-params.md b/docs/router/guide/path-params.md index 7ebaaad19e..d326eabb4b 100644 --- a/docs/router/guide/path-params.md +++ b/docs/router/guide/path-params.md @@ -1395,6 +1395,8 @@ const router = createRouter({ }) ``` +This setting is fixed when the router is created. To use different allowed characters, create a new router instance. + The following is the list of accepted allowed characters: - `;` diff --git a/packages/react-router/src/RouterProvider.tsx b/packages/react-router/src/RouterProvider.tsx index 81c3fb4ece..e61cdf1b8a 100644 --- a/packages/react-router/src/RouterProvider.tsx +++ b/packages/react-router/src/RouterProvider.tsx @@ -53,8 +53,8 @@ export function RouterContextProvider< * Renders the current match presentation and provides the router to the React * tree via context. * - * Accepts the same options as `createRouter` via props to update the router - * instance after creation. + * Accepts mutable router options via props. Configure initialization-only + * options with `createRouter`. * * @link https://tanstack.com/router/latest/docs/framework/react/api/router/createRouterFunction */ @@ -80,7 +80,7 @@ export type RouterProps< TRouter['history'], TDehydrated >, - 'context' + 'context' | 'pathParamsAllowedCharacters' > & { router: TRouter context?: Partial< diff --git a/packages/react-router/tests/link.bench.tsx b/packages/react-router/tests/link.bench.tsx index 56114e65d8..239173340b 100644 --- a/packages/react-router/tests/link.bench.tsx +++ b/packages/react-router/tests/link.bench.tsx @@ -1,5 +1,6 @@ import { render } from '@testing-library/react' import { bench, describe } from 'vitest' +import { getRouteSegments } from '@tanstack/router-core' import { Link, RouterProvider, @@ -41,7 +42,12 @@ const InterpolatePathLink = ({ to: string params: Record }>) => { - const href = interpolatePath(to, params) + const router = useRouter() + const href = interpolatePath( + to, + getRouteSegments(router.routesByPath[to])!, + params, + ) return {children} } diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 4d7fe106f6..4e37b8ed71 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -133,6 +133,8 @@ export { exactPathTest, resolvePath, interpolatePath, + getRouteSegments, + hasMissingPathParams, } from './path' export { encode, decode } from './qss' export { rootRouteId } from './root' diff --git a/packages/router-core/src/new-process-route-tree.ts b/packages/router-core/src/new-process-route-tree.ts index 0b3cf1b5ab..df1e224e82 100644 --- a/packages/router-core/src/new-process-route-tree.ts +++ b/packages/router-core/src/new-process-route-tree.ts @@ -1,7 +1,9 @@ import { invariant } from './invariant' +import { trimPathRight } from './path' import { createSieveCache } from './sieve-cache' import { last } from './utils' import type { SieveCache } from './sieve-cache' +import type { InterpolationSegment, RouteInterpolation } from './path' export const SEGMENT_TYPE_PATHNAME = 0 export const SEGMENT_TYPE_PARAM = 1 @@ -27,325 +29,269 @@ type ExtendedSegmentKind = | typeof SEGMENT_TYPE_INDEX | typeof SEGMENT_TYPE_PATHLESS -type ParsedSegment = Uint16Array & { - /** segment type (0 = pathname, 1 = param, 2 = wildcard, 3 = optional param) */ - 0: SegmentKind - /** index of the end of the prefix */ - 1: number - /** index of the start of the value */ - 2: number - /** index of the end of the value */ - 3: number - /** index of the start of the suffix */ - 4: number - /** index of the end of the segment */ - 5: number +export type DynamicPathSegment = [ + kind: Exclude, + key: string, + prefix: string, + /** Undefined marks a bare splat, which discards the remaining template. */ + suffix: string | undefined, +] + +export function getParamNames(data: RouteInterpolation): Array { + const cached = data.names + if (cached) { + return cached + } + const keys: Array = [] + for (const segment of data) { + if (typeof segment !== 'string') { + keys.push(segment[1 /* key */]) + } + } + return (data.names = keys) } -/** - * Populates the `output` array with the parsed representation of the given `segment` string. - * - * Usage: - * ```ts - * let output - * let cursor = 0 - * while (cursor < path.length) { - * output = parseSegment(path, cursor, output) - * const end = output[5] - * cursor = end + 1 - * ``` - * - * `output` is stored outside to avoid allocations during repeated calls. It doesn't need to be typed - * or initialized, it will be done automatically. - */ +/** Parse one segment for matching and retain the same record for interpolation. */ export function parseSegment( /** The full path string containing the segment. */ path: string, /** The starting index of the segment within the path. */ start: number, - /** A Uint16Array (length: 6) to populate with the parsed segment data. */ - output: Uint16Array = new Uint16Array(6), -): ParsedSegment { - const next = path.indexOf('/', start) - const end = next === -1 ? path.length : next + /** The next slash, or the length of the path. */ + end: number, +): InterpolationSegment { const part = path.substring(start, end) - - if (!part || !part.includes('$')) { - // early escape for static pathname - output[0] = SEGMENT_TYPE_PATHNAME - output[1] = start - output[2] = start - output[3] = end - output[4] = end - output[5] = end - return output as ParsedSegment - } - - // $ (wildcard) - if (part === '$') { - const total = path.length - output[0] = SEGMENT_TYPE_WILDCARD - output[1] = start - output[2] = start - output[3] = total - output[4] = total - output[5] = total - return output as ParsedSegment - } - - // $paramName if (part.charCodeAt(0) === 36) { - output[0] = SEGMENT_TYPE_PARAM - output[1] = start - output[2] = start + 1 // skip '$' - output[3] = end - output[4] = end - output[5] = end - return output as ParsedSegment + return part.length === 1 + ? [SEGMENT_TYPE_WILDCARD, '_splat', '', undefined] + : [SEGMENT_TYPE_PARAM, part.substring(1), '', ''] } - - const openBrace = part.indexOf('{') - let closeBrace - if ( - openBrace !== -1 && - openBrace + 1 < part.length && - (closeBrace = part.indexOf('}', openBrace)) !== -1 - ) { - const firstChar = part.charCodeAt(openBrace + 1) - - // Check for {-$...} (optional param) - // prefix{-$paramName}suffix - // /^([^{]*)\{-\$([a-zA-Z_$][a-zA-Z0-9_$]*)\}([^}]*)$/ - if (firstChar === 45) { - // '-' - if ( - openBrace + 2 < part.length && - part.charCodeAt(openBrace + 2) === 36 // '$' - ) { - const paramStart = openBrace + 3 - const paramEnd = closeBrace - // Validate param name exists - if (paramStart < paramEnd) { - output[0] = SEGMENT_TYPE_OPTIONAL_PARAM - output[1] = start + openBrace - output[2] = start + paramStart - output[3] = start + paramEnd - output[4] = start + closeBrace + 1 - output[5] = end - return output as ParsedSegment - } - } - } else if (firstChar === 36) { - // '$' - const dollarPos = openBrace + 1 - const afterDollar = openBrace + 2 - // Check for {$} (wildcard) - if (afterDollar === closeBrace) { - // For wildcard, value should be '$' (from dollarPos to afterDollar) - // prefix{$}suffix - // /^([^{]*)\{\$\}([^}]*)$/ - output[0] = SEGMENT_TYPE_WILDCARD - output[1] = start + openBrace - output[2] = start + dollarPos - output[3] = start + afterDollar - output[4] = start + closeBrace + 1 - output[5] = path.length - return output as ParsedSegment - } - // Regular param {$paramName} - value is the param name (after $) - // prefix{$paramName}suffix - // /^([^{]*)\{\$([a-zA-Z_$][a-zA-Z0-9_$]*)\}([^}]*)$/ - output[0] = SEGMENT_TYPE_PARAM - output[1] = start + openBrace - output[2] = start + afterDollar - output[3] = start + closeBrace - output[4] = start + closeBrace + 1 - output[5] = end - return output as ParsedSegment + const open = part.indexOf('{') + if (open >= 0) { + const close = part.indexOf('}', open) + const optional = part.charCodeAt(open + 1) === 45 + const nameStart = open + (optional ? 3 : 2) + if ( + close >= 0 && + part.charCodeAt(nameStart - 1) === 36 && + (!optional || nameStart < close) + ) { + const key = part.substring(nameStart, close) + return [ + optional + ? SEGMENT_TYPE_OPTIONAL_PARAM + : key + ? SEGMENT_TYPE_PARAM + : SEGMENT_TYPE_WILDCARD, + key || '_splat', + part.substring(0, open), + path.substring(start + close + 1, key ? end : path.length), + ] } } - - // fallback to static pathname (should never happen) - output[0] = SEGMENT_TYPE_PATHNAME - output[1] = start - output[2] = start - output[3] = end - output[4] = end - output[5] = end - return output as ParsedSegment + return part } -/** - * Recursively parses the segments of the given route tree and populates a segment trie. - * - * @param data A reusable Uint16Array for parsing segments. (non important, we're just avoiding allocations) - * @param route The current route to parse. - * @param start The starting index for parsing within the route's full path. - * @param node The current segment node in the trie to populate. - * @param onRoute Callback invoked for each route processed. - */ -function parseSegments( +type ParsedRoute = [ + node: AnySegmentNode, + cursor: number, + segments: RouteInterpolation | undefined, +] + +/** Compile a template, optionally attaching its new segments to the matching trie. */ +export function parseSegments( + defaultCaseSensitive: boolean, + route: TRouteLike, + start: number, +): RouteInterpolation +export function parseSegments( defaultCaseSensitive: boolean, - data: Uint16Array, route: TRouteLike, start: number, node: AnySegmentNode, - depth: number, + dynamicListsToSort?: Array>>, + parentInterpolation?: RouteInterpolation, +): ParsedRoute +export function parseSegments( + defaultCaseSensitive: boolean, + route: TRouteLike, + start: number, + node?: AnySegmentNode, /** Each dynamic sibling list is recorded once, when it first needs sorting. */ dynamicListsToSort?: Array>>, - onRoute?: (route: TRouteLike) => void, -) { - onRoute?.(route) + parentInterpolation?: RouteInterpolation, +): RouteInterpolation | ParsedRoute { let cursor = start - { - const path = route.fullPath ?? route.from - const options = route.options - const length = path.length - const caseSensitive = options?.caseSensitive ?? defaultCaseSensitive - const parseParams = options?.params?.parse ?? options?.parseParams - while (cursor < length) { - const segment = parseSegment(path, cursor, data) - let nextNode: AnySegmentNode - const start = cursor - const end = segment[5] - cursor = end + 1 - depth++ - const kind = segment[0] - switch (kind) { - case SEGMENT_TYPE_PATHNAME: { - const value = path.substring(segment[2], segment[3]) - let name = value - let staticChildren: Map> - if (caseSensitive) { - staticChildren = node.static ??= new Map() - } else { - name = value.toLowerCase() - staticChildren = node.staticInsensitive ??= new Map() - } - const existingNode = staticChildren.get(name) - if (existingNode) { - nextNode = existingNode - } else { - const next = createStaticNode(path) - next.parent = node - next.depth = depth - nextNode = next - staticChildren.set(name, next) - } - break - } - case SEGMENT_TYPE_PARAM: - case SEGMENT_TYPE_OPTIONAL_PARAM: - case SEGMENT_TYPE_WILDCARD: { - let prefix = path.substring(start, segment[1]) - let suffix = path.substring(segment[4], end) - const actuallyCaseSensitive = caseSensitive && !!(prefix || suffix) - if (!caseSensitive) { - prefix = prefix.toLowerCase() - suffix = suffix.toLowerCase() - } - const siblings = - kind === SEGMENT_TYPE_PARAM - ? node.dynamic - : kind === SEGMENT_TYPE_OPTIONAL_PARAM - ? node.optional - : node.wildcard - const existingNode = - // Keep wildcard aliases as separate match candidates, even when - // they have the same shape and no parser. - kind !== SEGMENT_TYPE_WILDCARD && - !parseParams && - siblings?.find( - (s) => - !s.parse && - s.caseSensitive === actuallyCaseSensitive && - s.prefix === prefix && - s.suffix === suffix, - ) - if (existingNode) { - nextNode = existingNode - } else { - const next = createDynamicNode( - kind, - path, - actuallyCaseSensitive, - prefix, - suffix, - ) - nextNode = next - next.parent = node - next.depth = depth - let nodes: Array> - if (kind === SEGMENT_TYPE_PARAM) { - nodes = node.dynamic ??= [] - } else if (kind === SEGMENT_TYPE_OPTIONAL_PARAM) { - nodes = node.optional ??= [] - } else { - nodes = node.wildcard ??= [] - } - nodes.push(next) - if (nodes.length === 2) { - dynamicListsToSort?.push(nodes) - } - } - break - } - } - node = nextNode - } - - // create pathless node + const path = route.fullPath ?? route.from + const options = route.options + const length = path.length + const literalEnd = path.endsWith('/') ? length - 1 : length + const caseSensitive = options?.caseSensitive ?? defaultCaseSensitive + const parseParams = options?.params?.parse ?? options?.parseParams + let interpolation: Array | undefined + let literalStart = parentInterpolation ? start - 1 : 0 + if (!node || path.includes('$')) { + interpolation = parentInterpolation?.slice() ?? [] + const tail = last(interpolation) if ( - parseParams && - route.children && - !route.isRoot && - route.id && - route.id.charCodeAt(route.id.lastIndexOf('/') + 1) === 95 /* '_' */ + tail && + typeof tail !== 'string' && + tail[0 /* kind */] === SEGMENT_TYPE_WILDCARD ) { - const pathlessNode = createStaticNode(path) - pathlessNode.kind = SEGMENT_TYPE_PATHLESS - pathlessNode.parent = node - depth++ - pathlessNode.depth = depth - node.pathless ??= [] - node.pathless.push(pathlessNode) - node = pathlessNode - } - - const isLeaf = (route.path || !route.children) && !route.isRoot - // create index node - if (isLeaf && path.endsWith('/')) { - const indexNode = createStaticNode(path) - indexNode.kind = SEGMENT_TYPE_INDEX - indexNode.parent = node - depth++ - indexNode.depth = depth - node.index = indexNode - node = indexNode - } - - node.parse = parseParams ?? null - node.priority = options?.params?.priority ?? 0 - - // make node "matchable" - if (isLeaf && !node.route) { - node.route = route - node.fullPath = path + // A parent's wildcard consumes the child's template too. + // `start` follows that entire template, including its trailing slash. + interpolation[interpolation.length - 1] = [ + tail[0 /* kind */], + tail[1 /* key */], + tail[2 /* prefix */], + tail[3 /* suffix */] === undefined + ? undefined + : tail[3 /* suffix */] + + path.substring( + start - (path[start - 2] === '/' ? 2 : 1), + literalEnd, + ), + ] + literalStart = length } } - if (route.children) - for (const child of route.children) { - parseSegments( - defaultCaseSensitive, - data, - child as TRouteLike, - cursor, - node, - depth, - dynamicListsToSort, - onRoute, - ) + while (cursor < length) { + const start = cursor + const next = path.indexOf('/', start) + let end = next === -1 ? length : next + const segment = parseSegment(path, start, end) + cursor = end + 1 + let nextNode: AnySegmentNode + if (typeof segment === 'string') { + if (!node) { + continue + } + let name = segment + let staticChildren: Map> + if (caseSensitive) { + staticChildren = node.static ??= new Map() + } else { + name = segment.toLowerCase() + staticChildren = node.staticInsensitive ??= new Map() + } + const existingNode = staticChildren.get(name) + if (existingNode) { + nextNode = existingNode + } else { + const next = createSegmentNode(node) + nextNode = next + staticChildren.set(name, next) + } + } else { + const kind = segment[0 /* kind */] + let prefix = segment[2 /* prefix */] + let suffix = segment[3 /* suffix */] ?? '' + if (kind === SEGMENT_TYPE_WILDCARD) { + end = length + cursor = end + 1 + } + if (interpolation && literalStart < end) { + // Retain original spelling before matcher case folding. + if (literalStart < start - 1) { + interpolation.push(path.substring(literalStart, start - 1)) + } + segment[2 /* prefix */] = '/' + prefix + if ( + kind === SEGMENT_TYPE_WILDCARD && + segment[3 /* suffix */] !== undefined && + literalEnd < length + ) { + segment[3 /* suffix */] = suffix.slice(0, -1) + } + interpolation.push(segment) + literalStart = end + } + if (!node) { + continue + } + const actuallyCaseSensitive = caseSensitive && !!(prefix || suffix) + if (!caseSensitive) { + prefix = prefix.toLowerCase() + suffix = suffix.toLowerCase() + } + const siblings = + kind === SEGMENT_TYPE_PARAM + ? (node.dynamic ??= []) + : kind === SEGMENT_TYPE_OPTIONAL_PARAM + ? (node.optional ??= []) + : (node.wildcard ??= []) + const existingNode = + // Keep wildcard aliases as separate match candidates, even when + // they have the same shape and no parser. + kind !== SEGMENT_TYPE_WILDCARD && + !parseParams && + siblings.find( + (s) => + !s.parse && + s.caseSensitive === actuallyCaseSensitive && + s.prefix === prefix && + s.suffix === suffix, + ) + if (existingNode) { + nextNode = existingNode + } else { + const next = createSegmentNode( + node, + kind, + actuallyCaseSensitive, + prefix, + suffix, + ) + nextNode = next + siblings.push(next) + if (siblings.length === 2) { + dynamicListsToSort?.push(siblings) + } + } } + node = nextNode + } + + if (interpolation && literalStart < literalEnd) { + interpolation.push(path.substring(literalStart, literalEnd)) + } + // Discard push()'s spare capacity before retaining this array on both owners. + const segmentData = interpolation?.slice() + if (!node) { + return segmentData! + } + + // create pathless node + if ( + parseParams && + route.children && + !route.isRoot && + route.id && + route.id.charCodeAt(route.id.lastIndexOf('/') + 1) === 95 /* '_' */ + ) { + const pathlessNode = createSegmentNode(node, SEGMENT_TYPE_PATHLESS) + ;(node.pathless ??= []).push(pathlessNode) + node = pathlessNode + } + + const isLeaf = (route.path || !route.children) && !route.isRoot + // create index node + if (isLeaf && literalEnd < length) { + const indexNode = createSegmentNode(node, SEGMENT_TYPE_INDEX) + node.index = indexNode + node = indexNode + } + + node.parse = parseParams ?? null + node.priority = options?.params?.priority ?? 0 + // A shared candidate keeps the original names of its first terminal route. + if (!node.route) { + node.data = segmentData + if (isLeaf) { + node.route = route + } + } + return [node, cursor, segmentData] } function sortDynamic( @@ -387,44 +333,30 @@ function sortDynamic( return 0 } -function createStaticNode( - fullPath: string, -): StaticSegmentNode { - return { - kind: SEGMENT_TYPE_PATHNAME, - depth: 0, - pathless: null, - index: null, - static: null, - staticInsensitive: null, - dynamic: null, - optional: null, - wildcard: null, - route: null, - fullPath, - parent: null, - parse: null, - priority: 0, - } -} - -/** - * Keys must be declared in the same order as in `SegmentNode` type, - * to ensure they are represented as the same object class in the engine. - */ -function createDynamicNode( +function createSegmentNode( + parent?: AnySegmentNode, + kind?: StaticSegmentNode['kind'], +): StaticSegmentNode +function createSegmentNode( + parent: AnySegmentNode, kind: | typeof SEGMENT_TYPE_PARAM | typeof SEGMENT_TYPE_WILDCARD | typeof SEGMENT_TYPE_OPTIONAL_PARAM, - fullPath: string, caseSensitive: boolean, prefix: string, suffix: string, -): DynamicSegmentNode { +): DynamicSegmentNode +function createSegmentNode( + parent?: AnySegmentNode, + kind: ExtendedSegmentKind = SEGMENT_TYPE_PATHNAME, + caseSensitive?: boolean, + prefix?: string, + suffix?: string, +): SegmentNode { return { kind, - depth: 0, + depth: parent ? parent.depth + 1 : 0, pathless: null, index: null, static: null, @@ -433,8 +365,8 @@ function createDynamicNode( optional: null, wildcard: null, route: null, - fullPath, - parent: null, + data: undefined, + parent, parse: null, priority: 0, caseSensitive, @@ -466,6 +398,9 @@ type AnySegmentNode = type SegmentNode = { kind: ExtendedSegmentKind + prefix?: string + suffix?: string + caseSensitive?: boolean pathless: Array> | null @@ -490,10 +425,10 @@ type SegmentNode = { /** Terminal route (if this path can end here) */ route: T | null - /** The full path for this segment node (will only be valid on leaf nodes) */ - fullPath: string + /** Original template data for this candidate or parse gate. */ + data: RouteInterpolation | undefined - parent: AnySegmentNode | null + parent: AnySegmentNode | undefined depth: number @@ -505,6 +440,7 @@ type SegmentNode = { } type RouteLike = { + _interpolation?: RouteInterpolation id?: string path?: string // relative path from the parent, children?: Array // child routes, @@ -548,11 +484,30 @@ export function processRouteMasks< routeList: Array, processedTree: ProcessedTree, ) { - const segmentTree = createStaticNode('/') - const data = new Uint16Array(6) + const segmentTree = createSegmentNode() const dynamicListsToSort: Array>> = [] + function visit( + route: TRouteLike, + start: number, + parentNode: AnySegmentNode, + parentInterpolation?: RouteInterpolation, + ) { + const [node, cursor, segments] = parseSegments( + false, + route, + start, + parentNode, + dynamicListsToSort, + parentInterpolation, + ) + if (route.children) { + for (const child of route.children) { + visit(child as TRouteLike, cursor, node, segments) + } + } + } for (const route of routeList) { - parseSegments(false, data, route, 1, segmentTree, 0, dynamicListsToSort) + visit(route, 1, segmentTree) } for (const nodes of dynamicListsToSort) { nodes.sort(sortDynamic) @@ -598,9 +553,8 @@ export function findSingleMatch( if (!tree) { // single flat routes (router.matchRoute) are not eagerly processed, // if we haven't seen this route before, process it now - tree = createStaticNode<{ from: string }>('/') - const data = new Uint16Array(6) - parseSegments(caseSensitive, data, { from }, 1, tree, 0) + tree = createSegmentNode<{ from: string }>() + parseSegments(caseSensitive, { from }, 1, tree) processedTree.singleCache.set(key, tree) } return findMatch(path, tree, fuzzy) @@ -647,11 +601,6 @@ export function findRouteMatch< return result } -/** Trim trailing slashes (except preserving root '/'). */ -export function trimPathRight(path: string) { - return path === '/' ? path : path.replace(/\/{1,}$/, '') -} - export interface ProcessRouteTreeResult< TRouteLike extends Extract & { id: string }, > { @@ -668,54 +617,64 @@ export interface ProcessRouteTreeResult< * Also builds lookup maps for routes by ID and by trimmed full path. */ export function processRouteTree< - TRouteLike extends Extract & { id: string }, + TRouteLike extends Extract & { + id: string + init: (originalIndex: number) => void + }, >( /** The root of the route tree to process. */ routeTree: TRouteLike, /** Whether matching should be case sensitive by default (overridden by individual route options). */ caseSensitive: boolean = false, - /** Optional callback invoked for each route during processing. */ - initRoute?: (route: TRouteLike, index: number) => void, ): ProcessRouteTreeResult { - const segmentTree = createStaticNode(routeTree.fullPath) - const data = new Uint16Array(6) + const segmentTree = createSegmentNode() const dynamicListsToSort: Array>> = [] const routesById = {} as Record const routesByPath = {} as Record let index = 0 - parseSegments( - caseSensitive, - data, - routeTree, - 1, - segmentTree, - 0, - dynamicListsToSort, - (route) => { - initRoute?.(route, index) + function visit( + route: TRouteLike, + start: number, + parentNode: AnySegmentNode, + parentInterpolation?: RouteInterpolation, + ) { + route.init(index) - if (route.id in routesById) { - if (process.env.NODE_ENV !== 'production') { - throw new Error( - `Invariant failed: Duplicate routes found with id: ${String(route.id)}`, - ) - } - - invariant() + if (route.id in routesById) { + if (process.env.NODE_ENV !== 'production') { + throw new Error( + `Invariant failed: Duplicate routes found with id: ${String(route.id)}`, + ) } - routesById[route.id] = route + invariant() + } - if (index !== 0 && route.path) { - const trimmedFullPath = trimPathRight(route.fullPath) - if (!routesByPath[trimmedFullPath] || route.fullPath.endsWith('/')) { - routesByPath[trimmedFullPath] = route - } + routesById[route.id] = route + if (index !== 0 && route.path) { + const trimmedFullPath = trimPathRight(route.fullPath) + if (!routesByPath[trimmedFullPath] || route.fullPath.endsWith('/')) { + routesByPath[trimmedFullPath] = route } + } + index++ - index++ - }, - ) + const [node, cursor, segments] = parseSegments( + caseSensitive, + route, + start, + parentNode, + dynamicListsToSort, + parentInterpolation, + ) + route._interpolation = segments + if (route.children) { + for (const child of route.children) { + visit(child as TRouteLike, cursor, node, segments) + } + } + } + visit(routeTree, 1, segmentTree) for (const nodes of dynamicListsToSort) { nodes.sort(sortDynamic) } @@ -759,7 +718,7 @@ type ParamExtractionState = { part: number node: number path: number - segment: number + param: number } /** @@ -780,7 +739,7 @@ function extractParams( }, ): [rawParams: Record, state: ParamExtractionState] { const list = buildBranch(leaf.node) - let nodeParts: Array | null = null + const names = leaf.node.data && getParamNames(leaf.node.data) const rawParams: Record = Object.create(null) /** which segment of the path we're currently processing */ let partIndex = leaf.extract?.part ?? 0 @@ -788,19 +747,14 @@ function extractParams( let nodeIndex = leaf.extract?.node ?? 0 /** index of the 1st character of the segment we're processing in the path string */ let pathIndex = leaf.extract?.path ?? 0 - /** which fullPath segment we're currently processing */ - let segmentCount = leaf.extract?.segment ?? 0 - for ( - ; - nodeIndex < list.length; - partIndex++, nodeIndex++, pathIndex++, segmentCount++ - ) { + /** Next original parameter name, independent of pathless/static nodes. */ + let paramIndex = leaf.extract?.param ?? 0 + for (; nodeIndex < list.length; partIndex++, nodeIndex++, pathIndex++) { const node = list[nodeIndex]! // index nodes are terminating nodes, nothing to extract, just leave if (node.kind === SEGMENT_TYPE_INDEX) break // pathless nodes do not consume a path segment if (node.kind === SEGMENT_TYPE_PATHLESS) { - segmentCount-- partIndex-- pathIndex-- continue @@ -808,44 +762,29 @@ function extractParams( const part = parts[partIndex] const currentPathIndex = pathIndex if (part) pathIndex += part.length - if (node.kind === SEGMENT_TYPE_PARAM) { - nodeParts ??= leaf.node.fullPath.split('/') - const nodePart = nodeParts[segmentCount]! - const preLength = node.prefix.length - // we can't rely on the presence of prefix/suffix to know whether it's curly-braced or not, because `/{$param}/` is valid, but has no prefix/suffix - const isCurlyBraced = nodePart.charCodeAt(preLength) === 123 // '{' - // param name is extracted at match-time so that tree nodes that are identical except for param name can share the same node - if (isCurlyBraced) { - const sufLength = node.suffix.length - const name = nodePart.substring( - preLength + 2, - nodePart.length - sufLength - 1, - ) - const value = part!.substring(preLength, part!.length - sufLength) - rawParams[name] = decodeURIComponent(value) - } else { - const name = nodePart.substring(1) - rawParams[name] = decodeURIComponent(part!) - } - } else if (node.kind === SEGMENT_TYPE_OPTIONAL_PARAM) { - if (leaf.skipped & (1 << nodeIndex)) { + if ( + node.kind === SEGMENT_TYPE_PARAM || + node.kind === SEGMENT_TYPE_OPTIONAL_PARAM + ) { + const name = names![paramIndex++]! + if ( + node.kind === SEGMENT_TYPE_OPTIONAL_PARAM && + leaf.skipped & (1 << nodeIndex) + ) { partIndex-- // stay on the same part pathIndex = currentPathIndex - 1 // undo pathIndex advancement; -1 to account for loop increment continue } - nodeParts ??= leaf.node.fullPath.split('/') - const nodePart = nodeParts[segmentCount]! - const preLength = node.prefix.length - const sufLength = node.suffix.length - const name = nodePart.substring( - preLength + 3, - nodePart.length - sufLength - 1, - ) const value = node.suffix || node.prefix - ? part!.substring(preLength, part!.length - sufLength) - : part - if (value) rawParams[name] = decodeURIComponent(value) + ? part!.substring( + node.prefix.length, + part!.length - node.suffix.length, + ) + : part! + if (value || node.kind === SEGMENT_TYPE_PARAM) { + rawParams[name] = decodeURIComponent(value) + } } else if (node.kind === SEGMENT_TYPE_WILDCARD) { const n = node const value = path.substring( @@ -866,7 +805,7 @@ function extractParams( part: partIndex, node: nodeIndex, path: pathIndex, - segment: segmentCount, + param: paramIndex, }, ] } diff --git a/packages/router-core/src/path.ts b/packages/router-core/src/path.ts index 65de358ea5..0b2f8d8a60 100644 --- a/packages/router-core/src/path.ts +++ b/packages/router-core/src/path.ts @@ -1,12 +1,12 @@ -import { isServer } from '@tanstack/router-core/isServer' import { last } from './utils' import { SEGMENT_TYPE_OPTIONAL_PARAM, - SEGMENT_TYPE_PATHNAME, + SEGMENT_TYPE_PARAM, SEGMENT_TYPE_WILDCARD, - parseSegment, } from './new-process-route-tree' import type { SieveCache } from './sieve-cache' +import type { DynamicPathSegment } from './new-process-route-tree' +import type { AnyRoute } from './route' /** Join path segments, cleaning duplicate slashes between parts. */ export function joinPaths(paths: Array) { @@ -27,13 +27,13 @@ export function cleanPath(path: string) { /** Trim leading slashes (except preserving root '/'). */ export function trimPathLeft(path: string) { - return path === '/' ? path : path.replace(/^\/{1,}/, '') + return path === '/' ? path : path.replace(/^\/+/, '') } /** Trim trailing slashes (except preserving root '/'). */ export function trimPathRight(path: string) { const len = path.length - return len > 1 && path[len - 1] === '/' ? path.replace(/\/{1,}$/, '') : path + return len > 1 && path[len - 1] === '/' ? path.replace(/\/+$/, '') : path } /** Trim both leading and trailing slashes. */ @@ -191,7 +191,7 @@ export function resolvePath({ /** * Create a pre-compiled decode config from allowed characters. - * This should be called once at router initialization. + * Created once for the router's fixed encoding configuration. */ export function compileDecodeCharMap( pathParamsAllowedCharacters: ReadonlyArray, @@ -199,22 +199,47 @@ export function compileDecodeCharMap( const charMap = new Map( pathParamsAllowedCharacters.map((char) => [encodeURIComponent(char), char]), ) - // Escape special regex characters and join with | - const pattern = Array.from(charMap.keys()) - .map((key) => key.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')) - .join('|') - const regex = new RegExp(pattern, 'g') + // Encoded keys contain no '|', and only these four regexp metacharacters. + const regex = new RegExp( + [...charMap.keys()].join('|').replace(/[.*()]/g, '\\$&'), + 'g', + ) return (encoded: string) => encoded.replace(regex, (match) => charMap.get(match) ?? match) } export type InterpolationPlan = [ - keys: Array, paths: SieveCache, - decoder: ((encoded: string) => string) | undefined, path: string, + segments: RouteInterpolation, ] +export type InterpolationSegment = string | DynamicPathSegment + +export type RouteInterpolation = Array & { + names?: Array +} + +export function getRouteSegments(route: AnyRoute) { + return route._interpolation +} + +/** Devtools checks navigation availability separately from the hot formatter. */ +export function hasMissingPathParams( + segments: RouteInterpolation, + params: Record, +): boolean { + return segments.some((part) => { + if (typeof part === 'string') { + return false + } + const [kind, key] = part + return kind === SEGMENT_TYPE_WILDCARD + ? !params[key] + : kind === SEGMENT_TYPE_PARAM && !(key in params) + }) +} + function encodeParam( key: string, value: unknown, @@ -224,176 +249,63 @@ function encodeParam( return '' + (value ?? undefined) } - if (key === '_splat') { - // Early return if value only contains URL-safe characters (performance optimization) - if (!value || /^[a-zA-Z0-9\-._~!/]*$/.test(value)) { - return value - } - // the splat/catch-all routes shouldn't have the '/' encoded out - // Use encodeURIComponent for each segment to properly encode spaces, - // plus signs, and other special characters that encodeURI leaves unencoded + const splat = key === '_splat' + // Early return if the splat contains only URL-safe characters. + if (splat && (!value || /^[a-zA-Z0-9\-._~!/]*$/.test(value))) { return value - .split('/') - .map((segment) => encodePathParam(segment, decoder)) - .join('/') - } else { - return encodePathParam(value, decoder) } + let encoded = encodeURIComponent(value) + if (splat) { + // Splats preserve '/', but still encode spaces, '+', '?' and '#'. + // Restore separators before allowed characters can decode a literal '%2F'. + encoded = encoded.replaceAll('%2F', '/') + } + return decoder ? decoder(encoded) : encoded } -/** - * Interpolate params and wildcards into a route pathname. - * - * - Encodes params safely (configurable allowed characters) - * - Supports `{-$optional}` segments, `{prefix{$id}suffix}` and `{$}` wildcards - * - Collects optional metadata in the same pass without allocating it for callers - */ +/** Substitute current values into parsed segments, optionally collecting raw params. */ export function interpolatePath( - path: string | undefined, + path: string, + segments: RouteInterpolation, params: Record, decoder?: (encoded: string) => string, usedParams?: Record, - keys?: Array, - server?: boolean, - metadata?: { isMissingParams: boolean }, ): string { - if (!path?.includes('$')) { - return path || '/' - } - - if (isServer ?? server) { - // Fast path for common templates like `/posts/$id` or `/files/$`. - // Braced segments (`{...}`) are more complex (prefix/suffix/optional) and are - // handled by the general parser below. - if (path.indexOf('{') === -1) { - const length = path.length - let cursor = 0 - let joined = '' - - while (cursor < length) { - // Skip slashes between segments. '/' code is 47 - while (cursor < length && path.charCodeAt(cursor) === 47) { - cursor++ - } - if (cursor >= length) { - break - } - - const start = cursor - let end = path.indexOf('/', cursor) - if (end === -1) { - end = length - } - cursor = end - - const part = path.substring(start, end) - - // `$id` or `$` (splat). '$' code is 36 - if (part.charCodeAt(0) === 36) { - const splat = part.length === 1 - const key = splat ? '_splat' : part.substring(1) - const value = params[key] - keys?.push(key) - if (metadata && (splat ? !value : !(key in params))) { - metadata.isMissingParams = true - } - if (usedParams) { - usedParams[key] = value - if (splat) { - // TODO: Deprecate * - usedParams['*'] = value - } - } - if (!splat || value) { - joined += '/' + encodeParam(key, value, decoder) - } - } else { - joined += '/' + part - } - } - - if (path.endsWith('/')) { - joined += '/' - } - - return joined || '/' - } - } - - let cursor = 0 - let segment + // One parsed template serves both trailing-slash variants. + const trailingSlash = path.endsWith('/') ? '/' : '' let joined = '' - while (cursor < path.length) { - const start = cursor - segment = parseSegment(path, start, segment) - const end = segment[5] - cursor = end + 1 - - if (start === end) { + for (const part of segments) { + if (typeof part === 'string') { + joined += part continue } - - const kind = segment[0] - - if (kind === SEGMENT_TYPE_PATHNAME) { - joined += '/' + path.substring(start, end) - continue - } - - const prefixEnd = segment[1] - const suffixStart = segment[4] - const key = - kind === SEGMENT_TYPE_WILDCARD - ? '_splat' - : path.substring(segment[2], segment[3]) + const [kind, key, prefix, rawSuffix] = part + const splat = kind === SEGMENT_TYPE_WILDCARD + const suffix = + splat && rawSuffix !== undefined ? rawSuffix + trailingSlash : rawSuffix let paramValue = params[key] - keys?.push(key) - - if (kind === SEGMENT_TYPE_WILDCARD) { - if (usedParams) { - usedParams[key] = paramValue - // TODO: Deprecate * + // An omitted optional contributes neither a segment nor used-param metadata. + if (kind === SEGMENT_TYPE_OPTIONAL_PARAM && paramValue == null) { + continue + } + if (usedParams) { + // Match identity needs current raw values, never data retained from another call. + usedParams[key] = paramValue + // TODO: Deprecate * + if (splat) { usedParams['*'] = paramValue } - if (!paramValue) { - if (metadata) { - metadata.isMissingParams = true - } - // A missing wildcard keeps its affixes, but omits a bare segment. - if (prefixEnd === start && suffixStart === end) { - continue - } - paramValue = '' - } - } else { - // Named parameters: $id or {-$id}. - if (kind === SEGMENT_TYPE_OPTIONAL_PARAM) { - if (paramValue == null) { - continue - } - } else if (metadata && !(key in params)) { - metadata.isMissingParams = true - } - if (usedParams) { - usedParams[key] = paramValue + } + if (splat && !paramValue) { + // A missing wildcard keeps its affixes, but omits a bare segment. + if (prefix === '/' && !suffix) { + continue } + paramValue = '' } - joined += - '/' + - path.substring(start, prefixEnd) + - encodeParam(key, paramValue, decoder) + - path.substring(suffixStart, end) + joined += prefix + encodeParam(key, paramValue, decoder) + (suffix || '') } - if (path.endsWith('/')) { - joined += '/' - } - - return joined || '/' -} - -function encodePathParam(value: string, decoder?: (encoded: string) => string) { - const encoded = encodeURIComponent(value) - return decoder?.(encoded) ?? encoded + return joined + trailingSlash || '/' } diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts index 4451242456..36bedc9a89 100644 --- a/packages/router-core/src/route.ts +++ b/packages/router-core/src/route.ts @@ -1,10 +1,10 @@ import { invariant } from './invariant' -import { joinPaths, trimPathLeft, trimPathRight } from './path' +import { cleanPath, trimPathLeft, trimPathRight } from './path' import { notFound } from './not-found' import { redirect } from './redirect' import { rootRouteId } from './root' import type { LazyRoute } from './fileRoute' -import type { InterpolationPlan } from './path' +import type { InterpolationPlan, RouteInterpolation } from './path' import type { NotFoundError } from './not-found' import type { RedirectFnRoute } from './redirect' import type { NavigateOptions, ParsePathParams } from './link' @@ -731,9 +731,11 @@ export interface Route< _branch?: ReadonlyArray /** @internal */ _pathCache?: InterpolationPlan + /** @internal */ + _interpolation?: RouteInterpolation rank: number to: TrimPathRight - init: (opts: { originalIndex: number }) => void + init: (originalIndex: number) => void update: ( options: UpdatableRouteOptions< TParentRoute, @@ -1722,6 +1724,8 @@ export class BaseRoute< _branch?: ReadonlyArray /** @internal */ _pathCache?: InterpolationPlan + /** @internal */ + _interpolation?: RouteInterpolation constructor( options?: RouteOptions< TRegister, @@ -1771,8 +1775,8 @@ export class BaseRoute< THandlers > - init = (opts: { originalIndex: number }): void => { - this.originalIndex = opts.originalIndex + init = (originalIndex: number): void => { + this.originalIndex = originalIndex // Rebuilding a tree can change the ancestors of an existing route. this._branch = undefined @@ -1823,23 +1827,24 @@ export class BaseRoute< const customId = options?.id || path // Strip the parentId prefix from the first level of children - let id = isRoot + const id = isRoot ? rootRouteId - : joinPaths([ - this.parentRoute.id === rootRouteId ? '' : this.parentRoute.id, - customId, - ]) + : cleanPath( + (this.parentRoute.id === rootRouteId ? '' : this.parentRoute.id) + + '/' + + (customId ?? ''), + ) if (path === rootRouteId) { path = '/' } - if (id !== rootRouteId) { - id = joinPaths(['/', id]) - } - const fullPath = - id === rootRouteId ? '/' : joinPaths([this.parentRoute.fullPath, path]) + id === rootRouteId + ? '/' + : path === undefined + ? this.parentRoute.fullPath + : cleanPath(this.parentRoute.fullPath + '/' + path) this._path = path as TPath this._id = id as TId diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 36b9c32015..ccd0898c46 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -25,6 +25,8 @@ import { findFlatMatch, findRouteMatch, findSingleMatch, + getParamNames, + parseSegments, processRouteMasks, processRouteTree, } from './new-process-route-tree' @@ -467,11 +469,12 @@ export interface RouterOptions< /** * Configures which URI characters are allowed in path params that would ordinarily be escaped by encodeURIComponent. + * This is read only during initialization. Create a new router to change it. * * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#pathparamsallowedcharacters-property) * @link [Guide](https://tanstack.com/router/latest/docs/framework/react/guide/path-params#allowed-characters) */ - pathParamsAllowedCharacters?: Array< + readonly pathParamsAllowedCharacters?: ReadonlyArray< ';' | ':' | '@' | '&' | '=' | '+' | '$' | ',' > @@ -752,12 +755,15 @@ export type UpdateFn< TRouterHistory extends RouterHistory, TDehydrated extends Record, > = ( - newOptions: RouterConstructorOptions< - TRouteTree, - TTrailingSlashOption, - TDefaultStructuralSharingOption, - TRouterHistory, - TDehydrated + newOptions: Omit< + RouterConstructorOptions< + TRouteTree, + TTrailingSlashOption, + TDefaultStructuralSharingOption, + TRouterHistory, + TDehydrated + >, + 'pathParamsAllowedCharacters' >, ) => void @@ -1164,12 +1170,12 @@ export class RouterCore< processedTree!: ProcessedTree resolvePathCache!: SieveCache private unmatchedPathCache!: SieveCache - private lightweightCache = new WeakMap< + private lightweightCache!: WeakMap< ParsedLocation, LightweightRouteMatchCacheEntry - >() + > isServer!: boolean - pathParamsDecoder?: (encoded: string) => string + readonly pathParamsDecoder?: (encoded: string) => string protocolAllowlist!: Set /** @@ -1186,6 +1192,11 @@ export class RouterCore< getStoreConfig: GetStoreConfig, ) { this.getStoreConfig = getStoreConfig + if (options.pathParamsAllowedCharacters?.length) { + this.pathParamsDecoder = compileDecodeCharMap( + options.pathParamsAllowedCharacters, + ) + } this.update({ defaultPreloadDelay: 50, @@ -1244,11 +1255,6 @@ export class RouterCore< this.protocolAllowlist = new Set(this.options.protocolAllowlist) - if (this.options.pathParamsAllowedCharacters) - this.pathParamsDecoder = compileDecodeCharMap( - this.options.pathParamsAllowedCharacters, - ) - if ( !this.history || (this.options.history && this.options.history !== this.history) @@ -1368,15 +1374,7 @@ export class RouterCore< } buildRouteTree = (): RouteTreeCaches => { - const result = processRouteTree( - this.routeTree, - this.options.caseSensitive, - (route, i) => { - route.init({ - originalIndex: i, - }) - }, - ) + const result = processRouteTree(this.routeTree, this.options.caseSensitive) if (this.options.routeMasks) { processRouteMasks(this.options.routeMasks, result.processedTree) } @@ -1384,20 +1382,22 @@ export class RouterCore< return { ...result, resolvePathCache: createSieveCache(1000), - // Arbitrary templates (for example, masks) have no route object to key by. unmatchedPathCache: createSieveCache(32), } } setRoutes(caches: RouteTreeCaches) { Object.assign(this, caches) + this.lightweightCache = new WeakMap() const notFoundRoute = this.options.notFoundRoute if (notFoundRoute) { - notFoundRoute.init({ - originalIndex: 99999999999, - }) + notFoundRoute.init(99999999999) + if (this.routesById[notFoundRoute.id] !== notFoundRoute) { + // Standalone legacy fallbacks are not processed by the matching tree. + notFoundRoute._interpolation = parseSegments(false, notFoundRoute, 0) + } this.routesById[notFoundRoute.id] = notFoundRoute } } @@ -1659,22 +1659,15 @@ export class RouterCore< } // Match identity must only use the raw params captured from the URL. const usedParams: Record = createNull() - const interpolatedPath = - isServer === undefined - ? interpolatePath( - route.fullPath, - rawParams, - this.pathParamsDecoder, - usedParams, - undefined, - this.isServer, - ) - : interpolatePath( - route.fullPath, - rawParams, - this.pathParamsDecoder, - usedParams, - ) + const interpolatedPath = route._interpolation + ? interpolatePath( + route.fullPath, + route._interpolation, + rawParams, + this.pathParamsDecoder, + usedParams, + ) + : route.fullPath // Seed planning from the accepted same-ID cache generation first, then // from the committed generation for this route. Presentation stores are @@ -1888,35 +1881,19 @@ export class RouterCore< params: Record, route?: AnyRoute, ): string { - const decoder = this.pathParamsDecoder let plan = route ? route._pathCache : this.unmatchedPathCache.get(path) - let interpolated: string | undefined - if (!plan || plan[2] !== decoder || plan[3] !== path) { - const keys: Array = [] - interpolated = - isServer === undefined - ? interpolatePath( - path, - params, - decoder, - undefined, - keys, - this.isServer, - ) - : interpolatePath(path, params, decoder, undefined, keys) - plan = [ - keys, - createSieveCache(128), - decoder, - path, - ] + if (!plan || plan[1 /* path */] !== path) { + const segments = + route?._interpolation ?? parseSegments(false, { fullPath: path }, 0) + plan = [createSieveCache(128), path, segments] if (route) { route._pathCache = plan } else { this.unmatchedPathCache.set(path, plan) } } - const [keys, paths] = plan + const paths = plan[0 /* paths */] + const keys = getParamNames(plan[2 /* segments */]) // Single-param templates use the value itself as the Map key. Compound keys // concatenate `:` tokens; undefined becomes // `undefined:undefined`, whose nonnumeric prefix cannot match a string token. @@ -1926,17 +1903,12 @@ export class RouterCore< if (typeof value !== 'string' && value !== undefined) { return normalizeProtocolRelative( decodePath( - interpolated || - (isServer === undefined - ? interpolatePath( - path, - params, - decoder, - undefined, - undefined, - this.isServer, - ) - : interpolatePath(path, params, decoder)), + interpolatePath( + path, + plan[2 /* segments */], + params, + this.pathParamsDecoder, + ), ), ) } @@ -1947,19 +1919,14 @@ export class RouterCore< return cached } // Cache canonical pathnames, not the encoded interpolation output. - interpolated = normalizeProtocolRelative( + const interpolated = normalizeProtocolRelative( decodePath( - interpolated || - (isServer === undefined - ? interpolatePath( - path, - params, - decoder, - undefined, - undefined, - this.isServer, - ) - : interpolatePath(path, params, decoder)), + interpolatePath( + path, + plan[2 /* segments */], + params, + this.pathParamsDecoder, + ), ), ) paths.set(key, interpolated) diff --git a/packages/router-core/tests/build-location.test.ts b/packages/router-core/tests/build-location.test.ts index 5a56d47556..e9c291e31e 100644 --- a/packages/router-core/tests/build-location.test.ts +++ b/packages/router-core/tests/build-location.test.ts @@ -27,7 +27,7 @@ test('_getUserHistoryState removes volatile router bookkeeping but keeps mask pa }) test.each([false, true])( - 'forwards the development server override when router.isServer is %s', + 'interpolates matches from raw params when router.isServer is %s', (isServer) => { expect(serverEnvironment).toBeUndefined() const rootRoute = new BaseRootRoute({}) @@ -47,52 +47,16 @@ test.each([false, true])( const call = interpolate.mock.calls.find( ([path]) => path === '/items/$id', ) - expect(call).toHaveLength(6) - expect(call?.[5]).toBe(isServer) + expect(call).toHaveLength(5) + expect(call?.[1]).toBe(route._interpolation) + expect(call?.[2]).toEqual({ id: 'one' }) + expect(matches.at(-1)?._strictParams).toEqual({ id: 'one' }) } finally { interpolate.mockRestore() } }, ) -test('shares interpolation on reused routes and follows decoder changes', () => { - const rootRoute = new BaseRootRoute({}) - const route = new BaseRoute({ - getParentRoute: () => rootRoute, - path: '/items/$id', - }) - const routeTree = rootRoute.addChildren([route]) - const makeRouter = () => - createTestRouter({ - routeTree, - history: createMemoryHistory({ initialEntries: ['/'] }), - }) - const router = makeRouter() - const decoder = vi.fn(pathUtils.compileDecodeCharMap(['@'])) - router.pathParamsDecoder = decoder - - expect( - router.buildLocation({ to: '/items/$id', params: { id: '@one' } }).href, - ).toBe('/items/@one') - decoder.mockClear() - expect( - router.buildLocation({ to: '/items/$id', params: { id: '@one' } }).href, - ).toBe('/items/@one') - expect(decoder).not.toHaveBeenCalled() - - const other = makeRouter() - other.pathParamsDecoder = decoder - expect( - other.buildLocation({ to: '/items/$id', params: { id: '@one' } }).href, - ).toBe('/items/@one') - expect(decoder).not.toHaveBeenCalled() - - router.pathParamsDecoder = pathUtils.compileDecodeCharMap(['+']) - expect( - router.buildLocation({ to: '/items/$id', params: { id: '@one' } }).href, - ).toBe('/items/%40one') -}) - describe('buildLocation - params function receives parsed params', () => { test('prev params should contain parsed params from route params.parse', async () => { const rootRoute = new BaseRootRoute({}) diff --git a/packages/router-core/tests/curly-params-smoke.test.ts b/packages/router-core/tests/curly-params-smoke.test.ts index c52a6b33ec..c566b99d2f 100644 --- a/packages/router-core/tests/curly-params-smoke.test.ts +++ b/packages/router-core/tests/curly-params-smoke.test.ts @@ -1,5 +1,6 @@ import { describe, expect, test } from 'vitest' -import { findRouteMatch, processRouteTree } from '../src/new-process-route-tree' +import { findRouteMatch } from '../src/new-process-route-tree' +import { processTestRouteTree as processRouteTree } from './routerTestUtils' const testCases = [ { diff --git a/packages/router-core/tests/legacy-not-found-interpolation.test.ts b/packages/router-core/tests/legacy-not-found-interpolation.test.ts new file mode 100644 index 0000000000..4f524c68a3 --- /dev/null +++ b/packages/router-core/tests/legacy-not-found-interpolation.test.ts @@ -0,0 +1,105 @@ +import { afterEach, expect, test, vi } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute, BaseRoute } from '../src' +import { createTestRouter } from './routerTestUtils' +import type { AnyRoute } from '../src' + +afterEach(() => vi.restoreAllMocks()) + +function setup(isServer: boolean) { + vi.spyOn(console, 'warn').mockImplementation(() => {}) + const root = new BaseRootRoute({}) + const tenant = new BaseRoute({ + getParentRoute: () => root, + path: '/$tenant', + }) + const legacy = new BaseRoute({ + getParentRoute: () => tenant, + path: '/404', + loader: ({ params }) => params.tenant, + staleTime: Infinity, + }) + const history = createMemoryHistory({ initialEntries: ['/a/missing'] }) + const router = createTestRouter({ + routeTree: root.addChildren([tenant]), + notFoundRoute: legacy, + history, + isServer, + scrollRestoration: false, + }) + return { router, history, legacy } +} + +test.each([false, true])( + 'interpolates standalone fallback match IDs (server: %s)', + (isServer) => { + const { router, history, legacy } = setup(isServer) + try { + expect(legacy.originalIndex).toBe(99999999999) + const first = router.matchRoutes('/a/missing', {}).at(-1)! + const second = router.matchRoutes('/b/missing', {}).at(-1)! + expect(first.routeId).toBe(legacy.id) + expect(first.pathname).toBe('/a/404') + expect(second.pathname).toBe('/b/404') + expect(second.id).not.toBe(first.id) + expect(second._strictParams).toEqual({ tenant: 'b' }) + } finally { + history.destroy() + } + }, +) + +test('does not reuse fallback params or loader data across tenants', async () => { + const { router, history, legacy } = setup(false) + try { + await router.load() + const first = router.state.matches.find( + (match) => match.routeId === legacy.id, + )! + expect(first.params).toEqual({ tenant: 'a' }) + expect(first.loaderData).toBe('a') + await router.navigate({ href: '/b/missing' }) + const second = router.state.matches.find( + (match) => match.routeId === legacy.id, + )! + expect(second.id).not.toBe(first.id) + expect(second.params).toEqual({ tenant: 'b' }) + expect(second.loaderData).toBe('b') + } finally { + history.destroy() + } +}) + +test('refreshes fallback segments when the route tree is replaced', () => { + vi.spyOn(console, 'warn').mockImplementation(() => {}) + const root = new BaseRootRoute({}) + let parent: AnyRoute = new BaseRoute({ + getParentRoute: () => root, + path: '/$tenant', + }) + const legacy = new BaseRoute({ + getParentRoute: () => parent, + path: '/404', + }) + const history = createMemoryHistory({ initialEntries: ['/'] }) + const router = createTestRouter({ + routeTree: root.addChildren([parent]), + notFoundRoute: legacy, + history, + scrollRestoration: false, + }) + try { + expect(router.matchRoutes('/a/missing', {}).at(-1)?.pathname).toBe('/a/404') + const nextRoot = new BaseRootRoute({}) + parent = new BaseRoute({ + getParentRoute: () => nextRoot, + path: '/$org', + }) + router.update({ routeTree: nextRoot.addChildren([parent]) }) + const match = router.matchRoutes('/b/missing', {}).at(-1)! + expect(match.pathname).toBe('/b/404') + expect(match._strictParams).toEqual({ org: 'b' }) + } finally { + history.destroy() + } +}) diff --git a/packages/router-core/tests/match-by-path.test.ts b/packages/router-core/tests/match-by-path.test.ts index f742c22df9..301eb846d0 100644 --- a/packages/router-core/tests/match-by-path.test.ts +++ b/packages/router-core/tests/match-by-path.test.ts @@ -1,8 +1,6 @@ import { describe, expect, it } from 'vitest' -import { - findSingleMatch, - processRouteTree, -} from '../src/new-process-route-tree' +import { findSingleMatch } from '../src/new-process-route-tree' +import { processTestRouteTree as processRouteTree } from './routerTestUtils' const { processedTree } = processRouteTree({ id: '__root__', diff --git a/packages/router-core/tests/match-params.test.ts b/packages/router-core/tests/match-params.test.ts index fe05808bd4..9b254834f9 100644 --- a/packages/router-core/tests/match-params.test.ts +++ b/packages/router-core/tests/match-params.test.ts @@ -1,8 +1,11 @@ import { describe, expect, it, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' -import { findRouteMatch, processRouteTree } from '../src/new-process-route-tree' +import { findRouteMatch } from '../src/new-process-route-tree' import { BaseRootRoute, BaseRoute, PathParamError } from '../src' -import { createTestRouter } from './routerTestUtils' +import { + createTestRouter, + processTestRouteTree as processRouteTree, +} from './routerTestUtils' type TestRoute = { id: string diff --git a/packages/router-core/tests/new-process-route-tree.test.ts b/packages/router-core/tests/new-process-route-tree.test.ts index 5646ca4c23..3a1db0338d 100644 --- a/packages/router-core/tests/new-process-route-tree.test.ts +++ b/packages/router-core/tests/new-process-route-tree.test.ts @@ -3,8 +3,8 @@ import { findFlatMatch, findRouteMatch, processRouteMasks, - processRouteTree, } from '../src/new-process-route-tree' +import { processTestRouteTree as processRouteTree } from './routerTestUtils' import type { AnyRoute, RouteMask } from '../src' function makeTree(routes: Array) { @@ -1622,13 +1622,15 @@ describe('findRouteMatch', () => { const { processedTree } = processRouteTree(tree) expect(processedTree.segmentTree).toMatchInlineSnapshot(` { + "caseSensitive": undefined, + "data": undefined, "depth": 0, "dynamic": [ { "caseSensitive": false, + "data": undefined, "depth": 1, "dynamic": null, - "fullPath": "/$foo", "index": null, "kind": 1, "optional": null, @@ -1636,21 +1638,46 @@ describe('findRouteMatch', () => { "parse": null, "pathless": [ { + "caseSensitive": undefined, + "data": [ + [ + 1, + "foo", + "/", + "", + ], + ], "depth": 2, "dynamic": null, - "fullPath": "/$foo", "index": { + "caseSensitive": undefined, + "data": [ + [ + 1, + "foo", + "/", + "", + ], + ], "depth": 3, "dynamic": null, - "fullPath": "/$foo/", "index": null, "kind": 4, "optional": null, "parent": [Circular], "parse": null, "pathless": null, + "prefix": undefined, "priority": 0, "route": { + "_interpolation": [ + [ + 1, + "foo", + "/", + "", + ], + ], "fullPath": "/$foo/", "id": "/$foo/_layout/", "options": {}, @@ -1658,6 +1685,7 @@ describe('findRouteMatch', () => { }, "static": null, "staticInsensitive": null, + "suffix": undefined, "wildcard": null, }, "kind": 5, @@ -1665,16 +1693,42 @@ describe('findRouteMatch', () => { "parent": [Circular], "parse": [Function], "pathless": null, + "prefix": undefined, "priority": 0, "route": { + "_interpolation": [ + [ + 1, + "foo", + "/", + "", + ], + ], "children": [ { + "_interpolation": [ + [ + 1, + "foo", + "/", + "", + ], + "/bar", + ], "fullPath": "/$foo/bar", "id": "/$foo/_layout/bar", "options": {}, "path": "bar", }, { + "_interpolation": [ + [ + 1, + "foo", + "/", + "", + ], + ], "fullPath": "/$foo/", "id": "/$foo/_layout/", "options": {}, @@ -1693,17 +1747,36 @@ describe('findRouteMatch', () => { "static": null, "staticInsensitive": Map { "bar" => { + "caseSensitive": undefined, + "data": [ + [ + 1, + "foo", + "/", + "", + ], + "/bar", + ], "depth": 3, "dynamic": null, - "fullPath": "/$foo/bar", "index": null, "kind": 0, "optional": null, "parent": [Circular], "parse": null, "pathless": null, + "prefix": undefined, "priority": 0, "route": { + "_interpolation": [ + [ + 1, + "foo", + "/", + "", + ], + "/bar", + ], "fullPath": "/$foo/bar", "id": "/$foo/_layout/bar", "options": {}, @@ -1711,9 +1784,11 @@ describe('findRouteMatch', () => { }, "static": null, "staticInsensitive": null, + "suffix": undefined, "wildcard": null, }, }, + "suffix": undefined, "wildcard": null, }, ], @@ -1723,17 +1798,36 @@ describe('findRouteMatch', () => { "static": null, "staticInsensitive": Map { "hello" => { + "caseSensitive": undefined, + "data": [ + [ + 1, + "foo", + "/", + "", + ], + "/hello", + ], "depth": 2, "dynamic": null, - "fullPath": "/$foo/hello", "index": null, "kind": 0, "optional": null, "parent": [Circular], "parse": null, "pathless": null, + "prefix": undefined, "priority": 0, "route": { + "_interpolation": [ + [ + 1, + "foo", + "/", + "", + ], + "/hello", + ], "fullPath": "/$foo/hello", "id": "/$foo/hello", "options": {}, @@ -1741,6 +1835,7 @@ describe('findRouteMatch', () => { }, "static": null, "staticInsensitive": null, + "suffix": undefined, "wildcard": null, }, }, @@ -1748,19 +1843,21 @@ describe('findRouteMatch', () => { "wildcard": null, }, ], - "fullPath": "/", "index": { + "caseSensitive": undefined, + "data": undefined, "depth": 1, "dynamic": null, - "fullPath": "/", "index": null, "kind": 4, "optional": null, "parent": [Circular], "parse": null, "pathless": null, + "prefix": undefined, "priority": 0, "route": { + "_interpolation": undefined, "fullPath": "/", "id": "/", "options": {}, @@ -1768,17 +1865,20 @@ describe('findRouteMatch', () => { }, "static": null, "staticInsensitive": null, + "suffix": undefined, "wildcard": null, }, "kind": 0, "optional": null, - "parent": null, + "parent": undefined, "parse": null, "pathless": null, + "prefix": undefined, "priority": 0, "route": null, "static": null, "staticInsensitive": null, + "suffix": undefined, "wildcard": null, } `) diff --git a/packages/router-core/tests/optional-path-params-clean.test.ts b/packages/router-core/tests/optional-path-params-clean.test.ts index 2569cb8f38..2e2db43496 100644 --- a/packages/router-core/tests/optional-path-params-clean.test.ts +++ b/packages/router-core/tests/optional-path-params-clean.test.ts @@ -1,55 +1,19 @@ import { describe, expect, it } from 'vitest' -import { interpolatePath } from '../src/path' +import { + interpolateTestPath as interpolatePath, + parseTestPathname as parsePathname, + processTestRouteTree as processRouteTree, +} from './routerTestUtils' import { SEGMENT_TYPE_OPTIONAL_PARAM, SEGMENT_TYPE_PATHNAME, + SEGMENT_TYPE_WILDCARD, findSingleMatch, - parseSegment, - processRouteTree, } from '../src/new-process-route-tree' -import type { SegmentKind } from '../src/new-process-route-tree' describe('Optional Path Parameters - Clean Comprehensive Tests', () => { describe('Optional Dynamic Parameters {-$param}', () => { describe('parsePathname', () => { - type PathSegment = { - type: SegmentKind - value: string - prefixSegment?: string - suffixSegment?: string - // Indicates if there is a static segment after this required/optional param - hasStaticAfter?: boolean - } - - const parsePathname = (to: string | undefined) => { - let cursor = 0 - let data - const path = to ?? '' - const segments: Array = [] - while (cursor < path.length) { - const start = cursor - data = parseSegment(path, start, data) - const end = data[5] - cursor = end + 1 - const type = data[0] - const value = path.substring(data[2], data[3]) - const prefix = path.substring(start, data[1]) - const suffix = path.substring(data[4], end) - const segment: PathSegment = { - type, - value, - } - if (prefix) { - segment.prefixSegment = prefix - } - if (suffix) { - segment.suffixSegment = suffix - } - segments.push(segment) - } - return segments - } - it('should parse single optional dynamic param', () => { const result = parsePathname('/posts/{-$category}') expect(result).toEqual([ diff --git a/packages/router-core/tests/optional-path-params.test.ts b/packages/router-core/tests/optional-path-params.test.ts index b8584c9dc2..d9f669f7ea 100644 --- a/packages/router-core/tests/optional-path-params.test.ts +++ b/packages/router-core/tests/optional-path-params.test.ts @@ -1,13 +1,15 @@ import { describe, expect, it } from 'vitest' -import { interpolatePath } from '../src/path' +import { + interpolateTestPath as interpolatePath, + parseTestPathname as parsePathname, + processTestRouteTree as processRouteTree, +} from './routerTestUtils' import { SEGMENT_TYPE_OPTIONAL_PARAM, SEGMENT_TYPE_PARAM, SEGMENT_TYPE_PATHNAME, SEGMENT_TYPE_WILDCARD, findSingleMatch, - parseSegment, - processRouteTree, } from '../src/new-process-route-tree' import type { SegmentKind } from '../src/new-process-route-tree' @@ -25,34 +27,6 @@ describe('Optional Path Parameters', () => { }> describe('parsePathname with optional params', () => { - const parsePathname = (to: string | undefined) => { - let cursor = 0 - let data - const path = to ?? '' - const segments: Array = [] - while (cursor < path.length) { - const start = cursor - data = parseSegment(path, start, data) - const end = data[5] - cursor = end + 1 - const type = data[0] - const value = path.substring(data[2], data[3]) - const prefix = path.substring(start, data[1]) - const suffix = path.substring(data[4], end) - const segment: PathSegment = { - type, - value, - } - if (prefix) { - segment.prefixSegment = prefix - } - if (suffix) { - segment.suffixSegment = suffix - } - segments.push(segment) - } - return segments - } it.each([ { name: 'regular optional param', diff --git a/packages/router-core/tests/original-param-names.test.ts b/packages/router-core/tests/original-param-names.test.ts new file mode 100644 index 0000000000..e94e0ff412 --- /dev/null +++ b/packages/router-core/tests/original-param-names.test.ts @@ -0,0 +1,139 @@ +import { expect, test } from 'vitest' +import { + findFlatMatch, + findRouteMatch, + findSingleMatch, + processRouteMasks, +} from '../src/new-process-route-tree' +import { processTestRouteTree as processRouteTree } from './routerTestUtils' + +test('keeps original names when different templates share a trie prefix', () => { + const tree = processRouteTree({ + id: '__root__', + isRoot: true, + fullPath: '/', + children: [ + { id: '/first', path: '$id/first', fullPath: '/$id/first' }, + { id: '/second', path: '{$name}/second', fullPath: '/{$name}/second' }, + ], + }).processedTree + expect(findRouteMatch('/one/first', tree)?.rawParams).toEqual({ id: 'one' }) + expect(findRouteMatch('/two/second', tree)?.rawParams).toEqual({ + name: 'two', + }) +}) + +test('keeps a terminal route names when a later alias adds a parser', () => { + const tree = processRouteTree({ + id: '__root__', + isRoot: true, + fullPath: '/', + children: [ + { id: '/first', path: '$id/detail', fullPath: '/$id/detail' }, + { + id: '/alias', + path: '$name', + fullPath: '/$name', + children: [ + { + id: '/alias/detail', + path: 'detail', + fullPath: '/$name/detail', + options: { + params: { parse: (params: Record) => params }, + }, + }, + ], + }, + ], + }).processedTree + const match = findRouteMatch('/abc/detail', tree) + expect(match?.route.id).toBe('/first') + expect(match?.rawParams).toEqual({ id: 'abc' }) +}) + +test('resumes through a route-less parse gate with skipped optional names', () => { + const seen: Array> = [] + const tree = processRouteTree({ + id: '__root__', + isRoot: true, + fullPath: '/', + children: [ + { + id: '/$id', + path: '$id', + fullPath: '/$id', + children: [ + { + id: '/$id/_layout', + fullPath: '/$id', + options: { + params: { + parse: (params: Record) => { + seen.push({ ...params }) + }, + }, + }, + children: [ + { + id: '/leaf', + path: '{-$lang}/$slug', + fullPath: '/$id/{-$lang}/$slug', + }, + ], + }, + ], + }, + ], + }).processedTree + expect(findRouteMatch('/one/post', tree)?.rawParams).toEqual({ + id: 'one', + slug: 'post', + }) + expect(findRouteMatch('/two/en/post', tree)?.rawParams).toEqual({ + id: 'two', + lang: 'en', + slug: 'post', + }) + expect(seen).toEqual([{ id: 'one' }, { id: 'two' }]) +}) + +test('retains nested mask branches without modifying their definitions', () => { + const tree = processRouteTree({ + id: '__root__', + fullPath: '/', + isRoot: true, + }).processedTree + const child = Object.freeze({ from: '/$id/detail' }) + const mask = Object.freeze({ from: '/$id', children: [child] }) + processRouteMasks([mask], tree) + const match = findFlatMatch('/one/detail', tree) + expect(match?.route).toBe(child) + expect(match?.rawParams).toEqual({ id: 'one' }) + expect(Object.keys(mask)).toEqual(['from', 'children']) + expect(Object.keys(child)).toEqual(['from']) +}) + +test('retains mask and single-match names without modifying frozen definitions', () => { + const tree = processRouteTree({ + id: '__root__', + isRoot: true, + fullPath: '/', + }).processedTree + const mask = Object.freeze({ from: '/pre{$code}/file' }) + processRouteMasks([mask], tree) + expect(findFlatMatch('/prea%20b/file', tree)?.rawParams).toEqual({ + code: 'a b', + }) + + expect(Object.keys(mask)).toEqual(['from']) + expect( + findSingleMatch( + '/{$first}/{-$middle}/$last', + false, + false, + '/one/two', + tree, + )?.rawParams, + ).toEqual({ first: 'one', last: 'two' }) +}) diff --git a/packages/router-core/tests/parse-segment.test.ts b/packages/router-core/tests/parse-segment.test.ts new file mode 100644 index 0000000000..4b160f4644 --- /dev/null +++ b/packages/router-core/tests/parse-segment.test.ts @@ -0,0 +1,52 @@ +import { expect, test } from 'vitest' +import { + SEGMENT_TYPE_OPTIONAL_PARAM, + SEGMENT_TYPE_PARAM, + SEGMENT_TYPE_PATHNAME, + SEGMENT_TYPE_WILDCARD, + parseSegment, +} from '../src/new-process-route-tree' + +test('keeps offsets beyond the former 16-bit scratch buffer range', () => { + const path = `/${'x'.repeat(70_000)}/$id` + const literal = parseSegment(path, 1, 70_001) + expect(typeof literal).toBe('string') + expect(literal.length).toBe(70_000) + expect(parseSegment(path, 70_002, path.length)).toEqual([ + SEGMENT_TYPE_PARAM, + 'id', + '', + '', + ]) +}) + +test.each([ + [SEGMENT_TYPE_PATHNAME, 'pre{bad}{$id}', '', 'pre{bad}{$id}', ''], + [SEGMENT_TYPE_PATHNAME, '{-$}', '', '{-$}', ''], + [SEGMENT_TYPE_PATHNAME, '{--$id}', '', '{--$id}', ''], + [SEGMENT_TYPE_PARAM, '}pre{$a{b}.txt', '}pre', 'a{b', '.txt'], + [SEGMENT_TYPE_PARAM, '$id{suffix}', '', 'id{suffix}', ''], + [SEGMENT_TYPE_PARAM, '{$$}', '', '$', ''], + [SEGMENT_TYPE_OPTIONAL_PARAM, 'pre{-$a$b}suffix', 'pre', 'a$b', 'suffix'], + [SEGMENT_TYPE_WILDCARD, 'pre{$}suffix/tail', 'pre', '_splat', 'suffix/tail'], + [SEGMENT_TYPE_WILDCARD, '$/tail', '', '_splat', ''], +] as const)( + 'preserves the first segment grammar for %s: %s', + (kind, source, prefix, value, suffix) => { + const path = `/base/${source}` + const next = path.indexOf('/', 6) + const parsed = parseSegment(path, 6, next === -1 ? path.length : next) + expect( + typeof parsed === 'string' ? SEGMENT_TYPE_PATHNAME : parsed[0 /* kind */], + ).toBe(kind) + expect(typeof parsed === 'string' ? '' : parsed[2 /* prefix */]).toBe( + prefix, + ) + expect(typeof parsed === 'string' ? parsed : parsed[1 /* key */]).toBe( + value, + ) + expect( + typeof parsed === 'string' ? '' : (parsed[3 /* suffix */] ?? ''), + ).toBe(suffix) + }, +) diff --git a/packages/router-core/tests/path-decoder.bench.ts b/packages/router-core/tests/path-decoder.bench.ts new file mode 100644 index 0000000000..05971c30f6 --- /dev/null +++ b/packages/router-core/tests/path-decoder.bench.ts @@ -0,0 +1,63 @@ +import { bench, describe, expect } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute, BaseRoute } from '../src' +import { createTestRouter } from './routerTestUtils' + +if (process.env.TSR_LINK_PERF === '1') { + describe.each(['stable', 'new-router', 'no-update'] as const)( + 'path decoder: %s configuration', + (mode) => { + const makeRouter = (allowed: ReadonlyArray<'@' | '+'>) => { + const root = new BaseRootRoute({}) + const item = new BaseRoute({ + getParentRoute: () => root, + path: '/items/$id', + }) + const router = createTestRouter({ + routeTree: root.addChildren([item]), + history: createMemoryHistory({ initialEntries: ['/'] }), + pathParamsAllowedCharacters: allowed, + scrollRestoration: false, + }) + router.history.destroy() + return router + } + let router = makeRouter(['@']) + const inputs = Array.from({ length: 200 }, (_, index) => ({ + to: '/items/$id', + params: { id: `item-${index % 40}@+` }, + })) + let count = 0 + let lastHref = '' + const run = () => { + count++ + if (mode === 'new-router') { + router = makeRouter(count % 2 === 0 ? ['+'] : ['@']) + } else if (mode === 'stable') { + router.update({ + ...router.options, + context: { count }, + }) + } + for (const input of inputs) { + lastHref = router.buildLocation(input).href + } + } + const verify = () => { + expect(lastHref).toBe( + mode === 'new-router' && count % 2 === 0 + ? '/items/item-39%40+' + : '/items/item-39@%2B', + ) + } + run() + verify() + bench('update and build 200 locations', run, { + time: 1500, + warmupTime: 500, + throws: true, + teardown: verify, + }) + }, + ) +} diff --git a/packages/router-core/tests/path-decoder.test.ts b/packages/router-core/tests/path-decoder.test.ts new file mode 100644 index 0000000000..941626e53d --- /dev/null +++ b/packages/router-core/tests/path-decoder.test.ts @@ -0,0 +1,96 @@ +import { afterEach, expect, test, vi } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute, BaseRoute } from '../src' +import * as pathUtils from '../src/path' +import { createTestRouter } from './routerTestUtils' + +afterEach(() => vi.restoreAllMocks()) + +test.each([ + { allowed: ['.', '@'], input: 'x%40.y', expected: 'x@.y' }, + { allowed: ['*', '@'], input: 'pre%40*post', expected: 'pre@*post' }, + { allowed: ['(', ')', '@'], input: '(%40)', expected: '(@)' }, + { allowed: ['|', '@'], input: '%7C%40%2F', expected: '|@%2F' }, + { allowed: ['12@', '1'], input: '12%40', expected: '12@' }, + { allowed: ['%', '/'], input: '%252F/%2F', expected: '%2F//' }, + { allowed: ['@', '@', '+'], input: '%40%2B', expected: '@+' }, + { allowed: [], input: '%40', expected: '%40' }, +])( + 'compiles literal decoder alternatives: $allowed', + ({ allowed, input, expected }) => { + expect(pathUtils.compileDecodeCharMap(allowed)(input)).toBe(expected) + }, +) + +function setup(allowed?: Array<'@' | '+'>) { + const root = new BaseRootRoute({}) + const item = new BaseRoute({ getParentRoute: () => root, path: '/items/$id' }) + const router = createTestRouter({ + routeTree: root.addChildren([item]), + history: createMemoryHistory({ initialEntries: ['/'] }), + pathParamsAllowedCharacters: allowed, + scrollRestoration: false, + }) + router.history.destroy() + const build = () => + router.buildLocation({ to: '/items/$id', params: { id: '@+' } }).href + return { router, item, build } +} + +test('keeps the decoder and cached paths across provider option updates', () => { + const allowed: Array<'@' | '+'> = ['@'] + const { router, item, build } = setup(allowed) + const decoder = router.pathParamsDecoder + expect(build()).toBe('/items/@%2B') + const plan = item._pathCache + const compile = vi.spyOn(pathUtils, 'compileDecodeCharMap') + const interpolate = vi.spyOn(pathUtils, 'interpolatePath') + for (let count = 0; count < 3; count++) { + router.update({ + ...router.options, + context: { count }, + }) + expect(build()).toBe('/items/@%2B') + expect(router.pathParamsDecoder).toBe(decoder) + expect(item._pathCache).toBe(plan) + } + expect(compile).not.toHaveBeenCalled() + expect(interpolate).not.toHaveBeenCalled() +}) + +test('requires a new router to apply changes to the original character array', () => { + const allowed: Array<'@' | '+'> = ['@'] + const { router, build } = setup(allowed) + const decoder = router.pathParamsDecoder + expect(build()).toBe('/items/@%2B') + allowed[0] = '+' + router.update({ context: {} }) + expect(router.pathParamsDecoder).toBe(decoder) + expect(build()).toBe('/items/@%2B') + expect( + router.buildLocation({ to: '/items/$id', params: { id: 'new@+' } }).href, + ).toBe('/items/new@%2B') + expect(setup(allowed).build()).toBe('/items/%40+') +}) + +test('does not change encoding through unsupported option updates', () => { + const { router, build } = setup(['@']) + const compile = vi.spyOn(pathUtils, 'compileDecodeCharMap') + expect(build()).toBe('/items/@%2B') + // @ts-expect-error Path encoding can only be configured at construction. + router.update({ pathParamsAllowedCharacters: undefined }) + expect( + router.buildLocation({ to: '/items/$id', params: { id: 'new@+' } }).href, + ).toBe('/items/new@%2B') + expect(compile).not.toHaveBeenCalled() +}) + +test('does not create a decoder for empty or omitted allowed characters', () => { + const compile = vi.spyOn(pathUtils, 'compileDecodeCharMap') + for (const allowed of [undefined, []]) { + const { router, build } = setup(allowed) + expect(router.pathParamsDecoder).toBeUndefined() + expect(build()).toBe('/items/%40%2B') + } + expect(compile).not.toHaveBeenCalled() +}) diff --git a/packages/router-core/tests/path-interpolation.bench.ts b/packages/router-core/tests/path-interpolation.bench.ts index ec3bbfaeac..9f1891f151 100644 --- a/packages/router-core/tests/path-interpolation.bench.ts +++ b/packages/router-core/tests/path-interpolation.bench.ts @@ -2,8 +2,9 @@ import { bench, describe, expect } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { compileDecodeCharMap, interpolatePath } from '../src/path' +import { parseSegments } from '../src/new-process-route-tree' import { decodePath } from '../src/utils' -import { createTestRouter } from './routerTestUtils' +import { createTestRouter, interpolateTestPath } from './routerTestUtils' import type { PathInterpolationTestOptions } from './routerTestUtils' const scenarios: Array<{ @@ -128,7 +129,7 @@ scenarios.push( describe.each(scenarios)('$name', ({ inputs, register = true }) => { const root = new BaseRootRoute({}) const routes = new Map( - [...new Set(inputs.map((input) => input.path || '/'))].map((path) => [ + [...new Set(inputs.map((input) => input.path))].map((path) => [ path, new BaseRoute({ getParentRoute: () => root, path }), ]), @@ -137,24 +138,23 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { routeTree: register ? root.addChildren([...routes.values()]) : root, history: createMemoryHistory({ initialEntries: ['/'] }), isServer: inputs[0]?.server, + pathParamsAllowedCharacters: ['@', '+'], scrollRestoration: false, }) - router.pathParamsDecoder = decoder router.history.destroy() const calls = inputs - .filter((input) => input.path?.includes('$')) + .filter((input) => input.path.includes('$')) .map((input) => ({ - path: input.path || '/', + path: input.path, params: input.params, - route: register ? routes.get(input.path || '/') : undefined, + route: register ? routes.get(input.path) : undefined, expected: decodePath( - interpolatePath( + interpolateTestPath( input.path, input.params, input.decoder, undefined, undefined, - input.server, ), ), })) @@ -162,13 +162,12 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { const expected = inputs.reduce( (sum, input) => sum + - interpolatePath( + interpolateTestPath( input.path, input.params, input.decoder, undefined, undefined, - input.server, ).length, 0, ) @@ -184,6 +183,13 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { ) } + const preparedInputs = inputs.map((input) => ({ + ...input, + segments: register + ? routes.get(input.path)?._interpolation + : parseSegments(false, { fullPath: input.path }, 0), + })) + bench( 'shared interpolation and normalization batch', () => { @@ -208,17 +214,19 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { ) bench( - 'pathname-only interpolation batch', + 'prepared pathname interpolation batch', () => { let length = 0 - for (const input of inputs) { - length += interpolatePath( - input.path, - input.params, - input.decoder, - undefined, - undefined, - input.server, + for (const input of preparedInputs) { + length += ( + input.segments + ? interpolatePath( + input.path, + input.segments, + input.params, + input.decoder, + ) + : input.path ).length } checksum = length @@ -234,18 +242,20 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { ) bench( - 'metadata-enabled interpolation batch', + 'prepared metadata interpolation batch', () => { let length = 0 - for (const input of inputs) { - length += interpolatePath( - input.path, - input.params, - input.decoder, - Object.create(null), - undefined, - input.server, - { isMissingParams: false }, + for (const input of preparedInputs) { + length += ( + input.segments + ? interpolatePath( + input.path, + input.segments, + input.params, + input.decoder, + Object.create(null), + ) + : input.path ).length } checksum = length diff --git a/packages/router-core/tests/path.test.ts b/packages/router-core/tests/path.test.ts index fc3f806fc7..5fb2b02628 100644 --- a/packages/router-core/tests/path.test.ts +++ b/packages/router-core/tests/path.test.ts @@ -1,8 +1,8 @@ -import { describe, expect, it, vi } from 'vitest' +import { afterEach, describe, expect, it, vi } from 'vitest' +import * as pathUtils from '../src/path' import { compileDecodeCharMap, exactPathTest, - interpolatePath, removeTrailingSlash, resolvePath, trimPathLeft, @@ -12,13 +12,18 @@ import { SEGMENT_TYPE_PATHNAME, SEGMENT_TYPE_WILDCARD, findSingleMatch, - parseSegment, - processRouteTree, } from '../src/new-process-route-tree' import { createSieveCache } from '../src/sieve-cache' -import { createTestPathInterpolator as createPathInterpolator } from './routerTestUtils' +import { + createTestPathInterpolator as createPathInterpolator, + interpolateTestPath as interpolatePath, + parseTestPathname as parsePathname, + processTestRouteTree as processRouteTree, +} from './routerTestUtils' import type { SegmentKind } from '../src/new-process-route-tree' +afterEach(() => vi.restoreAllMocks()) + describe.each([false, true])( 'shared pathname interpolation (server: %s)', (server) => { @@ -85,17 +90,10 @@ describe.each([false, true])( ])( 'interpolates and caches $path with $params', ({ path, params, expected, normalized }) => { - const interpolate = createPathInterpolator() + const interpolate = createPathInterpolator({ isServer: server }) const options = { path, params, server } expect( - interpolatePath( - path, - params, - undefined, - undefined, - undefined, - server, - ), + interpolatePath(path, params, undefined, undefined, undefined), ).toBe(expected) expect(interpolate(options)).toBe(normalized ?? expected) expect(interpolate({ ...options, params: { ...params } })).toBe( @@ -105,16 +103,18 @@ describe.each([false, true])( ) it('shares results across equivalent params without retaining unrelated params', () => { - const interpolate = createPathInterpolator() - const decoder = vi.fn(compileDecodeCharMap(['@'])) + const interpolate = createPathInterpolator({ + isServer: server, + pathParamsAllowedCharacters: ['@'], + }) + const format = vi.spyOn(pathUtils, 'interpolatePath') const options = { path: '/users/$id', params: { id: '@one', unrelated: 'first' }, - decoder, server, } expect(interpolate(options)).toBe('/users/@one') - expect(decoder).toHaveBeenCalledOnce() + expect(format).toHaveBeenCalledOnce() expect( interpolate({ @@ -122,15 +122,18 @@ describe.each([false, true])( params: { id: '@one', unrelated: 'second' }, }), ).toBe('/users/@one') - expect(decoder).toHaveBeenCalledOnce() + expect(format).toHaveBeenCalledOnce() - const anotherRouter = createPathInterpolator() + const anotherRouter = createPathInterpolator({ + isServer: server, + pathParamsAllowedCharacters: ['@'], + }) expect(anotherRouter(options)).toBe('/users/@one') - expect(decoder).toHaveBeenCalledTimes(2) + expect(format).toHaveBeenCalledTimes(2) }) it('normalizes non-string fallbacks without memoizing object coercion', () => { - const interpolate = createPathInterpolator() + const interpolate = createPathInterpolator({ isServer: server }) const toString = vi.fn(() => 'one two') const options = { path: '/users/$id', @@ -144,42 +147,53 @@ describe.each([false, true])( expect(toString).toHaveBeenCalledTimes(2) }) - it('invalidates results when allowed-character decoding changes', () => { - const interpolate = createPathInterpolator() + it('separates results between fixed encoding configurations', () => { + const allowAt = createPathInterpolator({ + isServer: server, + pathParamsAllowedCharacters: ['@'], + }) + const allowPlus = createPathInterpolator({ + isServer: server, + pathParamsAllowedCharacters: ['+'], + }) + const standard = createPathInterpolator({ isServer: server }) const options = { path: '/users/$id', params: { id: '@+' }, server, } - expect( - interpolate({ ...options, decoder: compileDecodeCharMap(['@']) }), - ).toBe('/users/@%2B') - expect( - interpolate({ ...options, decoder: compileDecodeCharMap(['+']) }), - ).toBe('/users/%40+') - expect(interpolate(options)).toBe('/users/%40%2B') + expect(allowAt(options)).toBe('/users/@%2B') + expect(allowPlus(options)).toBe('/users/%40+') + expect(standard(options)).toBe('/users/%40%2B') + expect(allowAt(options)).toBe('/users/@%2B') }) - it('refreshes each cached template when its decoder changes', () => { - const interpolate = createPathInterpolator() - const allowAt = compileDecodeCharMap(['@']) - const allowPlus = compileDecodeCharMap(['+']) - for (const [decoder, encoded] of [ + it('keeps each router template cache independent of other encodings', () => { + const allowAt = createPathInterpolator({ + isServer: server, + pathParamsAllowedCharacters: ['@'], + }) + const allowPlus = createPathInterpolator({ + isServer: server, + pathParamsAllowedCharacters: ['+'], + }) + const standard = createPathInterpolator({ isServer: server }) + for (const [interpolate, encoded] of [ [allowAt, '@%2B'], [allowPlus, '%40+'], - [undefined, '%40%2B'], + [standard, '%40%2B'], [allowAt, '@%2B'], ] as const) { for (const prefix of ['/users/', '/teams/']) { const path = prefix + '$id' - const options = { path, params: { id: '@+' }, decoder, server } + const options = { path, params: { id: '@+' }, server } expect(interpolate(options)).toBe(prefix + encoded) } } }) it('does not confuse parameter boundaries in shared cache keys', () => { - const interpolate = createPathInterpolator() + const interpolate = createPathInterpolator({ isServer: server }) const options = { path: '/$first/$second', server } const first = { first: 'a:b', second: 'c' } const second = { first: 'a', second: 'b:c' } @@ -190,22 +204,16 @@ describe.each([false, true])( }) it('keeps templates separate when parameter values are equal', () => { - const interpolate = createPathInterpolator() + const interpolate = createPathInterpolator({ isServer: server }) const params = { id: '123' } - expect(interpolate({ path: '/users/$id', params, server })).toBe( - '/users/123', - ) - expect(interpolate({ path: '/posts/$id', params, server })).toBe( - '/posts/123', - ) - expect(interpolate({ path: '/users/$id', params, server })).toBe( - '/users/123', - ) + expect(interpolate({ path: '/users/$id', params })).toBe('/users/123') + expect(interpolate({ path: '/posts/$id', params })).toBe('/posts/123') + expect(interpolate({ path: '/users/$id', params })).toBe('/users/123') }) it('tracks optional params that were absent when the template was first used', () => { - const interpolate = createPathInterpolator() + const interpolate = createPathInterpolator({ isServer: server }) const path = '/posts/{-$category}/$id' const inputs = [ { params: { id: 'one' }, expected: '/posts/one' }, @@ -231,12 +239,14 @@ describe.each([false, true])( }) it('caches paths with omitted optional params', () => { - const interpolate = createPathInterpolator() - const decoder = vi.fn(compileDecodeCharMap(['@'])) + const interpolate = createPathInterpolator({ + isServer: server, + pathParamsAllowedCharacters: ['@'], + }) + const format = vi.spyOn(pathUtils, 'interpolatePath') const options = { path: '/{-$lang}/foo/$id', params: { id: '@one' }, - decoder, server, } @@ -244,28 +254,30 @@ describe.each([false, true])( expect(interpolate({ ...options, params: { id: '@one' } })).toBe( '/foo/@one', ) - expect(decoder).toHaveBeenCalledOnce() + expect(format).toHaveBeenCalledOnce() }) it('uses the canonical splat value instead of its legacy alias', () => { - const interpolate = createPathInterpolator() - const decoder = vi.fn(compileDecodeCharMap(['@'])) + const interpolate = createPathInterpolator({ + isServer: server, + pathParamsAllowedCharacters: ['@'], + }) + const format = vi.spyOn(pathUtils, 'interpolatePath') const options = { path: '/files/$', params: { _splat: 'docs/@guide', '*': 'ignored' }, - decoder, server, } expect(interpolate(options)).toBe('/files/docs/@guide') - decoder.mockClear() + format.mockClear() expect( interpolate({ ...options, params: { _splat: 'docs/@guide', '*': 'changed' }, }), ).toBe('/files/docs/@guide') - expect(decoder).not.toHaveBeenCalled() + expect(format).not.toHaveBeenCalled() }) it('collects used params for splats but not missing optionals', () => { @@ -276,7 +288,6 @@ describe.each([false, true])( undefined, usedParams, undefined, - server, ) expect(usedParams).toEqual({}) interpolatePath( @@ -285,7 +296,6 @@ describe.each([false, true])( undefined, usedParams, undefined, - server, ) expect(usedParams).toEqual({ _splat: 'docs/guide', @@ -331,7 +341,6 @@ describe.each([false, true])( undefined, usedParams, keys, - server, metadata, ), ).toBe(path) @@ -339,14 +348,7 @@ describe.each([false, true])( expect(usedParams).toEqual(used) expect(metadata.isMissingParams).toBe(missing) expect( - interpolatePath( - template, - params, - undefined, - undefined, - undefined, - server, - ), + interpolatePath(template, params, undefined, undefined, undefined), ).toBe(path) }, ) @@ -399,7 +401,6 @@ describe.each([false, true])( undefined, collectedParams, undefined, - server, metadata, ), ).toBe(pathname) @@ -409,7 +410,7 @@ describe.each([false, true])( ) it('tracks a splat that was empty when the template was first used', () => { - const interpolate = createPathInterpolator() + const interpolate = createPathInterpolator({ isServer: server }) for (const _splat of ['', 'docs/guide', '', 'docs/reference']) { const options = { path: '/files/prefix{$}suffix', @@ -421,7 +422,7 @@ describe.each([false, true])( }) it('does not retain incomplete metadata when the first interpolation throws', () => { - const interpolate = createPathInterpolator() + const interpolate = createPathInterpolator({ isServer: server }) const options = { path: '/$first/$second', server } expect(() => @@ -717,12 +718,29 @@ describe('resolvePath', () => { describe.each([{ server: true }, { server: false }])( 'interpolatePath (server: $server)', ({ server }) => { + it.each(['value', '', undefined])( + 'stops interpolation at a bare splat with value %s', + (_splat) => { + const params = { + _splat, + get ignored() { + throw new Error('A bare splat consumes the rest of the template') + }, + } + const used: Record = Object.create(null) + const keys: Array = [] + expect( + interpolatePath('/files/$/$ignored', params, undefined, used, keys), + ).toBe(_splat ? '/files/value' : '/files') + expect(keys).toEqual(['_splat']) + expect(used).toEqual({ _splat, '*': _splat }) + }, + ) + it.each([ - { path: undefined, expected: '/' }, - { path: '', expected: '/' }, { path: '/', expected: '/' }, { path: '/about/', expected: '/about/' }, - ])('preserves static and empty paths: $path', ({ path, expected }) => { + ])('preserves static paths: $path', ({ path, expected }) => { const params = { get unused() { throw new Error('Static paths must not read params') @@ -733,15 +751,7 @@ describe.each([{ server: true }, { server: false }])( const keys: Array = [] const metadata = { isMissingParams: false } expect( - interpolatePath( - path, - params, - decoder, - usedParams, - keys, - server, - metadata, - ), + interpolatePath(path, params, decoder, usedParams, keys, metadata), ).toBe(expected) expect(usedParams).toEqual({}) expect(keys).toEqual([]) @@ -780,7 +790,6 @@ describe.each([{ server: true }, { server: false }])( undefined, undefined, undefined, - server, metadata, ), ).toBe(expected) @@ -894,7 +903,7 @@ describe.each([{ server: true }, { server: false }])( }, ])('$name', ({ path, params, decoder, result }) => { expect( - interpolatePath(path, params, decoder, undefined, undefined, server), + interpolatePath(path, params, decoder, undefined, undefined), ).toBe(result) }) }) @@ -925,14 +934,7 @@ describe.each([{ server: true }, { server: false }])( 'should preserve trailing slash for $path', ({ path, params, result }) => { expect( - interpolatePath( - path, - params, - undefined, - undefined, - undefined, - server, - ), + interpolatePath(path, params, undefined, undefined, undefined), ).toBe(result) }, ) @@ -972,7 +974,7 @@ describe.each([{ server: true }, { server: false }])( }, ])('$name', ({ to, params, result }) => { expect( - interpolatePath(to, params, undefined, undefined, undefined, server), + interpolatePath(to, params, undefined, undefined, undefined), ).toBe(result) }) }) @@ -1035,14 +1037,7 @@ describe.each([{ server: true }, { server: false }])( }, ])('$name', ({ path, params, result }) => { expect( - interpolatePath( - path, - params, - undefined, - undefined, - undefined, - server, - ), + interpolatePath(path, params, undefined, undefined, undefined), ).toBe(result) }) }) @@ -1087,7 +1082,7 @@ describe.each([{ server: true }, { server: false }])( }, ])('$name', ({ to, params, result }) => { expect( - interpolatePath(to, params, undefined, undefined, undefined, server), + interpolatePath(to, params, undefined, undefined, undefined), ).toBe(result) }) }) @@ -1142,7 +1137,6 @@ describe.each([{ server: true }, { server: false }])( undefined, undefined, undefined, - server, metadata, ) expect(result).toBe(expectedResult) @@ -1173,7 +1167,6 @@ describe.each([{ server: true }, { server: false }])( undefined, undefined, undefined, - server, ) expect(interpolatedNextTo).toBe(`/splat${tail}`) }, @@ -1443,35 +1436,6 @@ describe('parsePathname', () => { suffixSegment?: string } - const parsePathname = (to: string | undefined) => { - let cursor = 0 - let data - const path = to ?? '' - const segments: Array = [] - while (cursor < path.length) { - const start = cursor - data = parseSegment(path, start, data) - const end = data[5] - cursor = end + 1 - const type = data[0] - const value = path.substring(data[2], data[3]) - const prefix = path.substring(start, data[1]) - const suffix = path.substring(data[4], end) - const segment: PathSegment = { - type, - value, - } - if (prefix) { - segment.prefixSegment = prefix - } - if (suffix) { - segment.suffixSegment = suffix - } - segments.push(segment) - } - return segments - } - describe('regular usage', () => { it.each([ { diff --git a/packages/router-core/tests/route-initialization.test.ts b/packages/router-core/tests/route-initialization.test.ts new file mode 100644 index 0000000000..8d44447b43 --- /dev/null +++ b/packages/router-core/tests/route-initialization.test.ts @@ -0,0 +1,60 @@ +import { afterEach, expect, test, vi } from 'vitest' +import { BaseRootRoute, BaseRoute } from '../src' +import { processRouteTree } from '../src/new-process-route-tree' +import type { AnyRoute } from '../src' + +afterEach(() => vi.restoreAllMocks()) + +test('initializes routes parent-first before reading their IDs and paths', () => { + const root = new BaseRootRoute({}) + const layout = new BaseRoute({ + getParentRoute: () => root, + path: '/layout', + }) + const child = new BaseRoute({ + getParentRoute: () => layout, + path: '/$id', + }) + const sibling = new BaseRoute({ + getParentRoute: () => root, + path: '/sibling', + }) + const routes = [root, layout, child, sibling] + const calls = routes.map((route) => vi.spyOn(route, 'init')) + const { routesById } = processRouteTree( + root.addChildren([layout.addChildren([child]), sibling]), + ) + for (const [originalIndex, init] of calls.entries()) { + expect(init).toHaveBeenCalledExactlyOnceWith(originalIndex) + expect(routes[originalIndex]!.originalIndex).toBe(originalIndex) + } + const order = calls.map((init) => init.mock.invocationCallOrder[0]!) + expect(order).toEqual([...order].sort((a, b) => a - b)) + expect(root.id).toBe('__root__') + expect(child.fullPath).toBe('/layout/$id') + for (const route of routes) { + expect(routesById[route.id]).toBe(route) + } +}) + +test('normalizes nested route IDs without changing pathless layout paths', () => { + const root = new BaseRootRoute({}) + const layout = new BaseRoute({ + getParentRoute: () => root, + id: '//_layout//', + }) + const item = new BaseRoute({ + getParentRoute: () => layout, + path: '//items//$id//', + }) + const { routesById } = processRouteTree( + root.addChildren([layout.addChildren([item])]), + ) + expect(root.id).toBe('__root__') + expect(layout.id).toBe('/_layout/') + expect(layout.fullPath).toBe('/') + expect(item.id).toBe('/_layout/items/$id/') + expect(item.fullPath).toBe('/items/$id/') + expect(item.to).toBe('/items/$id') + expect(routesById[item.id]).toBe(item) +}) diff --git a/packages/router-core/tests/route-interpolation.test.ts b/packages/router-core/tests/route-interpolation.test.ts new file mode 100644 index 0000000000..3f8428dfd9 --- /dev/null +++ b/packages/router-core/tests/route-interpolation.test.ts @@ -0,0 +1,261 @@ +import { afterEach, describe, expect, test, vi } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute, BaseRoute } from '../src' +import { + compileDecodeCharMap, + hasMissingPathParams, + interpolatePath, +} from '../src/path' +import * as routeTreeUtils from '../src/new-process-route-tree' +import { createTestRouter, interpolateTestPath } from './routerTestUtils' + +afterEach(() => vi.restoreAllMocks()) + +test.each([ + { path: '/static', params: {}, missing: false }, + { path: '/$id', params: {}, missing: true }, + { path: '/$id', params: { id: undefined }, missing: false }, + { path: '/$id', params: { id: '' }, missing: false }, + { path: '/{-$id}', params: {}, missing: false }, + { path: '/pre{-$id}suffix', params: { id: null }, missing: false }, + { path: '/files/$', params: {}, missing: true }, + { path: '/files/$', params: { _splat: '' }, missing: true }, + { path: '/files/{$}.txt', params: { _splat: 0 }, missing: true }, + { path: '/files/$/ignored', params: { _splat: 'a/b' }, missing: false }, +])( + 'preserves navigation availability for $path: $params', + ({ path, params, missing }) => { + const segments = routeTreeUtils.parseSegments(false, { fullPath: path }, 0) + expect(hasMissingPathParams(segments, params)).toBe(missing) + }, +) + +test('encodes splats equivalently without interpreting literal encoded separators', () => { + for (const allowed of [[], ['@', '+'], ['%'], ['/']]) { + const decoder = compileDecodeCharMap(allowed) + for (const value of [ + '/a//b/', + 'docs/a b/c+d?x#y', + 'literal%2F/100%/caf\u00e9', + 'folder/\u6f22\u5b57/file', + ]) { + const expected = value + .split('/') + .map((part) => decoder(encodeURIComponent(part))) + .join('/') + expect(interpolateTestPath('/files/$', { _splat: value }, decoder)).toBe( + `/files/${expected}`, + ) + } + } +}) + +describe.each([false, true])( + 'prepared route interpolation (server: %s)', + (server) => { + test.each([ + '/', + '/static/path/', + '/items/$id', + '/$id/$id/', + '/items/Pre{$id}Suffix/{-$lang}', + '/items/Pre{-$id}Suffix/$lang', + '/files/$', + '/files/Pre{$}Suffix/', + '/files/$/child', + '/{-$lang}/files/{$}.txt', + '//items//$id//', + '/literal$dollar/{$id}/', + ])('keeps substitution and metadata live for %s', (path) => { + const root = new BaseRootRoute({}) + const route = new BaseRoute({ getParentRoute: () => root, path }) + const history = createMemoryHistory({ initialEntries: ['/'] }) + createTestRouter({ + routeTree: root.addChildren([route]), + history, + isServer: server, + scrollRestoration: false, + }) + history.destroy() + const inputs: Array> = [ + {}, + { id: '', lang: null, _splat: '' }, + { id: 'one /@+?', lang: 'en', _splat: 'docs/a b/100%' }, + { id: 0, lang: false, _splat: 0 }, + { id: 'next', lang: undefined, _splat: 'next/file' }, + ] + for (const params of [...inputs, ...inputs]) { + const expectedUsed = Object.create(null) + const actualUsed = Object.create(null) + const expectedKeys: Array = [] + const actualKeys = (route._interpolation ?? []).flatMap((part) => + typeof part === 'string' ? [] : [part[1 /* key */]], + ) + const expectedMeta = { isMissingParams: false } + const decoder = compileDecodeCharMap(['@', '+']) + const expected = interpolateTestPath( + path, + params, + decoder, + expectedUsed, + expectedKeys, + expectedMeta, + ) + expect( + route._interpolation + ? interpolatePath( + path, + route._interpolation, + params, + decoder, + actualUsed, + ) + : path, + ).toBe(expected) + expect(actualUsed).toEqual(expectedUsed) + expect(actualKeys).toEqual(expectedKeys) + expect( + route._interpolation + ? hasMissingPathParams(route._interpolation, params) + : false, + ).toBe(expectedMeta.isMissingParams) + } + }) + + test('does not change prepared segments when an encoder throws', () => { + const root = new BaseRootRoute({}) + const route = new BaseRoute({ + getParentRoute: () => root, + path: '/$first/{-$second}', + }) + const history = createMemoryHistory({ initialEntries: ['/'] }) + createTestRouter({ + routeTree: root.addChildren([route]), + history, + isServer: server, + scrollRestoration: false, + }) + history.destroy() + const prepared = route._interpolation + expect(prepared).toBeDefined() + expect(() => + interpolatePath(route.fullPath, route._interpolation!, { + first: '\uD800', + second: 'two', + }), + ).toThrow(URIError) + expect(route._interpolation).toBe(prepared) + expect( + interpolatePath(route.fullPath, route._interpolation!, { + first: 'one', + second: 'two', + }), + ).toBe('/one/two') + }) + }, +) + +test('never reparses a processed route for first use, Link misses or match metadata', () => { + const root = new BaseRootRoute({}) + const route = new BaseRoute({ + getParentRoute: () => root, + path: '/items/Pre{$id}Suffix/{-$lang}', + }) + const history = createMemoryHistory({ initialEntries: ['/'] }) + const router = createTestRouter({ + routeTree: root.addChildren([route]), + history, + pathParamsAllowedCharacters: ['@'], + scrollRestoration: false, + }) + history.destroy() + const prepared = route._interpolation + expect(prepared).toBeDefined() + const parse = vi.spyOn(routeTreeUtils, 'parseSegments') + routeTreeUtils.parseSegments( + false, + { fullPath: '/unregistered-control/$id' }, + 0, + ) + expect(parse).toHaveBeenCalled() + parse.mockClear() + router.buildLocation({ + to: '/items/Pre{$id}Suffix/{-$lang}', + params: { id: 'first' }, + }) + for (let id = 0; id < 256; id++) { + expect( + router.buildLocation({ + to: '/items/Pre{$id}Suffix/{-$lang}', + params: { id: String(id), lang: 'en' }, + }).href, + ).toBe(`/items/Pre${id}Suffix/en`) + expect( + router.matchRoutes(`/items/Pre${id}Suffix/en`, {}).at(-1)?._strictParams, + ).toEqual({ id: String(id), lang: 'en' }) + } + expect( + router.buildLocation({ + to: '/items/Pre{$id}Suffix/{-$lang}', + params: { id: '@last' }, + }).href, + ).toBe('/items/Pre@lastSuffix') + expect(route._interpolation).toBe(prepared) + expect(parse).not.toHaveBeenCalled() +}) + +test.each([false, true])( + 'uses prepared segments for either trailing slash variant (server: %s)', + (server) => { + const root = new BaseRootRoute({}) + const route = new BaseRoute({ + getParentRoute: () => root, + path: '/files/pre{$}.txt/', + }) + const history = createMemoryHistory({ initialEntries: ['/'] }) + createTestRouter({ + routeTree: root.addChildren([route]), + history, + isServer: server, + scrollRestoration: false, + }) + history.destroy() + const parse = vi.spyOn(routeTreeUtils, 'parseSegments') + for (const path of [ + '/files/pre{$}.txt', + '/files/pre{$}.txt/', + '/files/pre{$}.txt', + ]) { + expect( + interpolatePath(path, route._interpolation!, { _splat: 'a/b' }), + ).toBe(path.endsWith('/') ? '/files/prea/b.txt//' : '/files/prea/b.txt') + } + expect(parse).not.toHaveBeenCalled() + }, +) + +test.each([false, true])( + 'preserves inherited wildcard tails (server: %s)', + (server) => { + for (const path of ['/files/{$}.txt', '/{-$lang}/files/$', '/files/$']) { + const root = new BaseRootRoute({}) + const parent = new BaseRoute({ getParentRoute: () => root, path }) + const child = new BaseRoute({ + getParentRoute: () => parent, + path: '/child', + }) + const history = createMemoryHistory({ initialEntries: ['/'] }) + createTestRouter({ + routeTree: root.addChildren([parent.addChildren([child])]), + history, + isServer: server, + scrollRestoration: false, + }) + history.destroy() + const params = { _splat: 'a/b', lang: 'en' } + expect( + interpolatePath(child.fullPath, child._interpolation!, params), + ).toBe(interpolateTestPath(child.fullPath, params)) + } + }, +) diff --git a/packages/router-core/tests/route-tree-caches.test.ts b/packages/router-core/tests/route-tree-caches.test.ts index fa222d51e2..207784525c 100644 --- a/packages/router-core/tests/route-tree-caches.test.ts +++ b/packages/router-core/tests/route-tree-caches.test.ts @@ -2,6 +2,7 @@ import { afterEach, beforeEach, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import * as pathUtils from '../src/path' +import * as routeTreeUtils from '../src/new-process-route-tree' import { createRequestHandler } from '../src/ssr/createRequestHandler' import { createTestRouter } from './routerTestUtils' import type { AnyRoute, AnyRouter } from '../src' @@ -58,13 +59,13 @@ test.each([false, true])( }) expect(result.pathname).toBe(pathname) expect(result.href).toBe(href) - expect(item._pathCache?.[1].get(id)).toBe(pathname) + expect(item._pathCache?.[0 /* paths */].get(id)).toBe(pathname) } } }, ) -test('reuses route caches after server request cleanup without sharing match state', async () => { +test('reuses server caches after request cleanup without sharing match state', async () => { const { routeTree, item, root } = createRoutes() const routers: Array = [] const request = () => @@ -77,6 +78,10 @@ test('reuses route caches after server request cleanup without sharing match sta }, })(({ router }) => { disposers.push(router.history.destroy) + router.buildLocation({ + to: '/pretty/$id', + params: { id: 'one two' }, + }) return new Response( router.buildLocation({ to: '/items/$id', @@ -88,8 +93,11 @@ test('reuses route caches after server request cleanup without sharing match sta expect(await (await request()).text()).toBe('/items/one%20two') const branch = item._branch const plan = item._pathCache + const firstLocation = routers[0]!.latestLocation + const lightweightResult = routers[0]!['lightweightCache'].get(firstLocation) expect(branch).toEqual([root, item]) expect(plan).toBeDefined() + expect(lightweightResult).toBeDefined() const interpolate = vi.spyOn(pathUtils, 'interpolatePath') expect(await (await request()).text()).toBe('/items/one%20two') @@ -98,8 +106,19 @@ test('reuses route caches after server request cleanup without sharing match sta expect( interpolate.mock.calls.filter(([path]) => path === '/items/$id'), ).toHaveLength(0) + expect( + interpolate.mock.calls.filter(([path]) => path === '/pretty/$id'), + ).toHaveLength(0) expect(routers[0]).not.toBe(routers[1]) expect(routers[0]!.resolvePathCache).toBe(routers[1]!.resolvePathCache) + expect(routers[0]!['unmatchedPathCache']).toBe( + routers[1]!['unmatchedPathCache'], + ) + expect(routers[0]!['lightweightCache']).not.toBe( + routers[1]!['lightweightCache'], + ) + expect(routers[1]!['lightweightCache'].get(firstLocation)).toBeUndefined() + expect(routers[1]!.latestLocation).not.toBe(firstLocation) expect(routers[0]!._cache).not.toBe(routers[1]!._cache) }) @@ -110,11 +129,19 @@ test.each([ 'does not share router cache groups in $mode (server: $isServer)', ({ mode, isServer }) => { vi.stubEnv('NODE_ENV', mode) - const { routeTree } = createRoutes() - const first = createTestRouter({ routeTree, history: history(), isServer }) - const second = createTestRouter({ routeTree, history: history(), isServer }) + const first = createTestRouter({ + routeTree: createRoutes().routeTree, + history: history(), + isServer, + }) + const second = createTestRouter({ + routeTree: createRoutes().routeTree, + history: history(), + isServer, + }) expect(first.resolvePathCache).not.toBe(second.resolvePathCache) expect(first['unmatchedPathCache']).not.toBe(second['unmatchedPathCache']) + expect(first['lightweightCache']).not.toBe(second['lightweightCache']) expect(globalThis.__TSR_CACHE__).toBeUndefined() }, ) @@ -138,16 +165,24 @@ test('keeps different route objects independent and resets derived caches when r } expect(firstTree.item._branch).not.toBe(secondTree.item._branch) expect(firstTree.item._pathCache).not.toBe(secondTree.item._pathCache) + expect(firstTree.item._interpolation).not.toBe(secondTree.item._interpolation) const previousResolve = first.resolvePathCache const previousFallback = first['unmatchedPathCache'] + const previousLightweight = first['lightweightCache'] const previousBranch = firstTree.item._branch const previousPlan = firstTree.item._pathCache + const previousInterpolation = firstTree.item._interpolation first.setRoutes(first.buildRouteTree()) expect(first.resolvePathCache).not.toBe(previousResolve) expect(first['unmatchedPathCache']).not.toBe(previousFallback) + expect(first['lightweightCache']).not.toBe(previousLightweight) expect(firstTree.item._branch).toBeUndefined() expect(firstTree.item._pathCache).toBe(previousPlan) + expect(firstTree.item._interpolation).not.toBe(previousInterpolation) + expect([...firstTree.item._interpolation!]).toEqual([ + ...previousInterpolation!, + ]) expect( first.buildLocation({ to: '/items/$id', params: { id: 'one' } }).href, ).toBe('/items/one') @@ -168,9 +203,9 @@ test('keeps more than 32 registered route templates warm', () => { const router = createTestRouter({ routeTree: root.addChildren(routes), history: history(), + pathParamsAllowedCharacters: ['@'], }) - const decoder = vi.fn(pathUtils.compileDecodeCharMap(['@'])) - router.pathParamsDecoder = decoder + const interpolate = vi.spyOn(pathUtils, 'interpolatePath') for (let round = 0; round < 2; round++) { for (let index = 0; index < routes.length; index++) { expect( @@ -180,7 +215,7 @@ test('keeps more than 32 registered route templates warm', () => { }).pathname, ).toBe(`/section-${index}/@one`) } - expect(decoder).toHaveBeenCalledTimes(routes.length) + expect(interpolate).toHaveBeenCalledTimes(routes.length) } }) @@ -204,6 +239,7 @@ test('refreshes branches and path plans when an existing route is reparented', ( ).toBe('/left/child/one%20two') expect(child._branch).toEqual([root, left, child]) const plan = child._pathCache + const previousInterpolation = child._interpolation parent = right left.addChildren([]) @@ -211,19 +247,47 @@ test('refreshes branches and path plans when an existing route is reparented', ( router.setRoutes(router.buildRouteTree()) expect(child._branch).toBeUndefined() expect(child._pathCache).toBe(plan) + expect(child._interpolation).not.toBe(previousInterpolation) + expect(child.fullPath).toBe('/right/child/$id') + expect(child._interpolation?.[0]).toBe('/right/child') + const parse = vi.spyOn(routeTreeUtils, 'parseSegments') expect( router.buildLocation({ to: '/right/child/$id', params: { id: 'one two' } }) .href, ).toBe('/right/child/one%20two') expect(child._branch).toEqual([root, right, child]) expect(child._pathCache).not.toBe(plan) + expect(parse).not.toHaveBeenCalled() +}) + +test('uses updated callbacks with rebuilt segments in development', () => { + vi.stubEnv('NODE_ENV', 'development') + const { routeTree, item } = createRoutes() + const router = createTestRouter({ routeTree, history: history() }) + expect( + router.buildLocation({ to: '/items/$id', params: { id: 'one' } }).href, + ).toBe('/items/one') + const prepared = item._interpolation + item.options.params = { + stringify: ({ id }) => ({ id: `updated ${id}` }), + } + router.setRoutes(router.buildRouteTree()) + expect(item._interpolation).not.toBe(prepared) + const parse = vi.spyOn(routeTreeUtils, 'parseSegments') + expect( + router.buildLocation({ to: '/items/$id', params: { id: 'one' } }).href, + ).toBe('/items/updated%20one') + expect(parse).not.toHaveBeenCalled() }) test('keeps the 128-result bound within each route', () => { const { routeTree } = createRoutes() - const router = createTestRouter({ routeTree, history: history() }) - const decoder = vi.fn(pathUtils.compileDecodeCharMap(['@'])) - router.pathParamsDecoder = decoder + const router = createTestRouter({ + routeTree, + history: history(), + pathParamsAllowedCharacters: ['@'], + }) + const interpolate = vi.spyOn(pathUtils, 'interpolatePath') for (let id = 0; id <= 128; id++) { expect( router.buildLocation({ @@ -232,24 +296,23 @@ test('keeps the 128-result bound within each route', () => { }).pathname, ).toBe(`/items/@${id}`) } - decoder.mockClear() + interpolate.mockClear() expect( router.buildLocation({ to: '/items/$id', params: { id: '@0' } }).pathname, ).toBe('/items/@0') - expect(decoder).toHaveBeenCalledOnce() + expect(interpolate).toHaveBeenCalledOnce() }) -test('isolates decoder and trailing-slash variants on the same server route', () => { - const { routeTree } = createRoutes() +test('uses fixed encodings and trailing-slash policies on independent routes', () => { const allowAt = createTestRouter({ - routeTree, + routeTree: createRoutes().routeTree, history: history(), isServer: true, trailingSlash: 'never', pathParamsAllowedCharacters: ['@'], }) const allowPlus = createTestRouter({ - routeTree, + routeTree: createRoutes().routeTree, history: history(), isServer: true, trailingSlash: 'always', @@ -265,9 +328,15 @@ test('isolates decoder and trailing-slash variants on the same server route', () .pathname, ).toBe('/items/%40+/') } - allowPlus.pathParamsDecoder = allowAt.pathParamsDecoder + const allowAtWithSlash = createTestRouter({ + routeTree: createRoutes().routeTree, + history: history(), + isServer: true, + trailingSlash: 'always', + pathParamsAllowedCharacters: ['@'], + }) expect( - allowPlus.buildLocation({ to: '/items/$id', params: { id: '@+' } }) + allowAtWithSlash.buildLocation({ to: '/items/$id', params: { id: '@+' } }) .pathname, ).toBe('/items/@%2B/') expect( @@ -275,21 +344,82 @@ test('isolates decoder and trailing-slash variants on the same server route', () ).toBe('/items/@%2B') }) +test('parses unregistered templates once per immutable router', () => { + const parse = vi.spyOn(routeTreeUtils, 'parseSegments') + for (const allowed of [undefined, ['@'], ['+']] as const) { + const router = createTestRouter({ + routeTree: createRoutes().routeTree, + history: history(), + pathParamsAllowedCharacters: allowed, + }) + for (let id = 0; id < 140; id++) { + expect( + router.buildLocation({ + to: '/unregistered/$id', + params: { id: String(id) }, + }).pathname, + ).toBe(`/unregistered/${id}`) + } + } + expect(parse).toHaveBeenCalledTimes(3) +}) + +test('keeps client-local template caches independent of other fixed encodings', () => { + const first = createTestRouter({ + routeTree: createRoutes().routeTree, + history: history(), + isServer: false, + pathParamsAllowedCharacters: ['@'], + }) + const second = createTestRouter({ + routeTree: createRoutes().routeTree, + history: history(), + isServer: false, + pathParamsAllowedCharacters: ['+'], + }) + const destination = { to: '/unregistered/$id', params: { id: '@+' } } + expect(first.buildLocation(destination).pathname).toBe('/unregistered/@%2B') + expect( + second.buildLocation({ to: '/items/$id', params: { id: '@+' } }).pathname, + ).toBe('/items/%40+') + expect(second.buildLocation(destination).pathname).toBe('/unregistered/%40+') + const interpolate = vi.spyOn(pathUtils, 'interpolatePath') + expect(first.buildLocation(destination).pathname).toBe('/unregistered/@%2B') + expect(interpolate).not.toHaveBeenCalled() +}) + +test('does not reparse a legacy fallback already registered in the tree', () => { + const { routeTree, item } = createRoutes() + const parse = vi.spyOn(routeTreeUtils, 'parseSegments') + const router = createTestRouter({ + routeTree, + notFoundRoute: item, + history: history(), + }) + expect(router.routesById[item.id]).toBe(item) + expect(item._interpolation).toBeDefined() + expect(parse).not.toHaveBeenCalled() +}) + test('retains a bounded fallback for unregistered mask templates', () => { const { routeTree } = createRoutes() - const router = createTestRouter({ routeTree, history: history() }) - const decoder = vi.fn(pathUtils.compileDecodeCharMap(['@'])) - router.pathParamsDecoder = decoder + const router = createTestRouter({ + routeTree, + history: history(), + pathParamsAllowedCharacters: ['@'], + }) + const interpolate = vi.spyOn(pathUtils, 'interpolatePath') const build = () => router.buildLocation({ to: '/items/$id', params: { id: '@one' }, mask: { to: '/pretty/$id', params: { id: '@one' } }, }) + expect(build().maskedLocation?.pathname).toBe('/pretty/@one') - decoder.mockClear() + interpolate.mockClear() expect(build().maskedLocation?.pathname).toBe('/pretty/@one') - expect(decoder).not.toHaveBeenCalled() + expect(interpolate).not.toHaveBeenCalled() const templates = Array.from( { length: 64 }, @@ -307,9 +437,9 @@ test('retains a bounded fallback for unregistered mask templates', () => { ).toHaveLength(32) const evicted = templates.find((path) => !cache.get(path))! expect(evicted).toBeDefined() - decoder.mockClear() + interpolate.mockClear() expect( router.buildLocation({ to: evicted, params: { id: '@one' } }).pathname, ).toBe(evicted.replace('$id', '@one')) - expect(decoder).toHaveBeenCalledOnce() + expect(interpolate).toHaveBeenCalledOnce() }) diff --git a/packages/router-core/tests/route-tree-construction.bench.ts b/packages/router-core/tests/route-tree-construction.bench.ts new file mode 100644 index 0000000000..56324db9aa --- /dev/null +++ b/packages/router-core/tests/route-tree-construction.bench.ts @@ -0,0 +1,100 @@ +import { bench, describe, expect } from 'vitest' +import { BaseRootRoute, BaseRoute } from '../src' +import { findRouteMatch, processRouteTree } from '../src/new-process-route-tree' +import type { AnyRoute } from '../src' + +type Shape = 'static' | 'dynamic' | 'nested' | 'mixed' + +function createTree(count: number, shape: Shape) { + const root = new BaseRootRoute({}) + const child = (parent: AnyRoute, path: string) => + new BaseRoute({ getParentRoute: () => parent, path }) + if (shape === 'nested') { + return root.addChildren( + Array.from({ length: count / 10 }, (_, group) => { + const parent = child(root, `/orgs/group-${group}/$org`) + return parent.addChildren( + Array.from({ length: 9 }, (_, index) => + child(parent, `/items/section-${index}/$id`), + ), + ) + }), + ) + } + return root.addChildren( + Array.from({ length: count }, (_, index) => { + const path = + shape === 'static' + ? `/static-${index}/about` + : shape === 'dynamic' + ? `/section-${index}/$id` + : [ + `/mixed-${index}/$org/items/$id`, + `/mixed-${index}/{-$lang}/$id`, + `/mixed-${index}/pre{$id}suffix/{-$lang}`, + `/mixed-${index}/files/prefix{$}.txt`, + ][index % 4]! + return child(root, path) + }), + ) +} + +// Keep first-use interpolation and object allocation out of the processing-only case. +if (process.env.TSR_LINK_PERF === '1') { + for (const count of [100, 1000, 10000]) { + describe.each(['static', 'dynamic', 'nested', 'mixed'])( + `route-tree construction (${count} routes, %s)`, + (shape) => { + let tree = createTree(count, shape) + let result = processRouteTree(tree) + const expectedPath = + shape === 'static' + ? '/static-0/about' + : shape === 'dynamic' + ? '/section-0/one' + : shape === 'nested' + ? '/orgs/group-0/one/items/section-0/two' + : '/mixed-0/one/items/two' + const verify = () => { + expect(Object.keys(result.routesById)).toHaveLength(count + 1) + expect( + findRouteMatch(expectedPath, result.processedTree), + ).not.toBeNull() + } + verify() + + bench( + 'processRouteTree + route.init on fresh objects', + () => { + result = processRouteTree(tree) + }, + { + setup: (task) => { + // Vitest forwards Bench options, not per-iteration Task options. + task.opts.beforeEach = () => { + tree = createTree(count, shape) + } + }, + teardown: verify, + time: 1500, + warmupTime: 500, + throws: true, + }, + ) + + bench( + 'route objects + processRouteTree + route.init', + () => { + result = processRouteTree(createTree(count, shape)) + }, + { + teardown: verify, + time: 1500, + warmupTime: 500, + throws: true, + }, + ) + }, + ) + } +} diff --git a/packages/router-core/tests/routerTestUtils.ts b/packages/router-core/tests/routerTestUtils.ts index 8e1b6ee533..015736b13c 100644 --- a/packages/router-core/tests/routerTestUtils.ts +++ b/packages/router-core/tests/routerTestUtils.ts @@ -8,13 +8,22 @@ import { createNonReactiveReadonlyStore, } from '../src' import { createRequestHandler } from '../src/ssr/createRequestHandler' -import type { interpolatePath } from '../src/path' +import { cleanPath, hasMissingPathParams, interpolatePath } from '../src/path' +import { + SEGMENT_TYPE_PATHNAME, + SEGMENT_TYPE_WILDCARD, + parseSegment, + parseSegments, + processRouteTree, +} from '../src/new-process-route-tree' +import type { SegmentKind } from '../src/new-process-route-tree' import type { RouterHistory } from '@tanstack/history' import type { AnyRouter, AnyRoute, GetStoreConfig, RouterConstructorOptions, + RouterOptions, TrailingSlashOption, } from '../src' @@ -52,27 +61,126 @@ export function createTestRouter< return new RouterCore(options, getStoreConfig) } +type RouteTreeInput = Parameters[0] +type FixtureNode = { + init?: RouteTreeInput['init'] + children?: ReadonlyArray +} + +const fixtureInit = () => {} + +function prepareFixture( + route: T, +): asserts route is T & Pick { + if (!route.init) { + // Raw matcher fixtures already specify their derived paths and IDs. + Object.defineProperty(route, 'init', { value: fixtureInit }) + } + for (const child of route.children ?? []) { + prepareFixture(child) + } +} + +export function processTestRouteTree< + TRoute extends Omit, +>(routeTree: TRoute, caseSensitive = false) { + prepareFixture(routeTree) + return processRouteTree(routeTree, caseSensitive) +} + export type PathInterpolationTestOptions = { - path?: string + path: string params: Record - decoder?: Parameters[2] + decoder?: Parameters[3] server?: boolean } -export function createTestPathInterpolator() { +export function createTestPathInterpolator( + options: Pick< + RouterOptions, + 'isServer' | 'pathParamsAllowedCharacters' + > = {}, +) { const router = createTestRouter({ routeTree: new BaseRootRoute({}), history: createMemoryHistory({ initialEntries: ['/'] }), scrollRestoration: false, + ...options, }) router.history.destroy() - return (options: PathInterpolationTestOptions): string => { - router.isServer = options.server ?? false - router.pathParamsDecoder = options.decoder - return router['interpolatePath'](options.path || '/', options.params) + return ( + options: Pick, + ): string => { + return router['interpolatePath'](options.path, options.params) } } +export function interpolateTestPath( + path: string, + params: Record, + decoder?: (encoded: string) => string, + usedParams?: Record, + keys?: Array, + metadata?: { isMissingParams: boolean }, +) { + const segments = parseSegments(false, { fullPath: cleanPath(path) }, 0) + if (keys) { + for (const segment of segments) { + if (typeof segment !== 'string') { + keys.push(segment[1 /* key */]) + } + } + } + const pathname = interpolatePath(path, segments, params, decoder, usedParams) + if (metadata && hasMissingPathParams(segments, params)) { + metadata.isMissingParams = true + } + return pathname +} + +export function parseTestPathname(to: string | undefined) { + const path = to ?? '' + const segments: Array<{ + type: SegmentKind + value: string + prefixSegment?: string + suffixSegment?: string + }> = [] + let cursor = 0 + while (cursor < path.length) { + const start = cursor + const next = path.indexOf('/', start) + const end = next === -1 ? path.length : next + const data = parseSegment(path, start, end) + cursor = end + 1 + if (typeof data === 'string') { + segments.push({ type: SEGMENT_TYPE_PATHNAME, value: data }) + } else { + const [type, key, prefix, suffix] = data + const splat = type === SEGMENT_TYPE_WILDCARD + if (splat) { + cursor = path.length + 1 + } + const segment: (typeof segments)[number] = { + type, + value: splat + ? suffix === undefined + ? path.substring(start) + : '$' + : key, + } + if (prefix) { + segment.prefixSegment = prefix + } + if (suffix) { + segment.suffixSegment = suffix + } + segments.push(segment) + } + } + return segments +} + /** Materialize the request-local server result as the HTTP response users see. */ export function loadServerResponse( router: AnyRouter, diff --git a/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx b/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx index 17f5776330..7efcaffca2 100644 --- a/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx +++ b/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx @@ -1,6 +1,8 @@ import { clsx as cx } from 'clsx' import { + getRouteSegments, hasKeys, + hasMissingPathParams, interpolatePath, rootRouteId, trimPath, @@ -179,18 +181,19 @@ function RouteComp({ // flatten all params in the router state, into a single object const allParams = Object.assign({}, ...matches().map((m) => m.params)) - const metadata = { isMissingParams: false } - const pathname = interpolatePath( - route.fullPath, - allParams, - router().pathParamsDecoder, - undefined, - undefined, - undefined, - metadata, - ) + const segments = getRouteSegments(route) + const pathname = segments + ? interpolatePath( + route.fullPath, + segments, + allParams, + router().pathParamsDecoder, + ) + : route.fullPath - return metadata.isMissingParams ? undefined : pathname + return segments && hasMissingPathParams(segments, allParams) + ? undefined + : pathname }) return ( diff --git a/packages/solid-router/src/RouterProvider.tsx b/packages/solid-router/src/RouterProvider.tsx index 2bb68cba43..1aa37358b7 100644 --- a/packages/solid-router/src/RouterProvider.tsx +++ b/packages/solid-router/src/RouterProvider.tsx @@ -61,7 +61,7 @@ export type RouterProps< TRouter['history'], TDehydrated >, - 'context' + 'context' | 'pathParamsAllowedCharacters' > & { router: TRouter context?: Partial< diff --git a/packages/solid-router/tests/link.bench.tsx b/packages/solid-router/tests/link.bench.tsx index 6c83fa0a91..4f13f3cebb 100644 --- a/packages/solid-router/tests/link.bench.tsx +++ b/packages/solid-router/tests/link.bench.tsx @@ -1,5 +1,6 @@ import { render } from '@solidjs/testing-library' import { bench, describe } from 'vitest' +import { getRouteSegments } from '@tanstack/router-core' import { Link, RouterProvider, @@ -42,7 +43,12 @@ const InterpolatePathLink = ({ to: string params: Record }>) => { - const href = interpolatePath(to, params) + const router = useRouter() + const href = interpolatePath( + to, + getRouteSegments(router.routesByPath[to])!, + params, + ) return {children} } diff --git a/packages/vue-router/src/RouterProvider.tsx b/packages/vue-router/src/RouterProvider.tsx index 32222237e5..769a19a4f2 100644 --- a/packages/vue-router/src/RouterProvider.tsx +++ b/packages/vue-router/src/RouterProvider.tsx @@ -105,7 +105,7 @@ export type RouterProps< TRouter['history'], TDehydrated >, - 'context' + 'context' | 'pathParamsAllowedCharacters' > & { router: TRouter context?: Partial< diff --git a/packages/vue-router/tests/link.bench.tsx b/packages/vue-router/tests/link.bench.tsx index 6448c89368..bf0c8ac56d 100644 --- a/packages/vue-router/tests/link.bench.tsx +++ b/packages/vue-router/tests/link.bench.tsx @@ -2,6 +2,7 @@ import { render } from '@testing-library/vue' import { bench, describe } from 'vitest' +import { getRouteSegments } from '@tanstack/router-core' import * as Vue from 'vue' import { Link, @@ -37,7 +38,12 @@ const createRouterRenderer = (routesCount: number) => (children: Vue.VNode) => { const InterpolatePathLink = Vue.defineComponent({ props: ['to', 'params'], setup(props, { slots }) { - const href = interpolatePath(props.to, props.params) + const router = useRouter() + const href = interpolatePath( + props.to, + getRouteSegments(router.routesByPath[props.to])!, + props.params, + ) return () => Vue.h('a', { href }, slots.default?.()) }, From e9396c928945d1dd6fd3f3bd8052143794f688b5 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:05 +0200 Subject: [PATCH 016/175] perf(router): reuse location-independent Link destinations (#8370) * perf(router-core): reuse location-independent Link destinations Most mounted Links point at a destination that does not depend on where the user currently is: an absolute `to`, literal params for every template key, a literal (or no) search, hash and state. Until now every navigation rebuilt all of them anyway, because `buildLocation` always started from the current location. `buildLocation` now tracks whether a build read the current location at all. Every such read goes through `current()` / `currentMatch()`, which set one flag; a build that finishes without it depends only on its options and the route tree. When the caller passed `_fromLocation` (what Links do) and no mask is involved, the resulting location is kept in a WeakMap keyed by the options object, and the next `buildLocation` with that same object returns it directly. `update()` and `setRoutes()` replace the map, so router option changes and HMR route-tree rebuilds invalidate everything. To make that flag meaningful the reads became demand-driven instead of unconditional: an absolute `to` resolves without a base path, params that cover the template skip the inherited-params merge, a literal search/hash/ state never touches the current values, and stringifiers fetch inherited params only when a route defines one. Structural sharing with the current search/state stays, as it only affects identity. Contract: the same options object yields the same location until router options or the route tree change. Callers own invalidation by passing a new object when their values change (the follow-up react-router commit does that with deepEqual-stabilized copies of `params`/`search`). Once whole locations are reused, the per-route SIEVE pathname cache (`_pathCache`, `InterpolationPlan`, `createPathInterpolator` and its router plumbing) is redundant and is removed; templates are interpolated directly from the route's parsed segments. Tests: path, route-tree-caches, path-decoder and the interpolation bench assert canonical pathnames through `buildLocation` instead of cache internals. Performance (Apple M4, Node 24, fresh production bundles, 3 runs each; measured on a tree that also carried the replaceEqualDeep changes now proposed separately in #8362, #8363 and #8364): - Measured alone, with the React Link still spreading a fresh options object per navigation so nothing hits the cache: links/react 341.3 -> 290 hz (-15%); paired link-perf client vs stack HEAD: encoding +30%, splats +24% slower (HEAD's pathname cache targeted exactly those), the other cases within noise. This commit is the first half of a two-part change and regresses on its own. - With the follow-up react-router commit (stable options object, so 160 of 161 builds per navigation become 13 ns cache hits; a full build costs 680-970 ns): links/react 622 hz (+82% vs stack HEAD, rme +-0.4%). Paired link-perf client vs origin/main: shared-params -34%, unique-params -36%, splats -41%, encoding -54%, active -44%, middleware -14%, relative -9%. SSR vs origin/main: -12..-32% on every measured case (encoding -23%, splats -18%); vs stack HEAD only SSR encoding is slower (+31%). - Bundle (react-router.minimal gzip, this tree): 85925 -> 85992 (+67) for this commit, 1 byte below origin/main (85993); 86038 with the Link commit. With #8362, #8363 and #8364 applied as well the tree measures 85983. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(react-router): keep one options object per Link so locations are reused `buildLocation` now returns a cached location for an options object whose previous build never read the current location (06e4504605). The React Link built a fresh `{ _fromLocation, ..._options }` on every navigation, so it never hit that cache. Each Link now owns one `dest` object, memoized on `_options`. The location selector sets `dest._fromLocation` in place (unless the caller supplied one) and passes the same object to `router.buildLocation`, so a Link whose destination does not depend on the current location costs a WeakMap lookup per navigation instead of a full build. `navigate` and `preloadRoute` still receive `_options`, so the in-place field never reaches a navigation. Because object identity is now the router's invalidation signal, `useValueStable` keeps a shallow copy of `params`/`search`/`activeOptions` rather than the caller's object. `deepEqual` therefore never short-circuits on reference equality, and a params object that was mutated in place, or is backed by accessors, yields a new reference (hence a new `dest`) on the render that observes the change. A mutation that no render observes is no longer picked up by a navigation alone; that matches how every other Link input already behaves. The server branch had its own inline copy of the active-state, class and style derivation while the client used `resolveIsActive`. Both now share `resolveIsActive` and a `resolveStateProps` helper; the results are identical (`exactPathTest` is the same trailing-slash comparison, `deepEqual` already treats two key-less search objects as equal, and the hash check yields `false` on the server because it is never hydrated there). The two `blockedLink` spreads that position state props before or after `ref`/handlers are documented in place. Tests (`link-destination.test.tsx`): the middleware test follows the HMR sequence (`route.update()` then `router.setRoutes(router.buildRouteTree())`) instead of expecting a bare `route.update()` to be observed; the test for an impure `stringifySearch` closing over a mutable variable is dropped along with that contract; the mutation and accessor tests re-render the fixture and assert the updated location survives further navigations. Performance (Apple M4, Node 24, fresh production bundles, 3 runs each; measured on a tree that also carried the replaceEqualDeep changes now proposed separately in #8362, #8363 and #8364): - links/react (200 mounted Links, 8 navigations per lap): 290 -> 622 hz against the parent commit, +82% against stack HEAD (341 hz). 160 of the 161 `buildLocation` calls per navigation become 13 ns cache hits; a full build of these Links costs 680-970 ns. - Paired link-perf client vs the parent commit: shared-params -24%, splats -35%, encoding -49%, active -36%, unique-params -25% (wide interval), middleware unchanged (never cacheable). - Combined with the parent, vs origin/main: client shared-params -34%, unique-params -36%, splats -41%, encoding -54%, active -44%, middleware -14%, relative -9%; SSR -12..-32% on every measured case. - Bundle (react-router.minimal gzip, this tree): 85992 -> 86038 (+46); +113 vs stack HEAD, +45 vs origin/main (85993). With #8362, #8363 and #8364 applied as well the tree measures 85983, 10 bytes below origin/main. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * refactor: stop exporting isPlainObject and isPlainArray Nothing in the repository imports these two helpers from a package entry point; they are only called inside `utils.ts` by `deepEqual` and `replaceEqualDeep`, and `isPlainArray` is unit-tested via `../src/utils`. #8363 tightens `isPlainObject` to a constructor check that is meant for the router's own structural sharing, so the helpers are no longer exported from `@tanstack/router-core`, `@tanstack/react-router`, `@tanstack/solid-router` or `@tanstack/vue-router`. No bundle change in react-router.minimal (unused exports were already tree-shaken): 85983 before and after. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * chore: add changesets for Link location reuse and the removed helpers --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/plain-helpers-hide.md | 8 + .changeset/still-links-rest.md | 6 + packages/react-router/src/index.tsx | 2 - packages/react-router/src/link.tsx | 230 ++++--------- .../tests/link-destination.test.tsx | 71 ++-- packages/router-core/src/index.ts | 2 - packages/router-core/src/path.ts | 6 - packages/router-core/src/route.ts | 6 +- packages/router-core/src/router.ts | 320 ++++++++++-------- .../router-core/tests/path-decoder.test.ts | 10 +- .../tests/path-interpolation.bench.ts | 34 +- packages/router-core/tests/path.test.ts | 65 +--- .../tests/route-tree-caches.test.ts | 158 +-------- packages/router-core/tests/routerTestUtils.ts | 4 +- packages/solid-router/src/index.tsx | 2 - packages/vue-router/src/index.tsx | 2 - 16 files changed, 320 insertions(+), 606 deletions(-) create mode 100644 .changeset/plain-helpers-hide.md create mode 100644 .changeset/still-links-rest.md diff --git a/.changeset/plain-helpers-hide.md b/.changeset/plain-helpers-hide.md new file mode 100644 index 0000000000..78b25ed483 --- /dev/null +++ b/.changeset/plain-helpers-hide.md @@ -0,0 +1,8 @@ +--- +'@tanstack/router-core': patch +'@tanstack/react-router': patch +'@tanstack/solid-router': patch +'@tanstack/vue-router': patch +--- + +Stop exporting the internal `isPlainObject` and `isPlainArray` helpers. diff --git a/.changeset/still-links-rest.md b/.changeset/still-links-rest.md new file mode 100644 index 0000000000..770daa9ba9 --- /dev/null +++ b/.changeset/still-links-rest.md @@ -0,0 +1,6 @@ +--- +'@tanstack/router-core': patch +'@tanstack/react-router': patch +--- + +Reuse built locations for Links whose destination does not depend on the current location. `buildLocation` keeps the result per options object when the build never read the current location, and the React `Link` passes one stable options object per instance, so navigations resolve unchanged Links with a lookup instead of a full build. The per-route pathname interpolation cache this replaces is removed. Link `params`, `search` and `activeOptions` are compared by value on render; an object mutated in place is picked up on the next render rather than by a navigation alone. diff --git a/packages/react-router/src/index.tsx b/packages/react-router/src/index.tsx index 6637c7542b..387afa25bc 100644 --- a/packages/react-router/src/index.tsx +++ b/packages/react-router/src/index.tsx @@ -17,8 +17,6 @@ export { stringifySearchWith, functionalUpdate, replaceEqualDeep, - isPlainObject, - isPlainArray, deepEqual, createControlledPromise, retainSearchParams, diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 7a76081742..2d63f385b2 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -4,10 +4,8 @@ import * as React from 'react' import { useSelector } from '@tanstack/react-store' import { deepEqual, - exactPathTest, functionalUpdate, getUrlScheme, - hasKeys, isDangerousProtocol, preloadWarning, removeTrailingSlash, @@ -42,16 +40,20 @@ type LinkState = [href: string | undefined, isActive?: boolean] // otherwise change `_options` identity on every parent render, rebuild the // store selector, and discard its memoized selection. // +// The kept value is a shallow copy, never the caller's object: the router +// reuses a built location for as long as it sees the same options object, so +// a params object mutated in place, or one backed by accessors, has to yield +// a new reference here on the render that observes the change. +// // `ignoreUndefined: false` is required: an explicit `undefined` clears an // inherited param or search key, so `{}` and `{ category: undefined }` build // different locations and must not be treated as equal here. function useValueStable(value: T): T { - const ref = React.useRef(value) - // `deepEqual` short-circuits on reference equality, so this covers both cases. + const ref = React.useRef(undefined) if (!deepEqual(ref.current, value, { ignoreUndefined: false })) { - ref.current = value + ref.current = value && typeof value === 'object' ? { ...value } : value } - return ref.current + return ref.current as T } function compareLinkState(a: LinkState, b: LinkState) { @@ -203,10 +205,6 @@ export function useLinkProps< ? router.buildLocation(options as any) : undefined - // Use publicHref - it contains the correct href for display - // When a rewrite changes the origin, publicHref is the full URL - // Otherwise it's the origin-stripped path - // This avoids constructing URL objects in the hot path const hrefOption = next ? getHrefOption(next, router, disabled) : (directExternalLink ?? undefined) @@ -216,76 +214,6 @@ export function useLinkProps< directExternalLink ?? (hrefOption && getUrlScheme(hrefOption) ? hrefOption : undefined) - const isActive = (() => { - if (!next || (!disabled && !hrefOption) || externalLink) { - return false - } - - const currentLocation = router.stores.location.get() - - const exact = activeOptions?.exact ?? false - - if (exact) { - const testExact = exactPathTest( - currentLocation.pathname, - next.pathname, - router.basepath, - ) - if (!testExact) { - return false - } - } else { - const currentPathSplit = removeTrailingSlash( - currentLocation.pathname, - router.basepath, - ) - const nextPathSplit = removeTrailingSlash( - next.pathname, - router.basepath, - ) - - const pathIsFuzzyEqual = - currentPathSplit.startsWith(nextPathSplit) && - (currentPathSplit.length === nextPathSplit.length || - currentPathSplit[nextPathSplit.length] === '/') - - if (!pathIsFuzzyEqual) { - return false - } - } - - const includeSearch = activeOptions?.includeSearch ?? true - if (includeSearch) { - if (currentLocation.search !== next.search) { - const currentSearchEmpty = - !currentLocation.search || - (typeof currentLocation.search === 'object' && - !hasKeys(currentLocation.search)) - const nextSearchEmpty = - !next.search || - (typeof next.search === 'object' && - !hasKeys(next.search as Record)) - - if (!(currentSearchEmpty && nextSearchEmpty)) { - const searchTest = deepEqual(currentLocation.search, next.search, { - partial: !exact, - ignoreUndefined: !activeOptions?.explicitUndefined, - }) - if (!searchTest) { - return false - } - } - } - } - - // Hash is not available on the server - if (activeOptions?.includeHash) { - return false - } - - return true - })() - if (externalLink) { return { ...propsSafeToSpread, @@ -299,79 +227,27 @@ export function useLinkProps< } } - const resolvedActiveProps: React.HTMLAttributes = - isActive - ? (functionalUpdate(activeProps as any, {}) ?? STATIC_ACTIVE_OBJECT) - : STATIC_EMPTY_OBJECT - - const resolvedInactiveProps: React.HTMLAttributes = - isActive - ? STATIC_EMPTY_OBJECT - : (functionalUpdate(inactiveProps, {}) ?? STATIC_EMPTY_OBJECT) - - const resolvedStyle = (() => { - const baseStyle = style - const activeStyle = resolvedActiveProps.style - const inactiveStyle = resolvedInactiveProps.style - - if (!baseStyle && !activeStyle && !inactiveStyle) { - return undefined - } - - if (baseStyle && !activeStyle && !inactiveStyle) { - return baseStyle - } - - if (!baseStyle && activeStyle && !inactiveStyle) { - return activeStyle - } - - if (!baseStyle && !activeStyle && inactiveStyle) { - return inactiveStyle - } - - return { - ...baseStyle, - ...activeStyle, - ...inactiveStyle, - } - })() - - const resolvedClassName = (() => { - const baseClassName = className - const activeClassName = resolvedActiveProps.className - const inactiveClassName = resolvedInactiveProps.className - - if (!baseClassName && !activeClassName && !inactiveClassName) { - return '' - } - - let out = '' - - if (baseClassName) { - out = baseClassName - } - - if (activeClassName) { - out = out ? `${out} ${activeClassName}` : activeClassName - } - - if (inactiveClassName) { - out = out ? `${out} ${inactiveClassName}` : inactiveClassName - } - - return out - })() - const blockedLink = !disabled && !hrefOption + // Hash is not available on the server, so it never counts as hydrated. + const isActive = + !!next && + !blockedLink && + resolveIsActive( + router.stores.location.get(), + next, + activeOptions, + router.basepath, + false, + ) + const [resolvedStateProps, resolvedClassName, resolvedStyle] = + resolveStateProps(isActive, activeProps, inactiveProps, className, style) return { ...propsSafeToSpread, - ...(blockedLink ? resolvedActiveProps : STATIC_EMPTY_OBJECT), - ...(blockedLink ? resolvedInactiveProps : STATIC_EMPTY_OBJECT), + // State props may override `ref`, but not on a blocked link (spread first). + ...(blockedLink ? resolvedStateProps : STATIC_EMPTY_OBJECT), ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], - ...(!blockedLink ? resolvedActiveProps : STATIC_EMPTY_OBJECT), - ...(!blockedLink ? resolvedInactiveProps : STATIC_EMPTY_OBJECT), + ...(!blockedLink ? resolvedStateProps : STATIC_EMPTY_OBJECT), href: hrefOption, disabled: !!linkDisabled, target, @@ -421,6 +297,9 @@ export function useLinkProps< options.unsafeRelative, ], ) + // One stable object per link lets the router reuse location-independent results. + // eslint-disable-next-line react-hooks/rules-of-hooks + const dest = React.useMemo(() => ({ ..._options }) as any, [_options]) // Derive inside the selector so `compareLinkState` can bail out. Deriving after // the subscription instead re-renders every link on every navigation, because @@ -436,10 +315,10 @@ export function useLinkProps< return [directExternalLink ?? undefined] } - const next = router.buildLocation({ - _fromLocation: location, - ..._options, - } as any) + if (!_options._fromLocation) { + dest._fromLocation = location + } + const next = router.buildLocation(dest) // Use publicHref - it contains the correct href for display // When a rewrite changes the origin, publicHref is the full URL @@ -459,7 +338,7 @@ export function useLinkProps< ), ] }, - [stableActiveOptions, disabled, isHydrated, _options, router, to], + [stableActiveOptions, disabled, isHydrated, _options, dest, router, to], ) // eslint-disable-next-line react-hooks/rules-of-hooks @@ -566,20 +445,8 @@ export function useLinkProps< const blockedLink = isActive === undefined - // Only one state contributes props, so resolve and merge it once. - const resolvedStateProps: React.HTMLAttributes = - functionalUpdate(isActive ? (activeProps as any) : inactiveProps, {}) ?? - (isActive ? STATIC_ACTIVE_OBJECT : STATIC_EMPTY_OBJECT) - - const stateClassName = resolvedStateProps.className - const resolvedClassName = className - ? stateClassName - ? `${className} ${stateClassName}` - : className - : stateClassName - const stateStyle = resolvedStateProps.style - const resolvedStyle = - style && stateStyle ? { ...style, ...stateStyle } : style || stateStyle + const [resolvedStateProps, resolvedClassName, resolvedStyle] = + resolveStateProps(isActive, activeProps, inactiveProps, className, style) // The click handler const handleClick = (e: React.MouseEvent) => { @@ -625,6 +492,7 @@ export function useLinkProps< return { ...propsSafeToSpread, + // State props may override `ref` and handlers, but not on a blocked link (spread first). ...(blockedLink ? resolvedStateProps : STATIC_EMPTY_OBJECT), ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], onClick: composeHandlers(onClick, handleClick), @@ -649,6 +517,34 @@ const STATIC_ACTIVE_OBJECT = { className: 'active' } const STATIC_DISABLED_PROPS = { role: 'link', 'aria-disabled': true } const STATIC_ACTIVE_PROPS = { 'data-status': 'active', 'aria-current': 'page' } +// Only one state contributes props; merge its class and style with the base ones. +function resolveStateProps( + isActive: boolean | undefined, + activeProps: unknown, + inactiveProps: unknown, + className: string | undefined, + style: React.CSSProperties | undefined, +): [ + stateProps: React.HTMLAttributes, + className: string | undefined, + style: React.CSSProperties | undefined, +] { + const stateProps: React.HTMLAttributes = + functionalUpdate((isActive ? activeProps : inactiveProps) as any, {}) ?? + (isActive ? STATIC_ACTIVE_OBJECT : STATIC_EMPTY_OBJECT) + const stateClassName = stateProps.className + const stateStyle = stateProps.style + return [ + stateProps, + className + ? stateClassName + ? `${className} ${stateClassName}` + : className + : stateClassName, + style && stateStyle ? { ...style, ...stateStyle } : style || stateStyle, + ] +} + const timeoutMap = new WeakMap>() const cancelPreload = (eventTarget: object) => { clearTimeout(timeoutMap.get(eventTarget)) diff --git a/packages/react-router/tests/link-destination.test.tsx b/packages/react-router/tests/link-destination.test.tsx index b81d02a706..6447e5aa06 100644 --- a/packages/react-router/tests/link-destination.test.tsx +++ b/packages/react-router/tests/link-destination.test.tsx @@ -9,7 +9,6 @@ import { createRootRoute, createRoute, createRouter, - defaultStringifySearch, retainSearchParams, } from '../src' @@ -25,21 +24,25 @@ describe('Link destination updates', () => { stringify?: (params: Record) => { id: string }, ) { const rootRoute = createRootRoute({ - component: () => ( - <> - - Target - - - - ), + component: function Root() { + const [, rerender] = React.useState(0) + return ( + <> + + + Target + + + + ) + }, }) const itemsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -131,16 +134,18 @@ describe('Link destination updates', () => { expect(stringify).toHaveBeenCalled() }) - test('updates when ancestor search middleware is added and removed', async () => { + test('updates when the route tree is rebuilt after route options change', async () => { const { router, rootRoute } = setupFixedLink() render() const link = await screen.findByTestId('fixed-link') expect(link).toHaveAttribute('href', '/target/fixed#details') + // HMR updates the live route in place, then rebuilds the route tree. rootRoute.update({ search: { middlewares: [retainSearchParams(true)] }, }) + router.setRoutes(router.buildRouteTree()) await act(() => router.navigate({ to: '/items/$source', @@ -151,6 +156,7 @@ describe('Link destination updates', () => { expect(link).toHaveAttribute('href', '/target/fixed?retained=value#details') rootRoute.update({ search: undefined }) + router.setRoutes(router.buildRouteTree()) await act(() => router.navigate({ to: '/items/$source', @@ -161,26 +167,7 @@ describe('Link destination updates', () => { expect(link).toHaveAttribute('href', '/target/fixed#details') }) - test('continues evaluating a custom search serializer', async () => { - const { router } = setupFixedLink() - let language = 'en' - router.update({ - stringifySearch: (search) => - defaultStringifySearch({ ...search, language }), - }) - render() - - const link = await screen.findByTestId('fixed-link') - expect(link).toHaveAttribute('href', '/target/fixed?language=en#details') - - language = 'fr' - await act(() => - router.navigate({ to: '/items/$source', params: { source: 'two' } }), - ) - expect(link).toHaveAttribute('href', '/target/fixed?language=fr#details') - }) - - test('reads accessor-backed params after navigation', async () => { + test('reads accessor-backed params on the next render', async () => { let id = 'one' const { router } = setupFixedLink({ get id() { @@ -193,13 +180,11 @@ describe('Link destination updates', () => { expect(link).toHaveAttribute('href', '/target/one#details') id = 'two' - await act(() => - router.navigate({ to: '/items/$source', params: { source: 'two' } }), - ) + fireEvent.click(screen.getByRole('button', { name: 'Rerender' })) expect(link).toHaveAttribute('href', '/target/two#details') }) - test('updates when an existing params object changes', async () => { + test('updates when an existing params object changes before a render', async () => { const params = { id: 'one' } const { router } = setupFixedLink(params) render() @@ -208,6 +193,10 @@ describe('Link destination updates', () => { expect(link).toHaveAttribute('href', '/target/one#details') params.id = 'two' + fireEvent.click(screen.getByRole('button', { name: 'Rerender' })) + expect(link).toHaveAttribute('href', '/target/two#details') + + // The same object keeps its location across navigations until it changes again. await act(() => router.navigate({ to: '/items/$source', params: { source: 'two' } }), ) diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 4e37b8ed71..28d450ad24 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -314,8 +314,6 @@ export { functionalUpdate, hasKeys, replaceEqualDeep, - isPlainObject, - isPlainArray, deepEqual, createControlledPromise, isModuleNotFoundError, diff --git a/packages/router-core/src/path.ts b/packages/router-core/src/path.ts index 0b2f8d8a60..74247cd0f2 100644 --- a/packages/router-core/src/path.ts +++ b/packages/router-core/src/path.ts @@ -208,12 +208,6 @@ export function compileDecodeCharMap( encoded.replace(regex, (match) => charMap.get(match) ?? match) } -export type InterpolationPlan = [ - paths: SieveCache, - path: string, - segments: RouteInterpolation, -] - export type InterpolationSegment = string | DynamicPathSegment export type RouteInterpolation = Array & { diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts index 36bedc9a89..089369b454 100644 --- a/packages/router-core/src/route.ts +++ b/packages/router-core/src/route.ts @@ -4,7 +4,7 @@ import { notFound } from './not-found' import { redirect } from './redirect' import { rootRouteId } from './root' import type { LazyRoute } from './fileRoute' -import type { InterpolationPlan, RouteInterpolation } from './path' +import type { RouteInterpolation } from './path' import type { NotFoundError } from './not-found' import type { RedirectFnRoute } from './redirect' import type { NavigateOptions, ParsePathParams } from './link' @@ -730,8 +730,6 @@ export interface Route< /** @internal */ _branch?: ReadonlyArray /** @internal */ - _pathCache?: InterpolationPlan - /** @internal */ _interpolation?: RouteInterpolation rank: number to: TrimPathRight @@ -1723,8 +1721,6 @@ export class BaseRoute< /** @internal */ _branch?: ReadonlyArray /** @internal */ - _pathCache?: InterpolationPlan - /** @internal */ _interpolation?: RouteInterpolation constructor( options?: RouteOptions< diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index ccd0898c46..f11f3f17a1 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -14,6 +14,7 @@ import { functionalUpdate, getUrlScheme, hasKeys, + hasOwn, isDangerousProtocol, last, nullReplaceEqualDeep, @@ -25,7 +26,6 @@ import { findFlatMatch, findRouteMatch, findSingleMatch, - getParamNames, parseSegments, processRouteMasks, processRouteTree, @@ -58,7 +58,7 @@ import { } from './rewrite' import { createRouterStores } from './stores' import type { SieveCache } from './sieve-cache' -import type { InterpolationPlan } from './path' +import type { RouteInterpolation } from './path' import type { ProcessRouteTreeResult, ProcessedTree, @@ -1027,7 +1027,6 @@ type LightweightRouteMatchCacheEntry = [ type RouteTreeCaches = ProcessRouteTreeResult & { resolvePathCache: SieveCache - unmatchedPathCache: SieveCache } export type CreateRouterFn = < @@ -1169,11 +1168,13 @@ export class RouterCore< routesByPath!: RoutesByPath processedTree!: ProcessedTree resolvePathCache!: SieveCache - private unmatchedPathCache!: SieveCache private lightweightCache!: WeakMap< ParsedLocation, LightweightRouteMatchCacheEntry > + // Locations built without reading the current location, keyed by the stable + // options object a Link owns. Links pass a new object when their values change. + private staticLocations!: WeakMap isServer!: boolean readonly pathParamsDecoder?: (encoded: string) => string protocolAllowlist!: Set @@ -1249,6 +1250,7 @@ export class RouterCore< ...prevOptions, ...newOptions, } + this.staticLocations = new WeakMap() this.isServer = this.options.isServer ?? isServer ?? typeof document === 'undefined' @@ -1382,13 +1384,13 @@ export class RouterCore< return { ...result, resolvePathCache: createSieveCache(1000), - unmatchedPathCache: createSieveCache(32), } } setRoutes(caches: RouteTreeCaches) { Object.assign(this, caches) this.lightweightCache = new WeakMap() + this.staticLocations = new WeakMap() const notFoundRoute = this.options.notFoundRoute @@ -1876,63 +1878,6 @@ export class RouterCore< return result } - private interpolatePath( - path: string, - params: Record, - route?: AnyRoute, - ): string { - let plan = route ? route._pathCache : this.unmatchedPathCache.get(path) - if (!plan || plan[1 /* path */] !== path) { - const segments = - route?._interpolation ?? parseSegments(false, { fullPath: path }, 0) - plan = [createSieveCache(128), path, segments] - if (route) { - route._pathCache = plan - } else { - this.unmatchedPathCache.set(path, plan) - } - } - const paths = plan[0 /* paths */] - const keys = getParamNames(plan[2 /* segments */]) - // Single-param templates use the value itself as the Map key. Compound keys - // concatenate `:` tokens; undefined becomes - // `undefined:undefined`, whose nonnumeric prefix cannot match a string token. - let key: string | undefined = '' - for (const name of keys) { - const value = params[name] - if (typeof value !== 'string' && value !== undefined) { - return normalizeProtocolRelative( - decodePath( - interpolatePath( - path, - plan[2 /* segments */], - params, - this.pathParamsDecoder, - ), - ), - ) - } - key = keys.length === 1 ? value : key! + value?.length + ':' + value - } - const cached = paths.get(key) - if (cached) { - return cached - } - // Cache canonical pathnames, not the encoded interpolation output. - const interpolated = normalizeProtocolRelative( - decodePath( - interpolatePath( - path, - plan[2 /* segments */], - params, - this.pathParamsDecoder, - ), - ), - ) - paths.set(key, interpolated) - return interpolated - } - /** * Build the next ParsedLocation from navigation options without committing. * Resolves `to`/`from`, params/search/hash/state, applies search validation @@ -1941,6 +1886,15 @@ export class RouterCore< * @link https://tanstack.com/router/latest/docs/framework/react/api/router/RouterType#buildlocation-method */ buildLocation: BuildLocationFn = (opts) => { + const cached = this.staticLocations.get(opts) + if (cached) { + return cached + } + + // Set by `current()` whenever a build reads the current location. A + // location built without it depends only on `opts` and the route tree. + let usedCurrent = false + const build = ( dest: BuildNextOptions & { unmaskOnReload?: boolean @@ -1965,7 +1919,17 @@ export class RouterCore< // Use lightweight matching - only computes what buildLocation needs // (fullPath, search, params) without creating full match objects - const lightweightResult = this.matchRoutesLightweight(currentLocation) + const lightweight = this.matchRoutesLightweight(currentLocation) + + // Value-affecting reads of the current location go through these two. + const current = () => { + usedCurrent = true + return currentLocation + } + const currentMatch = () => { + usedCurrent = true + return lightweight + } // check that from path exists in the current route tree // do this check only on navigations during test or development @@ -1975,16 +1939,14 @@ export class RouterCore< dest._isNavigate ) { const [allFromMatches] = this.getMatchedRoutes(dest.from) + const [matchedRoutes, fullPath] = currentMatch() - const matchedFrom = findLast( - lightweightResult[0 /* matchedRoutes */], - (d) => { - return comparePaths(d.fullPath, dest.from!) - }, - ) + const matchedFrom = findLast(matchedRoutes, (d) => { + return comparePaths(d.fullPath, dest.from!) + }) const matchedCurrent = findLast(allFromMatches, (d) => { - return comparePaths(d.fullPath, lightweightResult[1 /* fullPath */]) + return comparePaths(d.fullPath, fullPath) }) // for from to be invalid it shouldn't just be unmatched to currentLocation @@ -1994,24 +1956,17 @@ export class RouterCore< } } - const defaultedFromPath = - dest.unsafeRelative === 'path' - ? currentLocation.pathname - : (dest.from ?? lightweightResult[1 /* fullPath */]) - - // From search should always use the current location - const fromSearch = lightweightResult[2 /* search */] - // Same with params. It can't hurt to provide as many as possible - const fromParams = lightweightResult[3 /* params */] - + const to = dest.to ? `${dest.to}` : '.' const nextTo = this.resolvePathWithBase( - defaultedFromPath, - dest.to ? `${dest.to}` : '.', + // Absolute destinations resolve without a base. + to[0] === '/' + ? '' + : dest.unsafeRelative === 'path' + ? current().pathname + : (dest.from ?? currentMatch()[1 /* fullPath */]), + to, ) - // Resolve the next params - let nextParams = resolveNextParams(dest.params, fromParams) - const destRoute = this.routesByPath[ trimPathRight(nextTo) as keyof typeof this.routesByPath ] as AnyRoute | undefined @@ -2036,34 +1991,62 @@ export class RouterCore< } } - // If there are any params, we need to stringify them - if (destRoutes.length && hasKeys(nextParams)) { - for (const route of destRoutes) { - const fn = - route.options.params?.stringify ?? route.options.stringifyParams - if (fn) { - if (nextParams === fromParams) { - nextParams = Object.assign(createNull(), nextParams) - } - try { - Object.assign(nextParams, fn(nextParams)) - } catch { - // Ignore errors here. When a paired parseParams is defined, - // extractStrictParams will re-throw during route matching, - // storing the error on the match and allowing the route's - // errorComponent to render. If no parseParams is defined, - // the stringify error is silently dropped. - } + // One parsed template serves both trailing-slash variants. + const interpolation = nextTo.includes('$') + ? (destRoute?._interpolation ?? + parseSegments(false, { fullPath: nextTo }, 0)) + : undefined + + let nextParams: Record | undefined + for (const route of destRoutes) { + const fn = + route.options.params?.stringify ?? route.options.stringifyParams + if (fn) { + // Stringifiers receive the merged params, so they always see inherited ones. + const fromParams = currentMatch()[3 /* params */] + nextParams ??= resolveNextParams(dest.params, fromParams) + if (!hasKeys(nextParams)) { + break + } + if (nextParams === fromParams) { + nextParams = Object.assign( + createNull() as Record, + nextParams, + ) + } + try { + Object.assign(nextParams, fn(nextParams)) + } catch { + // Ignore errors here. When a paired parseParams is defined, + // extractStrictParams will re-throw during route matching, + // storing the error on the match and allowing the route's + // errorComponent to render. If no parseParams is defined, + // the stringify error is silently dropped. } } } + nextParams ??= resolveNextParams( + dest.params, + needsInheritedParams(dest.params, interpolation) + ? currentMatch()[3 /* params */] + : EMPTY_RECORD, + ) const nextPathname = opts.leaveParams ? // Keep path params uninterpolated for matchRoute/template matching. nextTo - : nextTo.includes('$') - ? this.interpolatePath(nextTo, nextParams, destRoute) - : normalizeProtocolRelative(decodePath(nextTo)) + : normalizeProtocolRelative( + decodePath( + interpolation + ? interpolatePath( + nextTo, + interpolation, + nextParams, + this.pathParamsDecoder, + ) + : nextTo, + ), + ) if ( process.env.NODE_ENV !== 'production' && @@ -2084,36 +2067,45 @@ export class RouterCore< } // Resolve the next search - let nextSearch = fromSearch - if (opts._includeValidateSearch && this.options.search?.strict) { - const validatedSearch = {} - destRoutes.forEach((route) => { - if (route.options.validateSearch) { - try { - Object.assign( - validatedSearch, - validateSearch(route.options.validateSearch, { - ...validatedSearch, - ...nextSearch, - }), - ) - } catch { - // ignore errors here because they are already handled in matchRoutes - } - } - }) - nextSearch = validatedSearch - } - - nextSearch = applySearchMiddleware( - nextSearch, - dest, + const middlewares = getSearchMiddlewares( destRoutes, opts._includeValidateSearch, ) + const fromSearch = () => { + let search = currentMatch()[2 /* search */] + if (opts._includeValidateSearch && this.options.search?.strict) { + const validatedSearch = {} + destRoutes.forEach((route) => { + if (route.options.validateSearch) { + try { + Object.assign( + validatedSearch, + validateSearch(route.options.validateSearch, { + ...validatedSearch, + ...search, + }), + ) + } catch { + // ignore errors here because they are already handled in matchRoutes + } + } + }) + search = validatedSearch + } + return search + } + // A literal search never reads the current one. + let nextSearch: Record = middlewares.length + ? applySearchMiddleware(middlewares, fromSearch(), dest) + : dest.search === true + ? fromSearch() + : typeof dest.search === 'function' + ? dest.search(fromSearch()) + : (dest.search as Record) || EMPTY_RECORD - // Replace the equal deep - nextSearch = nullReplaceEqualDeep(fromSearch, nextSearch) + // Structural sharing only affects identity, so it does not make the + // location depend on the current one. + nextSearch = nullReplaceEqualDeep(lightweight[2 /* search */], nextSearch) // Stringify the next search const searchStr = this.options.stringifySearch(nextSearch) @@ -2121,24 +2113,24 @@ export class RouterCore< // Resolve the next hash const hash = dest.hash === true - ? currentLocation.hash - : dest.hash - ? functionalUpdate(dest.hash, currentLocation.hash) - : undefined + ? current().hash + : typeof dest.hash === 'function' + ? dest.hash(current().hash) + : dest.hash || undefined // Resolve the next hash string const hashStr = hash ? `#${hash}` : '' // Resolve the next state - let nextState = - dest.state === true - ? currentLocation.state - : dest.state - ? functionalUpdate(dest.state, currentLocation.state) - : {} - - // Replace the equal deep + let nextState: HistoryState = EMPTY_RECORD if (dest.state) { + nextState = + dest.state === true + ? current().state + : typeof dest.state === 'function' + ? dest.state(current().state) + : dest.state + // Identity-only, as above. nextState = replaceEqualDeep(currentLocation.state, nextState) } @@ -2216,6 +2208,11 @@ export class RouterCore< } } + // Masked locations stay out: `opts.mask` is rebuilt from the current location. + if (!usedCurrent && opts._fromLocation && !next.maskedLocation) { + this.staticLocations.set(opts, next) + } + return next } @@ -2302,8 +2299,11 @@ export class RouterCore< } } - nextHistory.state.__hashScrollIntoViewOptions = - hashScrollIntoView ?? this.options.defaultHashScrollIntoView ?? true + nextHistory.state = { + ...nextHistory.state, + __hashScrollIntoViewOptions: + hashScrollIntoView ?? this.options.defaultHashScrollIntoView ?? true, + } this.shouldViewTransition = viewTransition @@ -2878,6 +2878,30 @@ function resolveNextParams( return Object.assign(next, base, spec) } +// Inherited params are read by param updaters and by template keys the +// destination leaves open. `interpolation` is undefined without template keys. +function needsInheritedParams( + spec: unknown, + interpolation: RouteInterpolation | undefined, +) { + if (typeof spec === 'function') { + return true + } + if (!interpolation || spec === false || spec === null) { + return false + } + return ( + spec === undefined || + spec === true || + interpolation.some( + (part) => + typeof part !== 'string' && !hasOwn.call(spec, part[1 /* key */]), + ) + ) +} + +const EMPTY_RECORD: Record = Object.freeze({}) + // Keep this separate from recursive execution to limit JIT compiler memory. function getSearchMiddlewares( destRoutes: ReadonlyArray, @@ -2943,12 +2967,10 @@ function getSearchMiddlewares( } function applySearchMiddleware( + middlewares: Array>, search: any, dest: BuildNextOptions, - destRoutes: ReadonlyArray, - includeValidateSearch: boolean | undefined, ) { - const middlewares = getSearchMiddlewares(destRoutes, includeValidateSearch) const applyNext = ( index: number, currentSearch: any, diff --git a/packages/router-core/tests/path-decoder.test.ts b/packages/router-core/tests/path-decoder.test.ts index 941626e53d..bf27b93134 100644 --- a/packages/router-core/tests/path-decoder.test.ts +++ b/packages/router-core/tests/path-decoder.test.ts @@ -34,17 +34,15 @@ function setup(allowed?: Array<'@' | '+'>) { router.history.destroy() const build = () => router.buildLocation({ to: '/items/$id', params: { id: '@+' } }).href - return { router, item, build } + return { router, build } } -test('keeps the decoder and cached paths across provider option updates', () => { +test('keeps the decoder across provider option updates', () => { const allowed: Array<'@' | '+'> = ['@'] - const { router, item, build } = setup(allowed) + const { router, build } = setup(allowed) const decoder = router.pathParamsDecoder expect(build()).toBe('/items/@%2B') - const plan = item._pathCache const compile = vi.spyOn(pathUtils, 'compileDecodeCharMap') - const interpolate = vi.spyOn(pathUtils, 'interpolatePath') for (let count = 0; count < 3; count++) { router.update({ ...router.options, @@ -52,10 +50,8 @@ test('keeps the decoder and cached paths across provider option updates', () => }) expect(build()).toBe('/items/@%2B') expect(router.pathParamsDecoder).toBe(decoder) - expect(item._pathCache).toBe(plan) } expect(compile).not.toHaveBeenCalled() - expect(interpolate).not.toHaveBeenCalled() }) test('requires a new router to apply changes to the original character array', () => { diff --git a/packages/router-core/tests/path-interpolation.bench.ts b/packages/router-core/tests/path-interpolation.bench.ts index 9f1891f151..0f6840752d 100644 --- a/packages/router-core/tests/path-interpolation.bench.ts +++ b/packages/router-core/tests/path-interpolation.bench.ts @@ -1,10 +1,14 @@ import { bench, describe, expect } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' +import { + createMemoryHistory, + normalizeProtocolRelative, +} from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { compileDecodeCharMap, interpolatePath } from '../src/path' import { parseSegments } from '../src/new-process-route-tree' import { decodePath } from '../src/utils' import { createTestRouter, interpolateTestPath } from './routerTestUtils' +import type { AnyRoute } from '../src' import type { PathInterpolationTestOptions } from './routerTestUtils' const scenarios: Array<{ @@ -142,6 +146,22 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { scrollRestoration: false, }) router.history.destroy() + // Mirrors how buildLocation turns a template into a canonical pathname. + const canonicalPathname = ( + path: string, + params: Record, + route: AnyRoute | undefined, + ) => + normalizeProtocolRelative( + decodePath( + interpolatePath( + path, + route?._interpolation ?? parseSegments(false, { fullPath: path }, 0), + params, + router.pathParamsDecoder, + ), + ), + ) const calls = inputs .filter((input) => input.path.includes('$')) .map((input) => ({ @@ -172,13 +192,13 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { 0, ) const cachedExpected = calls.reduce((sum, call) => { - expect(router['interpolatePath'](call.path, call.params, call.route)).toBe( + expect(canonicalPathname(call.path, call.params, call.route)).toBe( call.expected, ) return sum + call.expected.length }, 0) for (const call of calls) { - expect(router['interpolatePath'](call.path, call.params, call.route)).toBe( + expect(canonicalPathname(call.path, call.params, call.route)).toBe( call.expected, ) } @@ -191,15 +211,11 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { })) bench( - 'shared interpolation and normalization batch', + 'interpolation and normalization batch', () => { let length = 0 for (const call of calls) { - length += router['interpolatePath']( - call.path, - call.params, - call.route, - ).length + length += canonicalPathname(call.path, call.params, call.route).length } checksum = length }, diff --git a/packages/router-core/tests/path.test.ts b/packages/router-core/tests/path.test.ts index 5fb2b02628..7d6eed9de7 100644 --- a/packages/router-core/tests/path.test.ts +++ b/packages/router-core/tests/path.test.ts @@ -1,5 +1,4 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import * as pathUtils from '../src/path' import { compileDecodeCharMap, exactPathTest, @@ -25,7 +24,7 @@ import type { SegmentKind } from '../src/new-process-route-tree' afterEach(() => vi.restoreAllMocks()) describe.each([false, true])( - 'shared pathname interpolation (server: %s)', + 'pathname interpolation (server: %s)', (server) => { it.each([ { path: '/', params: {}, expected: '/' }, @@ -88,7 +87,7 @@ describe.each([false, true])( expected: '/123/123/', }, ])( - 'interpolates and caches $path with $params', + 'interpolates $path with $params', ({ path, params, expected, normalized }) => { const interpolate = createPathInterpolator({ isServer: server }) const options = { path, params, server } @@ -102,37 +101,7 @@ describe.each([false, true])( }, ) - it('shares results across equivalent params without retaining unrelated params', () => { - const interpolate = createPathInterpolator({ - isServer: server, - pathParamsAllowedCharacters: ['@'], - }) - const format = vi.spyOn(pathUtils, 'interpolatePath') - const options = { - path: '/users/$id', - params: { id: '@one', unrelated: 'first' }, - server, - } - expect(interpolate(options)).toBe('/users/@one') - expect(format).toHaveBeenCalledOnce() - - expect( - interpolate({ - ...options, - params: { id: '@one', unrelated: 'second' }, - }), - ).toBe('/users/@one') - expect(format).toHaveBeenCalledOnce() - - const anotherRouter = createPathInterpolator({ - isServer: server, - pathParamsAllowedCharacters: ['@'], - }) - expect(anotherRouter(options)).toBe('/users/@one') - expect(format).toHaveBeenCalledTimes(2) - }) - - it('normalizes non-string fallbacks without memoizing object coercion', () => { + it('formats non-string values on every call', () => { const interpolate = createPathInterpolator({ isServer: server }) const toString = vi.fn(() => 'one two') const options = { @@ -168,7 +137,7 @@ describe.each([false, true])( expect(allowAt(options)).toBe('/users/@%2B') }) - it('keeps each router template cache independent of other encodings', () => { + it('keeps each router encoding independent across templates', () => { const allowAt = createPathInterpolator({ isServer: server, pathParamsAllowedCharacters: ['@'], @@ -192,7 +161,7 @@ describe.each([false, true])( } }) - it('does not confuse parameter boundaries in shared cache keys', () => { + it('does not confuse parameter boundaries', () => { const interpolate = createPathInterpolator({ isServer: server }) const options = { path: '/$first/$second', server } const first = { first: 'a:b', second: 'c' } @@ -212,7 +181,7 @@ describe.each([false, true])( expect(interpolate({ path: '/users/$id', params })).toBe('/users/123') }) - it('tracks optional params that were absent when the template was first used', () => { + it('formats optional params from their current values', () => { const interpolate = createPathInterpolator({ isServer: server }) const path = '/posts/{-$category}/$id' const inputs = [ @@ -238,31 +207,11 @@ describe.each([false, true])( } }) - it('caches paths with omitted optional params', () => { - const interpolate = createPathInterpolator({ - isServer: server, - pathParamsAllowedCharacters: ['@'], - }) - const format = vi.spyOn(pathUtils, 'interpolatePath') - const options = { - path: '/{-$lang}/foo/$id', - params: { id: '@one' }, - server, - } - - expect(interpolate(options)).toBe('/foo/@one') - expect(interpolate({ ...options, params: { id: '@one' } })).toBe( - '/foo/@one', - ) - expect(format).toHaveBeenCalledOnce() - }) - it('uses the canonical splat value instead of its legacy alias', () => { const interpolate = createPathInterpolator({ isServer: server, pathParamsAllowedCharacters: ['@'], }) - const format = vi.spyOn(pathUtils, 'interpolatePath') const options = { path: '/files/$', params: { _splat: 'docs/@guide', '*': 'ignored' }, @@ -270,14 +219,12 @@ describe.each([false, true])( } expect(interpolate(options)).toBe('/files/docs/@guide') - format.mockClear() expect( interpolate({ ...options, params: { _splat: 'docs/@guide', '*': 'changed' }, }), ).toBe('/files/docs/@guide') - expect(format).not.toHaveBeenCalled() }) it('collects used params for splats but not missing optionals', () => { diff --git a/packages/router-core/tests/route-tree-caches.test.ts b/packages/router-core/tests/route-tree-caches.test.ts index 207784525c..302dfa62f1 100644 --- a/packages/router-core/tests/route-tree-caches.test.ts +++ b/packages/router-core/tests/route-tree-caches.test.ts @@ -1,7 +1,6 @@ import { afterEach, beforeEach, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' -import * as pathUtils from '../src/path' import * as routeTreeUtils from '../src/new-process-route-tree' import { createRequestHandler } from '../src/ssr/createRequestHandler' import { createTestRouter } from './routerTestUtils' @@ -39,9 +38,9 @@ function history() { } test.each([false, true])( - 'caches the canonical pathname without changing hrefs (server: %s)', + 'builds canonical pathnames and encoded hrefs (server: %s)', (isServer) => { - const { routeTree, item } = createRoutes() + const { routeTree } = createRoutes() const router = createTestRouter({ routeTree, history: history(), isServer }) for (const [id, pathname, href] of [ ['one two', '/items/one two', '/items/one%20two'], @@ -59,7 +58,6 @@ test.each([false, true])( }) expect(result.pathname).toBe(pathname) expect(result.href).toBe(href) - expect(item._pathCache?.[0 /* paths */].get(id)).toBe(pathname) } } }, @@ -78,10 +76,6 @@ test('reuses server caches after request cleanup without sharing match state', a }, })(({ router }) => { disposers.push(router.history.destroy) - router.buildLocation({ - to: '/pretty/$id', - params: { id: 'one two' }, - }) return new Response( router.buildLocation({ to: '/items/$id', @@ -92,28 +86,15 @@ test('reuses server caches after request cleanup without sharing match state', a expect(await (await request()).text()).toBe('/items/one%20two') const branch = item._branch - const plan = item._pathCache const firstLocation = routers[0]!.latestLocation const lightweightResult = routers[0]!['lightweightCache'].get(firstLocation) expect(branch).toEqual([root, item]) - expect(plan).toBeDefined() expect(lightweightResult).toBeDefined() - const interpolate = vi.spyOn(pathUtils, 'interpolatePath') expect(await (await request()).text()).toBe('/items/one%20two') expect(item._branch).toBe(branch) - expect(item._pathCache).toBe(plan) - expect( - interpolate.mock.calls.filter(([path]) => path === '/items/$id'), - ).toHaveLength(0) - expect( - interpolate.mock.calls.filter(([path]) => path === '/pretty/$id'), - ).toHaveLength(0) expect(routers[0]).not.toBe(routers[1]) expect(routers[0]!.resolvePathCache).toBe(routers[1]!.resolvePathCache) - expect(routers[0]!['unmatchedPathCache']).toBe( - routers[1]!['unmatchedPathCache'], - ) expect(routers[0]!['lightweightCache']).not.toBe( routers[1]!['lightweightCache'], ) @@ -140,7 +121,6 @@ test.each([ isServer, }) expect(first.resolvePathCache).not.toBe(second.resolvePathCache) - expect(first['unmatchedPathCache']).not.toBe(second['unmatchedPathCache']) expect(first['lightweightCache']).not.toBe(second['lightweightCache']) expect(globalThis.__TSR_CACHE__).toBeUndefined() }, @@ -164,21 +144,16 @@ test('keeps different route objects independent and resets derived caches when r ).toBe('/items/one') } expect(firstTree.item._branch).not.toBe(secondTree.item._branch) - expect(firstTree.item._pathCache).not.toBe(secondTree.item._pathCache) expect(firstTree.item._interpolation).not.toBe(secondTree.item._interpolation) const previousResolve = first.resolvePathCache - const previousFallback = first['unmatchedPathCache'] const previousLightweight = first['lightweightCache'] const previousBranch = firstTree.item._branch - const previousPlan = firstTree.item._pathCache const previousInterpolation = firstTree.item._interpolation first.setRoutes(first.buildRouteTree()) expect(first.resolvePathCache).not.toBe(previousResolve) - expect(first['unmatchedPathCache']).not.toBe(previousFallback) expect(first['lightweightCache']).not.toBe(previousLightweight) expect(firstTree.item._branch).toBeUndefined() - expect(firstTree.item._pathCache).toBe(previousPlan) expect(firstTree.item._interpolation).not.toBe(previousInterpolation) expect([...firstTree.item._interpolation!]).toEqual([ ...previousInterpolation!, @@ -187,39 +162,9 @@ test('keeps different route objects independent and resets derived caches when r first.buildLocation({ to: '/items/$id', params: { id: 'one' } }).href, ).toBe('/items/one') expect(firstTree.item._branch).not.toBe(previousBranch) - expect(firstTree.item._pathCache).toBe(previousPlan) }) -test('keeps more than 32 registered route templates warm', () => { - const root = new BaseRootRoute({}) - const routes = Array.from( - { length: 128 }, - (_, index) => - new BaseRoute({ - getParentRoute: () => root, - path: `/section-${index}/$id`, - }), - ) - const router = createTestRouter({ - routeTree: root.addChildren(routes), - history: history(), - pathParamsAllowedCharacters: ['@'], - }) - const interpolate = vi.spyOn(pathUtils, 'interpolatePath') - for (let round = 0; round < 2; round++) { - for (let index = 0; index < routes.length; index++) { - expect( - router.buildLocation({ - to: `/section-${index}/$id`, - params: { id: '@one' }, - }).pathname, - ).toBe(`/section-${index}/@one`) - } - expect(interpolate).toHaveBeenCalledTimes(routes.length) - } -}) - -test('refreshes branches and path plans when an existing route is reparented', () => { +test('refreshes branches and segments when an existing route is reparented', () => { vi.stubEnv('NODE_ENV', 'development') const root = new BaseRootRoute({}) const left = new BaseRoute({ getParentRoute: () => root, path: '/left' }) @@ -238,7 +183,6 @@ test('refreshes branches and path plans when an existing route is reparented', ( .href, ).toBe('/left/child/one%20two') expect(child._branch).toEqual([root, left, child]) - const plan = child._pathCache const previousInterpolation = child._interpolation parent = right @@ -246,7 +190,6 @@ test('refreshes branches and path plans when an existing route is reparented', ( right.addChildren([child]) router.setRoutes(router.buildRouteTree()) expect(child._branch).toBeUndefined() - expect(child._pathCache).toBe(plan) expect(child._interpolation).not.toBe(previousInterpolation) expect(child.fullPath).toBe('/right/child/$id') expect(child._interpolation?.[0]).toBe('/right/child') @@ -256,7 +199,6 @@ test('refreshes branches and path plans when an existing route is reparented', ( .href, ).toBe('/right/child/one%20two') expect(child._branch).toEqual([root, right, child]) - expect(child._pathCache).not.toBe(plan) expect(parse).not.toHaveBeenCalled() }) @@ -280,29 +222,6 @@ test('uses updated callbacks with rebuilt segments in development', () => { expect(parse).not.toHaveBeenCalled() }) -test('keeps the 128-result bound within each route', () => { - const { routeTree } = createRoutes() - const router = createTestRouter({ - routeTree, - history: history(), - pathParamsAllowedCharacters: ['@'], - }) - const interpolate = vi.spyOn(pathUtils, 'interpolatePath') - for (let id = 0; id <= 128; id++) { - expect( - router.buildLocation({ - to: '/items/$id', - params: { id: `@${id}` }, - }).pathname, - ).toBe(`/items/@${id}`) - } - interpolate.mockClear() - expect( - router.buildLocation({ to: '/items/$id', params: { id: '@0' } }).pathname, - ).toBe('/items/@0') - expect(interpolate).toHaveBeenCalledOnce() -}) - test('uses fixed encodings and trailing-slash policies on independent routes', () => { const allowAt = createTestRouter({ routeTree: createRoutes().routeTree, @@ -344,50 +263,6 @@ test('uses fixed encodings and trailing-slash policies on independent routes', ( ).toBe('/items/@%2B') }) -test('parses unregistered templates once per immutable router', () => { - const parse = vi.spyOn(routeTreeUtils, 'parseSegments') - for (const allowed of [undefined, ['@'], ['+']] as const) { - const router = createTestRouter({ - routeTree: createRoutes().routeTree, - history: history(), - pathParamsAllowedCharacters: allowed, - }) - for (let id = 0; id < 140; id++) { - expect( - router.buildLocation({ - to: '/unregistered/$id', - params: { id: String(id) }, - }).pathname, - ).toBe(`/unregistered/${id}`) - } - } - expect(parse).toHaveBeenCalledTimes(3) -}) - -test('keeps client-local template caches independent of other fixed encodings', () => { - const first = createTestRouter({ - routeTree: createRoutes().routeTree, - history: history(), - isServer: false, - pathParamsAllowedCharacters: ['@'], - }) - const second = createTestRouter({ - routeTree: createRoutes().routeTree, - history: history(), - isServer: false, - pathParamsAllowedCharacters: ['+'], - }) - const destination = { to: '/unregistered/$id', params: { id: '@+' } } - expect(first.buildLocation(destination).pathname).toBe('/unregistered/@%2B') - expect( - second.buildLocation({ to: '/items/$id', params: { id: '@+' } }).pathname, - ).toBe('/items/%40+') - expect(second.buildLocation(destination).pathname).toBe('/unregistered/%40+') - const interpolate = vi.spyOn(pathUtils, 'interpolatePath') - expect(first.buildLocation(destination).pathname).toBe('/unregistered/@%2B') - expect(interpolate).not.toHaveBeenCalled() -}) - test('does not reparse a legacy fallback already registered in the tree', () => { const { routeTree, item } = createRoutes() const parse = vi.spyOn(routeTreeUtils, 'parseSegments') @@ -401,14 +276,13 @@ test('does not reparse a legacy fallback already registered in the tree', () => expect(parse).not.toHaveBeenCalled() }) -test('retains a bounded fallback for unregistered mask templates', () => { +test('formats masked destinations without registered templates', () => { const { routeTree } = createRoutes() const router = createTestRouter({ routeTree, history: history(), pathParamsAllowedCharacters: ['@'], }) - const interpolate = vi.spyOn(pathUtils, 'interpolatePath') const build = () => router.buildLocation({ to: '/items/$id', @@ -417,29 +291,5 @@ test('retains a bounded fallback for unregistered mask templates', () => { }) expect(build().maskedLocation?.pathname).toBe('/pretty/@one') - interpolate.mockClear() expect(build().maskedLocation?.pathname).toBe('/pretty/@one') - expect(interpolate).not.toHaveBeenCalled() - - const templates = Array.from( - { length: 64 }, - (_, index) => `/unregistered-${index}/$id`, - ) - for (const to of templates) { - router.buildLocation({ - to, - params: { id: '@one' }, - }) - } - const cache = router['unmatchedPathCache'] - expect( - ['/pretty/$id', ...templates].filter((path) => cache.get(path)), - ).toHaveLength(32) - const evicted = templates.find((path) => !cache.get(path))! - expect(evicted).toBeDefined() - interpolate.mockClear() - expect( - router.buildLocation({ to: evicted, params: { id: '@one' } }).pathname, - ).toBe(evicted.replace('$id', '@one')) - expect(interpolate).toHaveBeenCalledOnce() }) diff --git a/packages/router-core/tests/routerTestUtils.ts b/packages/router-core/tests/routerTestUtils.ts index 015736b13c..51a785819f 100644 --- a/packages/router-core/tests/routerTestUtils.ts +++ b/packages/router-core/tests/routerTestUtils.ts @@ -105,13 +105,15 @@ export function createTestPathInterpolator( routeTree: new BaseRootRoute({}), history: createMemoryHistory({ initialEntries: ['/'] }), scrollRestoration: false, + trailingSlash: 'preserve', ...options, }) router.history.destroy() return ( options: Pick, ): string => { - return router['interpolatePath'](options.path, options.params) + return router.buildLocation({ to: options.path, params: options.params }) + .pathname } } diff --git a/packages/solid-router/src/index.tsx b/packages/solid-router/src/index.tsx index 31be74086f..6cd6020f43 100644 --- a/packages/solid-router/src/index.tsx +++ b/packages/solid-router/src/index.tsx @@ -15,8 +15,6 @@ export { stringifySearchWith, functionalUpdate, replaceEqualDeep, - isPlainObject, - isPlainArray, deepEqual, createControlledPromise, retainSearchParams, diff --git a/packages/vue-router/src/index.tsx b/packages/vue-router/src/index.tsx index 2e14e349f0..ebc8f46aba 100644 --- a/packages/vue-router/src/index.tsx +++ b/packages/vue-router/src/index.tsx @@ -15,8 +15,6 @@ export { stringifySearchWith, functionalUpdate, replaceEqualDeep, - isPlainObject, - isPlainArray, deepEqual, createControlledPromise, retainSearchParams, From 465c85a734f84adf1426b39166697759994d2142 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:05 +0200 Subject: [PATCH 017/175] fix(react-router): treat Link params and search as immutable inputs (#8380) `useValueStable` kept a shallow copy of `params` / `search` / `activeOptions` (dac2bf249f) so that an object mutated in place would yield a new reference on the next render. That only ever held one level deep: a nested change such as `search.filters.page = 2` left the shared nested reference in the copy, `deepEqual` short-circuited on it, `dest` kept its identity and `buildLocation` served the cached location. Detecting mutation is not a contract React lets us keep. A mutation on its own never renders anything; the tests that exercised it needed a manual re-render button to observe the change, which is the same situation as a mutated `React.memo` prop or `useMemo` dependency. Rather than snapshot deeper (measured +63 gzip bytes on react-router.minimal and a 3-5x slower compare whenever nested references are shared, since nothing can short-circuit), `useValueStable` stores the caller's reference again, as on main. The reference is the router's invalidation signal: pass a new object to change a destination. The regression test now pins the contract that can actually break: fresh inline literals with equal nested contents must not trigger another `buildLocation`, and a nested value that changes through React state must produce a new href on that render and keep it across navigations. The accessor and in-place mutation tests are removed along with the promise in the changeset. Bundle (react-router.minimal gzip): 86038 -> 86026 (-12). Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/still-links-rest.md | 2 +- packages/react-router/src/link.tsx | 15 +-- .../tests/link-destination.test.tsx | 113 +++++++++++------- 3 files changed, 80 insertions(+), 50 deletions(-) diff --git a/.changeset/still-links-rest.md b/.changeset/still-links-rest.md index 770daa9ba9..830506b9c4 100644 --- a/.changeset/still-links-rest.md +++ b/.changeset/still-links-rest.md @@ -3,4 +3,4 @@ '@tanstack/react-router': patch --- -Reuse built locations for Links whose destination does not depend on the current location. `buildLocation` keeps the result per options object when the build never read the current location, and the React `Link` passes one stable options object per instance, so navigations resolve unchanged Links with a lookup instead of a full build. The per-route pathname interpolation cache this replaces is removed. Link `params`, `search` and `activeOptions` are compared by value on render; an object mutated in place is picked up on the next render rather than by a navigation alone. +Reuse built locations for Links whose destination does not depend on the current location. `buildLocation` keeps the result per options object when the build never read the current location, and the React `Link` passes one stable options object per instance, so navigations resolve unchanged Links with a lookup instead of a full build. The per-route pathname interpolation cache this replaces is removed. Link `params`, `search` and `activeOptions` are compared by value on render, so inline object literals with unchanged contents keep reusing the Link's location. Pass a new object to change a destination; like any other React prop, an object mutated in place is not re-read. diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 2d63f385b2..7420ba71ea 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -40,20 +40,21 @@ type LinkState = [href: string | undefined, isActive?: boolean] // otherwise change `_options` identity on every parent render, rebuild the // store selector, and discard its memoized selection. // -// The kept value is a shallow copy, never the caller's object: the router -// reuses a built location for as long as it sees the same options object, so -// a params object mutated in place, or one backed by accessors, has to yield -// a new reference here on the render that observes the change. +// The router reuses a built location for as long as it sees the same options +// object, so the reference returned here is its invalidation signal: pass a +// new object to change a destination. Like every other React prop, an object +// mutated in place is not re-read. `deepEqual` short-circuits on reference +// equality, so an unchanged reference costs nothing. // // `ignoreUndefined: false` is required: an explicit `undefined` clears an // inherited param or search key, so `{}` and `{ category: undefined }` build // different locations and must not be treated as equal here. function useValueStable(value: T): T { - const ref = React.useRef(undefined) + const ref = React.useRef(value) if (!deepEqual(ref.current, value, { ignoreUndefined: false })) { - ref.current = value && typeof value === 'object' ? { ...value } : value + ref.current = value } - return ref.current as T + return ref.current } function compareLinkState(a: LinkState, b: LinkState) { diff --git a/packages/react-router/tests/link-destination.test.tsx b/packages/react-router/tests/link-destination.test.tsx index 6447e5aa06..f33fe65803 100644 --- a/packages/react-router/tests/link-destination.test.tsx +++ b/packages/react-router/tests/link-destination.test.tsx @@ -24,25 +24,21 @@ describe('Link destination updates', () => { stringify?: (params: Record) => { id: string }, ) { const rootRoute = createRootRoute({ - component: function Root() { - const [, rerender] = React.useState(0) - return ( - <> - - - Target - - - - ) - }, + component: () => ( + <> + + Target + + + + ), }) const itemsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -167,40 +163,73 @@ describe('Link destination updates', () => { expect(link).toHaveAttribute('href', '/target/fixed#details') }) - test('reads accessor-backed params on the next render', async () => { - let id = 'one' - const { router } = setupFixedLink({ - get id() { - return id + test('reuses the location for equal inline literals and rebuilds on nested changes', async () => { + const rootRoute = createRootRoute({ + component: function Root() { + const [page, setPage] = React.useState(1) + const [, rerender] = React.useState(0) + return ( + <> + + + + Items + + + + ) }, }) + const itemsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/items/$source', + }) + const router = createRouter({ + routeTree: rootRoute.addChildren([itemsRoute]), + history: createMemoryHistory({ initialEntries: ['/'] }), + }) + const buildLocation = vi.spyOn(router, 'buildLocation') render() - const link = await screen.findByTestId('fixed-link') - expect(link).toHaveAttribute('href', '/target/one#details') + const link = await screen.findByTestId('nested-link') + expect(link).toHaveAttribute( + 'href', + '/items/one?filters=%7B%22page%22%3A1%7D&tags=%5B%22a%22%5D', + ) - id = 'two' + // Fresh literals with equal contents must not produce a new options + // object, otherwise the router could never reuse the built location. + const builds = buildLocation.mock.calls.length + expect(builds).toBeGreaterThan(0) fireEvent.click(screen.getByRole('button', { name: 'Rerender' })) - expect(link).toHaveAttribute('href', '/target/two#details') - }) - - test('updates when an existing params object changes before a render', async () => { - const params = { id: 'one' } - const { router } = setupFixedLink(params) - render() - - const link = await screen.findByTestId('fixed-link') - expect(link).toHaveAttribute('href', '/target/one#details') - - params.id = 'two' fireEvent.click(screen.getByRole('button', { name: 'Rerender' })) - expect(link).toHaveAttribute('href', '/target/two#details') + expect(buildLocation).toHaveBeenCalledTimes(builds) + expect(link).toHaveAttribute( + 'href', + '/items/one?filters=%7B%22page%22%3A1%7D&tags=%5B%22a%22%5D', + ) + + // A nested value that changes through React state is a new object, so + // the cached location for the previous contents must not be served. + fireEvent.click(screen.getByRole('button', { name: 'Next page' })) + expect(link).toHaveAttribute( + 'href', + '/items/one?filters=%7B%22page%22%3A2%7D&tags=%5B%22a%22%5D', + ) - // The same object keeps its location across navigations until it changes again. await act(() => router.navigate({ to: '/items/$source', params: { source: 'two' } }), ) - expect(link).toHaveAttribute('href', '/target/two#details') + expect(link).toHaveAttribute( + 'href', + '/items/one?filters=%7B%22page%22%3A2%7D&tags=%5B%22a%22%5D', + ) + buildLocation.mockRestore() }) test('updates fixed params and hash when Link props change', async () => { From 6cfb1e8b564be282584765352250bf61747895ed Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:05 +0200 Subject: [PATCH 018/175] perf(router-core): stop structurally sharing search and state in buildLocation (#8382) `buildLocation` ran `nullReplaceEqualDeep` over the built search and `replaceEqualDeep` over the built state against the current location on every build. That work only affected object identity, and nothing reads that identity from a built location: - Links select href and isActive from the built location; active state is computed by value and ignores history state. - `commitLocation` already compares state by value (`deepEqual` over `_getUserHistoryState`), so pre-shared children were at most a shortcut. - The identity consumers actually rely on (selecting `location.state.user` or a nested search value without rerendering) comes from `parseLocation`, which stabilizes the committed location against the previous one. That sharing stays untouched, as do the `matchRoutes` sites for search, params and loaderDeps. On the server `replaceEqualDeep` was already a passthrough, so client and server builds now produce the same shapes. Behavior changes: - A literal `search` or `state` is returned as the caller's object. It is never written to: `commitLocation` and history both copy before adding `__hashScrollIntoViewOptions`, `__TSR_key`, `key` and the index. - Because `replaceEqualDeep` returned the *current* search when contents were equal, `buildLocation` used to re-serialize the current key order. At `?a=1&b=2`, `buildLocation({ search: { b: 2, a: 1 } })` produced `?a=1&b=2`, so navigating there was a same-location no-op. It now produces `?b=2&a=1` and pushes a new history entry. - A destination without `search` yields the frozen `EMPTY_RECORD` instead of a fresh or shared object. Nothing downstream mutates the built search; all consumers copy. The `usedCurrent` tracking is unchanged: only reads through `current()` / `currentMatch()` mark a build as location-dependent, so literal search and state keep hitting the per-options cache. Tests: the build-time sharing assertion (`explicit state structurally shares unchanged nested values`) is replaced by a describe block that pins the new contract: built search/state are the caller's objects, equal nested references are preserved after navigation via parseLocation, `navigate` does not mutate a plain or frozen caller state, and the key-order case is covered at both the buildLocation and the navigation level. Measurements (react-router.minimal, this tree): gzip 86026 -> 86004 (-22), initial -23, raw -41, brotli +65. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/calm-locations-unshared.md | 5 + packages/router-core/src/router.ts | 35 ++-- .../router-core/tests/build-location.test.ts | 188 ++++++++++++++---- 3 files changed, 175 insertions(+), 53 deletions(-) create mode 100644 .changeset/calm-locations-unshared.md diff --git a/.changeset/calm-locations-unshared.md b/.changeset/calm-locations-unshared.md new file mode 100644 index 0000000000..1d3b74c795 --- /dev/null +++ b/.changeset/calm-locations-unshared.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +`buildLocation` no longer structurally shares the built `search` and `state` with the current location. The observable `location.search` and `location.state` still preserve equal nested references across navigations, because `parseLocation` stabilizes them once a location is committed. A search whose contents equal the current search but list its keys in a different order now serializes in the requested order, so navigating to it creates a new history entry instead of being treated as the same location. A `state` object passed to `navigate` or `buildLocation` is never mutated. diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index f11f3f17a1..19ea2b8aed 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -1881,7 +1881,9 @@ export class RouterCore< /** * Build the next ParsedLocation from navigation options without committing. * Resolves `to`/`from`, params/search/hash/state, applies search validation - * and middlewares, and returns a stable, stringified location object. + * and middlewares, and returns a stringified location object. The built + * `search` and `state` are not structurally shared with the current + * location; `parseLocation` stabilizes them once the location is committed. * * @link https://tanstack.com/router/latest/docs/framework/react/api/router/RouterType#buildlocation-method */ @@ -2094,8 +2096,10 @@ export class RouterCore< } return search } - // A literal search never reads the current one. - let nextSearch: Record = middlewares.length + // A literal search never reads the current one. The result is not + // structurally shared with the current search: `parseLocation` keeps + // equal nested values stable once the location is committed. + const nextSearch: Record = middlewares.length ? applySearchMiddleware(middlewares, fromSearch(), dest) : dest.search === true ? fromSearch() @@ -2103,10 +2107,6 @@ export class RouterCore< ? dest.search(fromSearch()) : (dest.search as Record) || EMPTY_RECORD - // Structural sharing only affects identity, so it does not make the - // location depend on the current one. - nextSearch = nullReplaceEqualDeep(lightweight[2 /* search */], nextSearch) - // Stringify the next search const searchStr = this.options.stringifySearch(nextSearch) @@ -2121,18 +2121,15 @@ export class RouterCore< // Resolve the next hash string const hashStr = hash ? `#${hash}` : '' - // Resolve the next state - let nextState: HistoryState = EMPTY_RECORD - if (dest.state) { - nextState = - dest.state === true - ? current().state - : typeof dest.state === 'function' - ? dest.state(current().state) - : dest.state - // Identity-only, as above. - nextState = replaceEqualDeep(currentLocation.state, nextState) - } + // Resolve the next state. A literal state never reads the current one + // and, like the search, is not shared with it here. + const nextState: HistoryState = !dest.state + ? EMPTY_RECORD + : dest.state === true + ? current().state + : typeof dest.state === 'function' + ? dest.state(current().state) + : dest.state // Create the full path of the location const fullPath = `${nextPathname}${searchStr}${hashStr}` diff --git a/packages/router-core/tests/build-location.test.ts b/packages/router-core/tests/build-location.test.ts index e9c291e31e..99bbbc60cf 100644 --- a/packages/router-core/tests/build-location.test.ts +++ b/packages/router-core/tests/build-location.test.ts @@ -1299,40 +1299,6 @@ describe('buildLocation - state', () => { expect(location.state).not.toBe(emptyState) }) - test('explicit state structurally shares unchanged nested values', async () => { - const rootRoute = new BaseRootRoute({}) - const postsRoute = new BaseRoute({ - getParentRoute: () => rootRoute, - path: '/posts', - }) - const history = createMemoryHistory({ initialEntries: ['/posts'] }) - history.replace('/posts', { - user: { id: 1, name: 'Test' }, - count: 1, - }) - const router = createTestRouter({ - routeTree: rootRoute.addChildren([postsRoute]), - history, - }) - await router.load() - - const currentState = router.state.location.state as any - const location = router.buildLocation({ - to: '/posts', - state: { - user: { id: 1, name: 'Test' }, - count: 2, - } as any, - }) - - expect(location.state).toEqual({ - user: { id: 1, name: 'Test' }, - count: 2, - }) - expect((location.state as any).user).toBe(currentState.user) - expect(location.state).not.toBe(currentState) - }) - test('state can contain complex nested objects', async () => { const rootRoute = new BaseRootRoute({}) const postsRoute = new BaseRoute({ @@ -1364,6 +1330,160 @@ describe('buildLocation - state', () => { }) }) +describe('buildLocation - no structural sharing with the current location', () => { + function createPostsRouter( + history = createMemoryHistory({ initialEntries: ['/posts'] }), + ) { + const rootRoute = new BaseRootRoute({}) + const postsRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/posts', + }) + return createTestRouter({ + routeTree: rootRoute.addChildren([postsRoute]), + history, + }) + } + + test('explicit state is returned as-is and equal nested values are shared only after navigation', async () => { + const history = createMemoryHistory({ initialEntries: ['/posts'] }) + history.replace('/posts', { + user: { id: 1, name: 'Test' }, + count: 1, + }) + const router = createPostsRouter(history) + await router.load() + + const previousState = router.state.location.state as any + const nextState = { + user: { id: 1, name: 'Test' }, + count: 2, + } + const location = router.buildLocation({ + to: '/posts', + state: nextState as any, + }) + + // The built location carries the caller's object untouched. + expect(location.state).toBe(nextState) + expect((location.state as any).user).not.toBe(previousState.user) + + await router.navigate({ to: '/posts', state: nextState as any }) + + // parseLocation still stabilizes the committed state against the + // previous one, which is what location selectors rely on. + const committedState = router.state.location.state as any + expect(committedState).toMatchObject({ + user: { id: 1, name: 'Test' }, + count: 2, + }) + expect(committedState).not.toBe(previousState) + expect(committedState.user).toBe(previousState.user) + expect(nextState.user).not.toBe(previousState.user) + }) + + test('explicit search is returned as-is and equal nested values are shared only after navigation', async () => { + const router = createPostsRouter() + await router.load() + + await router.navigate({ + to: '/posts', + search: { page: 1, filter: { tags: ['a'] } } as any, + }) + const previousSearch = router.state.location.search as any + expect(previousSearch).toEqual({ page: 1, filter: { tags: ['a'] } }) + + const nextSearch = { page: 2, filter: { tags: ['a'] } } + const location = router.buildLocation({ + to: '/posts', + search: nextSearch as any, + }) + + expect(location.search).toBe(nextSearch) + expect((location.search as any).filter).not.toBe(previousSearch.filter) + + await router.navigate({ to: '/posts', search: nextSearch as any }) + + const committedSearch = router.state.location.search as any + expect(committedSearch).toEqual({ page: 2, filter: { tags: ['a'] } }) + expect(committedSearch).not.toBe(previousSearch) + expect(committedSearch.filter).toBe(previousSearch.filter) + expect(nextSearch.filter).not.toBe(previousSearch.filter) + }) + + test('navigate does not mutate a caller-supplied state object', async () => { + const history = createMemoryHistory({ initialEntries: ['/posts'] }) + const router = createPostsRouter(history) + await router.load() + + const state = { user: { id: 1 } } + await router.navigate({ + to: '/posts', + state: state as any, + hashScrollIntoView: true, + }) + + expect(state).toEqual({ user: { id: 1 } }) + expect(Object.keys(state)).toEqual(['user']) + const committedState = router.state.location.state as any + expect(committedState).not.toBe(state) + expect(committedState.user).toBe(state.user) + expect(committedState.__hashScrollIntoViewOptions).toBe(true) + expect(committedState.__TSR_key).toBeTypeOf('string') + expect(committedState.key).toBe(committedState.__TSR_key) + + // A frozen state (for example produced by an immutable store) commits + // without any write hitting it: in strict mode such a write would throw. + const frozenState = Object.freeze({ user: Object.freeze({ id: 2 }) }) + await router.navigate({ to: '/posts', state: frozenState as any }) + + expect(router.state.location.state).toMatchObject({ user: { id: 2 } }) + expect(router.state.location.state).not.toBe(frozenState) + expect(history.length).toBe(3) + }) + + test('an equal search in a different key order serializes in the requested order', async () => { + const router = createPostsRouter( + createMemoryHistory({ initialEntries: ['/posts?a=1&b=2'] }), + ) + await router.load() + + expect(router.state.location.href).toBe('/posts?a=1&b=2') + + const location = router.buildLocation({ + to: '/posts', + search: { b: 2, a: 1 } as any, + }) + + expect(location.search).toEqual({ a: 1, b: 2 }) + expect(Object.keys(location.search)).toEqual(['b', 'a']) + expect(location.searchStr).toBe('?b=2&a=1') + expect(location.href).toBe('/posts?b=2&a=1') + }) + + test('navigating to an equal search in a different key order pushes a new history entry', async () => { + const history = createMemoryHistory({ initialEntries: ['/posts?a=1&b=2'] }) + const router = createPostsRouter(history) + await router.load() + + expect(history.length).toBe(1) + + // Same contents and order: nothing to commit. + await router.navigate({ to: '/posts', search: { a: 1, b: 2 } as any }) + + expect(history.length).toBe(1) + expect(router.state.location.href).toBe('/posts?a=1&b=2') + + // Same contents, different order: the URL changes, so history grows. + await router.navigate({ to: '/posts', search: { b: 2, a: 1 } as any }) + + expect(history.length).toBe(2) + expect(history.location.href).toBe('/posts?b=2&a=1') + expect(router.state.location.href).toBe('/posts?b=2&a=1') + expect(router.state.location.search).toEqual({ a: 1, b: 2 }) + }) +}) + describe('buildLocation - relative paths', () => { test('absolute path should navigate to exact route', async () => { const rootRoute = new BaseRootRoute({}) From 9448caa03a89076b9770631c356c0cc502802c09 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:06 +0200 Subject: [PATCH 019/175] perf(router-core): keep search middleware collection optimized (#8385) CodSpeed's memory instrument flagged the interrupted-navigations client benchmark on the location-reuse changes (react +14.6%, vue +29.8%, solid +10.8% peak memory). Under its worker flags (`--no-opt --predictable`, single threaded) that benchmark's peak is set by a synchronous Maglev compile that happens inside the measured run. `getSearchMiddlewares` is compiled during the preparation calls and then deoptimized on the first property load off a route's options. Before, its only caller was the small `applySearchMiddleware`, which Maglev compiled next and inlined it into, so the callee never tiered up again. Since `build` calls it directly and does not inline it, it became hot again during the measured run, and its recompilation (about four 32 KB zone segments) set the peak. Iterating `destRoutes` with a counted loop instead of `for...of` keeps the function optimized once compiled: no deoptimization and no recompilation in the measured window. Middleware order and live route-option reads are unchanged. Hoisting the option reads alone did not help. Local reproduction with a malloc interposer, CodSpeed's worker flags and seven preparation calls, macOS arm64 / Node 24.8.0 (deterministic peaks): - react: 248880 (base) -> 287760 (+15.6%) -> 248944 with this change - vue: 256704 -> 292656 (+14.0%) -> 256640 - solid: 287408 -> 288240 (+0.3%) -> 287632 These are local native allocations, not a new Linux CodSpeed CI run. Bundle (react-router.minimal gzip): +8. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/steady-loops-compile.md | 5 +++++ packages/router-core/src/router.ts | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .changeset/steady-loops-compile.md diff --git a/.changeset/steady-loops-compile.md b/.changeset/steady-loops-compile.md new file mode 100644 index 0000000000..5a243a4205 --- /dev/null +++ b/.changeset/steady-loops-compile.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Collect search middlewares with a counted loop so the optimized code stays valid across navigations. This removes a JIT recompilation that raised peak memory in the interrupted-navigations client memory benchmark. diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 19ea2b8aed..b12e5df297 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -2900,14 +2900,17 @@ function needsInheritedParams( const EMPTY_RECORD: Record = Object.freeze({}) // Keep this separate from recursive execution to limit JIT compiler memory. +// A counted loop instead of `for...of`: Maglev's inlined array iteration +// deoptimizes on route option shapes and recompiles later, whereas indexed +// reads stay optimized once compiled. function getSearchMiddlewares( destRoutes: ReadonlyArray, includeValidateSearch: boolean | undefined, ) { const middlewares = [] as Array> - for (const route of destRoutes) { - const routeOptions = route.options + for (let i = 0; i < destRoutes.length; i++) { + const routeOptions = destRoutes[i]!.options if ('search' in routeOptions) { if (routeOptions.search?.middlewares) { middlewares.push(...routeOptions.search.middlewares) From b747fb8891b3347b1ffdfe0fa81e7d15049cb776 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:06 +0200 Subject: [PATCH 020/175] perf(router): keep the location cache client-only and slim Link SSR (#8390) * perf(router): keep the location cache client-only and slim Link SSR The per-options location cache from the location-reuse changes only ever hits on the client: server renders never repeat an options object, yet every server build still created the WeakMap, looked it up per build, and Solid/Vue server Links stored an entry per render. All three sites are now guarded by `!(isServer ?? this.isServer)`. `isServer` is a per-bundle constant, so server bundles contain no cache at all (the Link SSR bundle has zero references); client bundles keep it unchanged. Rendering a React Link on the server copied its props four times: `Link` split off `_asChild`, `useLinkProps` split the router options off with an object rest, the result was assembled with spreads, and `Link` copied once more to drop `type` and `disabled`. Profiling showed the object rest alone was 85% of the hook's self time: V8 checks every key against the whole 35-entry exclusion list (about 470 ns per call versus 95 ns for a key-set copy). `useLinkProps` is now a wrapper over `useLinkPropsFor(options, ref, host)`. `Link` passes its host (`'a'` or the `createLink` component), so the hook omits `disabled` for anchors and `type` for both, and `Link` passes the result straight to `createElement`. The server branch is a separate `getServerLinkProps` referenced only inside the `isServer` check, so it and its key set are dropped from client bundles; it reads the few options it needs, splits element props with the key set, fills the props object in place with the same precedence and attribute order as before, and no longer runs `useForwardedRef` (moved after the server return). The client keeps its rest destructure; the host handling costs a few bytes there, mostly paid back by the folded router-core guards (numbers below). `encodePathLikeUrl` tests with one merged character class (`/[\s\u0080-\uFFFF]/`), which matches exactly the same code units as the alternation it replaces and is about 10% cheaper. Measurements (macOS arm64, Node 24.8.0, local): - Link SSR paired runner (ABBA, 4 fresh processes per case) against the previous stack top: all 13 cases faster, CPU -19.5% to -40.3%. - Link client paired runner: all 13 cases faster, CPU -4.6% to -9.2%. - Start SSR request loop (benchmarks/ssr, react), interleaved builds: 3.120 -> 2.890 ms per loop (-7.4%), 320.5 -> 346.1 hz. - Client bundle react-router.minimal gzip: 86012 -> 86021 (+9; raw +7, brotli -22): the router-core guards fold to -12, the Link host handling costs +19. The Link SSR bundle shrinks from 197832 to 189989 bytes. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * refactor(react-router): one state-prop precedence rule for every Link Active and inactive state props overrode `ref` and the event handlers on every link except a blocked one (a destination with a disallowed scheme), where the forwarded ref and the router's handlers won. The exception dates from the hardening change, whose test observed the then-general "router wins" rule on a blocked link; when state props were later allowed to override element props, blocked links were carved out to keep that test green rather than by design. It bought no safety: `href`, `disabled` and `target` are assigned after the state props in both orders, which is what actually keeps a blocked destination inert. It did make the same `inactiveProps` attach their `ref` and `onClick` on one inactive link and silently drop them on another, and it differed from Solid's Link, which applies one rule. Blocked links now follow the same precedence as every other link: state props override element props, `ref` and handlers; the routing attributes always win. The server branch loses its if/else, the client loses the two conditional spreads and the `blockedLink` flag. The blocked-link test now pins the uniform rule together with the routing attributes it already checked. Measurements (macOS arm64, Node 24.8.0, local, against the previous commit): - react-router.minimal gzip 86021 -> 86019 (-2), raw -38, brotli -33. - Link client paired runner (3 repeats): shared-params CPU -11.6% [-15.1, -7.9], encoding -13.2% [-20.2, -5.7]. - Link SSR paired runner: within noise. SSR bundle 189989 -> 189850 bytes. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/brisk-links-serve.md | 8 + packages/react-router/src/link.tsx | 340 ++++++++++++------ .../tests/link-state-props.test.tsx | 24 +- packages/router-core/src/router.ts | 30 +- packages/router-core/src/utils.ts | 11 +- 5 files changed, 284 insertions(+), 129 deletions(-) create mode 100644 .changeset/brisk-links-serve.md diff --git a/.changeset/brisk-links-serve.md b/.changeset/brisk-links-serve.md new file mode 100644 index 0000000000..504fd9414a --- /dev/null +++ b/.changeset/brisk-links-serve.md @@ -0,0 +1,8 @@ +--- +'@tanstack/router-core': patch +'@tanstack/react-router': patch +--- + +Keep the Link location cache out of server bundles: `buildLocation` only creates, reads and writes it when `isServer` is false. Render React Links on the server without the extra prop copies and the forwarded-ref hook. Link SSR rendering is 20-40% faster in the Link benchmarks and the React Start SSR request loop about 7% faster. + +React `activeProps` and `inactiveProps` now follow one precedence rule on every link, including links whose destination is blocked for using a disallowed scheme: state props override element props, `ref` and event handlers, while `href`, `disabled` and `target` stay controlled by the router. Previously a blocked link ignored a `ref` or handler from its inactive props. diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 7420ba71ea..b0006cb009 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -138,8 +138,59 @@ export function useLinkProps< >( options: UseLinkPropsOptions, forwardedRef?: React.ForwardedRef, +): React.ComponentPropsWithRef<'a'> { + return useLinkPropsFor(options, forwardedRef) +} + +// `host` is what the props are rendered on: `'a'` for `Link`, the component +// given to `createLink`, or `undefined` for the public hook. `Link` never +// renders `type` and an anchor never receives `disabled`, so those are left +// out here rather than copied away from the result in the component. +function useLinkPropsFor< + TRouter extends AnyRouter = RegisteredRouter, + const TFrom extends string = string, + const TTo extends string | undefined = undefined, + const TMaskFrom extends string = TFrom, + const TMaskTo extends string = '', +>( + options: UseLinkPropsOptions, + forwardedRef: React.ForwardedRef | undefined, + host?: 'a' | React.ElementType, ): React.ComponentPropsWithRef<'a'> { const router = useRouter() + + // ========================================================================== + // SERVER EARLY RETURN + // On the server, we return static props without any event handlers, + // effects, or client-side interactivity. + // + // For SSR parity (to avoid hydration errors), we still compute the link's + // active status on the server, but we avoid creating any router-state + // subscriptions by reading from the location store directly. + // + // Note: `location.hash` is not available on the server. + // ========================================================================== + // The expression must stay inlined in the `if` so bundlers fold the + // browser-build constant `isServer = false` and drop this server block, + // together with `getServerLinkProps` and the key sets only it references. + if (isServer ?? router.isServer) { + return getServerLinkProps(router, options, forwardedRef, host) + } + + // ========================================================================== + // CLIENT-ONLY CODE + // Everything below this point only runs on the client. The `isServer` check + // above is a compile-time constant that bundlers use for dead code elimination, + // so this entire section is removed from server bundles. + // + // We disable the rules-of-hooks lint rule because these hooks appear after + // an early return. This is safe because: + // 1. `isServer` is a compile-time constant from conditional exports + // 2. In server bundles, this code is completely eliminated by the bundler + // 3. In client bundles, `isServer` is `false`, so the early return never executes + // ========================================================================== + + // eslint-disable-next-line react-hooks/rules-of-hooks const innerRef = useForwardedRef(forwardedRef) const { @@ -179,99 +230,15 @@ export function useLinkProps< unsafeRelative: _unsafeRelative, from: _from, _fromLocation, + _asChild: _asChildOption, + type, ...propsSafeToSpread - } = options + } = options as typeof options & { _asChild?: unknown } const to = toOption as string | undefined - - // ========================================================================== - // SERVER EARLY RETURN - // On the server, we return static props without any event handlers, - // effects, or client-side interactivity. - // - // For SSR parity (to avoid hydration errors), we still compute the link's - // active status on the server, but we avoid creating any router-state - // subscriptions by reading from the location store directly. - // - // Note: `location.hash` is not available on the server. - // ========================================================================== - // The expression must stay inlined in the `if` so bundlers fold the - // browser-build constant `isServer = false` and drop this server block. - if (isServer ?? router.isServer) { - const directExternalLink = resolveExternalLink(to, router.protocolAllowlist) - - // Direct-scheme links need no route resolution. Blocked links still use - // the shared inactive-prop merge so their server and client markup agree. - const next = - directExternalLink === undefined - ? router.buildLocation(options as any) - : undefined - - const hrefOption = next - ? getHrefOption(next, router, disabled) - : (directExternalLink ?? undefined) - const linkDisabled = disabled || !hrefOption - - const externalLink = - directExternalLink ?? - (hrefOption && getUrlScheme(hrefOption) ? hrefOption : undefined) - - if (externalLink) { - return { - ...propsSafeToSpread, - ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], - href: externalLink, - ...(children && { children }), - ...(target && { target }), - ...(disabled && { disabled }), - ...(style && { style }), - ...(className && { className }), - } - } - - const blockedLink = !disabled && !hrefOption - // Hash is not available on the server, so it never counts as hydrated. - const isActive = - !!next && - !blockedLink && - resolveIsActive( - router.stores.location.get(), - next, - activeOptions, - router.basepath, - false, - ) - const [resolvedStateProps, resolvedClassName, resolvedStyle] = - resolveStateProps(isActive, activeProps, inactiveProps, className, style) - - return { - ...propsSafeToSpread, - // State props may override `ref`, but not on a blocked link (spread first). - ...(blockedLink ? resolvedStateProps : STATIC_EMPTY_OBJECT), - ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], - ...(!blockedLink ? resolvedStateProps : STATIC_EMPTY_OBJECT), - href: hrefOption, - disabled: !!linkDisabled, - target, - ...(resolvedStyle && { style: resolvedStyle }), - ...(resolvedClassName && { className: resolvedClassName }), - ...(linkDisabled && STATIC_DISABLED_PROPS), - ...(isActive && STATIC_ACTIVE_PROPS), - } + if (host === undefined && type !== undefined) { + ;(propsSafeToSpread as Record).type = type } - // ========================================================================== - // CLIENT-ONLY CODE - // Everything below this point only runs on the client. The `isServer` check - // above is a compile-time constant that bundlers use for dead code elimination, - // so this entire section is removed from server bundles. - // - // We disable the rules-of-hooks lint rule because these hooks appear after - // an early return. This is safe because: - // 1. `isServer` is a compile-time constant from conditional exports - // 2. In server bundles, this code is completely eliminated by the bundler - // 3. In client bundles, `isServer` is `false`, so the early return never executes - // ========================================================================== - // eslint-disable-next-line react-hooks/rules-of-hooks const isHydrated = useHydrated() @@ -432,7 +399,7 @@ export function useLinkProps< href: externalLink, ...(children && { children }), ...(target && { target }), - ...(disabled && { disabled }), + ...(disabled && host !== 'a' && { disabled }), ...(style && { style }), ...(className && { className }), ...(onClick && { onClick }), @@ -444,8 +411,6 @@ export function useLinkProps< } } - const blockedLink = isActive === undefined - const [resolvedStateProps, resolvedClassName, resolvedStyle] = resolveStateProps(isActive, activeProps, inactiveProps, className, style) @@ -493,8 +458,6 @@ export function useLinkProps< return { ...propsSafeToSpread, - // State props may override `ref` and handlers, but not on a blocked link (spread first). - ...(blockedLink ? resolvedStateProps : STATIC_EMPTY_OBJECT), ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], onClick: composeHandlers(onClick, handleClick), onBlur: composeHandlers(onBlur, handleLeave), @@ -502,9 +465,11 @@ export function useLinkProps< onMouseEnter: composeHandlers(onMouseEnter, enqueuePreload), onMouseLeave: composeHandlers(onMouseLeave, handleLeave), onTouchStart: composeHandlers(onTouchStart, handleTouchStart), - ...(!blockedLink ? resolvedStateProps : STATIC_EMPTY_OBJECT), + // State props override element props, `ref` and handlers, but never the + // routing attributes below. + ...resolvedStateProps, href, - disabled: !!linkDisabled, + ...(host !== 'a' && { disabled: !!linkDisabled }), target, ...(resolvedStyle && { style: resolvedStyle }), ...(resolvedClassName && { className: resolvedClassName }), @@ -515,8 +480,48 @@ export function useLinkProps< const STATIC_EMPTY_OBJECT = {} const STATIC_ACTIVE_OBJECT = { className: 'active' } -const STATIC_DISABLED_PROPS = { role: 'link', 'aria-disabled': true } -const STATIC_ACTIVE_PROPS = { 'data-status': 'active', 'aria-current': 'page' } +// Options consumed by the router and never forwarded to the element. +const LINK_OPTION_KEYS = /* @__PURE__ */ new Set([ + 'activeProps', + 'inactiveProps', + 'activeOptions', + 'to', + 'preload', + 'preloadDelay', + 'preloadIntentProximity', + 'hashScrollIntoView', + 'replace', + 'startTransition', + 'resetScroll', + 'viewTransition', + 'children', + 'target', + 'disabled', + 'style', + 'className', + 'onClick', + 'onBlur', + 'onFocus', + 'onMouseEnter', + 'onMouseLeave', + 'onTouchStart', + 'ignoreBlocker', + 'params', + 'search', + 'hash', + 'state', + 'mask', + 'reloadDocument', + 'unsafeRelative', + 'from', + '_fromLocation', + '_asChild', +]) +const STATIC_DISABLED_PROPS = { role: 'link', 'aria-disabled': true } as const +const STATIC_ACTIVE_PROPS = { + 'data-status': 'active', + 'aria-current': 'page', +} as const // Only one state contributes props; merge its class and style with the base ones. function resolveStateProps( @@ -546,6 +551,126 @@ function resolveStateProps( ] } +// Server render of a Link: static props only. This reads the few options it +// needs directly and splits the element props with a key set. V8 checks every +// key of an object rest against the whole exclusion list, which made that +// split the most expensive part of rendering a Link on the server. Only +// server bundles keep this function and the key sets. +function getServerLinkProps( + router: AnyRouter, + options: any, + forwardedRef: React.ForwardedRef | undefined, + host: 'a' | React.ElementType | undefined, +): React.ComponentPropsWithRef<'a'> { + const { + to, + disabled, + activeProps, + inactiveProps, + activeOptions, + children, + target, + style, + className, + } = options as { + to: string | undefined + disabled: boolean | undefined + activeProps: unknown + inactiveProps: unknown + activeOptions: ActiveOptions | undefined + children: ReactNode + target: string | undefined + style: React.CSSProperties | undefined + className: string | undefined + } + // `Link` additionally never renders a `type` attribute. + const props: Record = {} + for (const key in options) { + if (!LINK_OPTION_KEYS.has(key) && (key !== 'type' || host === undefined)) { + props[key] = options[key] + } + } + + const directExternalLink = resolveExternalLink(to, router.protocolAllowlist) + + // Direct-scheme links need no route resolution. Blocked links still use + // the shared inactive-prop merge so their server and client markup agree. + const next = + directExternalLink === undefined ? router.buildLocation(options) : undefined + + const hrefOption = next + ? getHrefOption(next, router, disabled) + : (directExternalLink ?? undefined) + const linkDisabled = disabled || !hrefOption + + const externalLink = + directExternalLink ?? + (hrefOption && getUrlScheme(hrefOption) ? hrefOption : undefined) + + // Assignments below mirror the client's spread order, so props keep the + // same precedence and the rendered attribute order stays identical. + if (externalLink) { + props.ref = forwardedRef + props.href = externalLink + if (children) { + props.children = children + } + if (target) { + props.target = target + } + if (disabled && host !== 'a') { + props.disabled = disabled + } + if (style) { + props.style = style + } + if (className) { + props.className = className + } + return props + } + + const blockedLink = !disabled && !hrefOption + // Hash is not available on the server, so it never counts as hydrated. + const isActive = + !!next && + !blockedLink && + resolveIsActive( + router.stores.location.get(), + next, + activeOptions, + router.basepath, + false, + ) + const [resolvedStateProps, resolvedClassName, resolvedStyle] = + resolveStateProps(isActive, activeProps, inactiveProps, className, style) + + // State props override element props and `ref`, but never the routing + // attributes assigned below. + props.ref = forwardedRef + Object.assign(props, resolvedStateProps) + props.href = hrefOption + if (host !== 'a') { + props.disabled = !!linkDisabled + } + props.target = target + if (resolvedStyle) { + props.style = resolvedStyle + } + if (resolvedClassName) { + props.className = resolvedClassName + } + if (linkDisabled) { + props.role = 'link' + props['aria-disabled'] = true + } + if (isActive) { + props['data-status'] = 'active' + props['aria-current'] = 'page' + } + return props +} + const timeoutMap = new WeakMap>() const cancelPreload = (eventTarget: object) => { clearTimeout(timeoutMap.get(eventTarget)) @@ -749,24 +874,17 @@ export function createLink( */ export const Link: LinkComponent<'a'> = React.forwardRef( (props, ref) => { - const { _asChild, ...rest } = props - const linkProps = useLinkProps(rest as any, ref) + const host = props._asChild || 'a' + const linkProps = useLinkPropsFor(props as any, ref, host) const children = - typeof rest.children === 'function' - ? rest.children({ + typeof props.children === 'function' + ? props.children({ isActive: (linkProps as any)['data-status'] === 'active', }) - : rest.children + : props.children - if (!_asChild) { - // the ReturnType of useLinkProps returns the correct type for a element, not a general component that has a disabled prop - // @ts-expect-error - const { type: _type, disabled: _, ...anchorProps } = linkProps - return React.createElement('a', anchorProps, children) - } - const { type: _type, ...customProps } = linkProps - return React.createElement(_asChild, customProps, children) + return React.createElement(host, linkProps, children) }, ) as any diff --git a/packages/react-router/tests/link-state-props.test.tsx b/packages/react-router/tests/link-state-props.test.tsx index a560c5e967..ea45a5e974 100644 --- a/packages/react-router/tests/link-state-props.test.tsx +++ b/packages/react-router/tests/link-state-props.test.tsx @@ -94,7 +94,7 @@ test.each([false, true])( }, ) -test('blocked custom links keep the validated props and forwarded ref', () => { +test('blocked custom links keep the validated routing props and apply state props like any inactive link', () => { const CustomLink = createLink( React.forwardRef< HTMLAnchorElement, @@ -108,13 +108,17 @@ test('blocked custom links keep the validated props and forwarded ref', () => { history: createMemoryHistory(), }) const ref = React.createRef() - const unwantedRef = vi.fn() + const stateRef = vi.fn() + const stateClick = vi.fn() + const baseClick = vi.fn() const search = vi.fn(() => ({})) const buildLocation = vi.spyOn(router, 'buildLocation') const inactiveProps = vi.fn(() => ({ href: 'javascript:override()', disabled: false, - ref: unwantedRef, + target: '_blank', + ref: stateRef, + onClick: stateClick, className: 'inactive-state', title: 'Inactive', })) @@ -124,6 +128,7 @@ test('blocked custom links keep the validated props and forwarded ref', () => { to="javascript:blocked()" ref={ref} search={search} + onClick={baseClick} inactiveProps={inactiveProps} > Target @@ -136,15 +141,24 @@ test('blocked custom links keep the validated props and forwarded ref', () => { const html = renderToString(tree) expect(html).toContain('data-disabled="true"') expect(html).toContain('class="inactive-state"') + expect(html).toContain('title="Inactive"') expect(html).not.toContain('href=') + expect(html).not.toContain('target=') router.isServer = false const anchor = render(tree).getByText('Target') expect(anchor).toHaveAttribute('data-disabled', 'true') expect(anchor).not.toHaveAttribute('href') + expect(anchor).not.toHaveAttribute('target') expect(anchor).toHaveClass('inactive-state') - expect(ref.current).toBe(anchor) + expect(anchor).toHaveAttribute('title', 'Inactive') + // The selected state props win over the forwarded ref and base handlers, + // exactly as they do on any other inactive link. + expect(stateRef).toHaveBeenCalledWith(anchor) + expect(ref.current).toBeNull() + fireEvent.click(anchor) + expect(stateClick).toHaveBeenCalledOnce() + expect(baseClick).not.toHaveBeenCalled() expect(inactiveProps).toHaveBeenCalled() - expect(unwantedRef).not.toHaveBeenCalled() expect(buildLocation).not.toHaveBeenCalled() expect(search).not.toHaveBeenCalled() } finally { diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index b12e5df297..e97d1e9603 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -1174,7 +1174,9 @@ export class RouterCore< > // Locations built without reading the current location, keyed by the stable // options object a Link owns. Links pass a new object when their values change. - private staticLocations!: WeakMap + // Client only: server renders never repeat an options object, so server + // bundles fold `isServer` and drop the cache entirely. + private staticLocations: WeakMap | undefined isServer!: boolean readonly pathParamsDecoder?: (encoded: string) => string protocolAllowlist!: Set @@ -1250,10 +1252,13 @@ export class RouterCore< ...prevOptions, ...newOptions, } - this.staticLocations = new WeakMap() this.isServer = this.options.isServer ?? isServer ?? typeof document === 'undefined' + // `isServer` is a per-bundle constant, so server builds drop the cache. + if (!(isServer ?? this.isServer)) { + this.staticLocations = new WeakMap() + } this.protocolAllowlist = new Set(this.options.protocolAllowlist) @@ -1390,7 +1395,9 @@ export class RouterCore< setRoutes(caches: RouteTreeCaches) { Object.assign(this, caches) this.lightweightCache = new WeakMap() - this.staticLocations = new WeakMap() + if (!(isServer ?? this.isServer)) { + this.staticLocations = new WeakMap() + } const notFoundRoute = this.options.notFoundRoute @@ -1888,9 +1895,11 @@ export class RouterCore< * @link https://tanstack.com/router/latest/docs/framework/react/api/router/RouterType#buildlocation-method */ buildLocation: BuildLocationFn = (opts) => { - const cached = this.staticLocations.get(opts) - if (cached) { - return cached + if (!(isServer ?? this.isServer)) { + const cached = this.staticLocations!.get(opts) + if (cached) { + return cached + } } // Set by `current()` whenever a build reads the current location. A @@ -2206,8 +2215,13 @@ export class RouterCore< } // Masked locations stay out: `opts.mask` is rebuilt from the current location. - if (!usedCurrent && opts._fromLocation && !next.maskedLocation) { - this.staticLocations.set(opts, next) + if ( + !(isServer ?? this.isServer) && + !usedCurrent && + opts._fromLocation && + !next.maskedLocation + ) { + this.staticLocations!.set(opts, next) } return next diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts index 9b1b3c411a..936bb3da73 100644 --- a/packages/router-core/src/utils.ts +++ b/packages/router-core/src/utils.ts @@ -708,11 +708,12 @@ export function decodePath(path: string) { * encodePathLikeUrl('/path/already%20encoded') // '/path/already%20encoded' (preserved) */ export function encodePathLikeUrl(path: string): string { - // Encode whitespace and non-ASCII characters that browsers encode in URLs - - // biome-ignore lint/suspicious/noControlCharactersInRegex: intentional ASCII range check - // eslint-disable-next-line no-control-regex - if (!/\s|[^\u0000-\u007F]/.test(path)) return path + // Encode whitespace and non-ASCII characters that browsers encode in URLs. + // The test uses one character class: it matches the same code units as the + // replacement pattern below and is cheaper than the alternation. + if (!/[\s\u0080-\uFFFF]/.test(path)) { + return path + } // biome-ignore lint/suspicious/noControlCharactersInRegex: intentional ASCII range check // eslint-disable-next-line no-control-regex return path.replace(/\s|[^\u0000-\u007F]/gu, encodeURIComponent) From f2ff324b7a70e0634d9e2bcc354a7c4675bc2688 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:07 +0200 Subject: [PATCH 021/175] refactor(react-router): one key set and one assembly path for Link props (#8401) The client and the server each kept their own copy of the 35 option names: the client as an object-rest destructure, the server as a Set. The two paths then assembled the result differently, with an eleven-spread external return and a fourteen-entry literal on the client and a fill-in-place sequence on the server. Both now share two helpers. `collectElementProps` copies every option the router does not consume, using one `ROUTER_OPTION_KEYS` set plus the two host rules (`Link` hosts never render `type`, an anchor has no `disabled`). `applyLinkState` finishes a router-controlled link: the selected state props, then the routing attributes and the merged class and style. It is the one place that defines precedence and absorbs `resolveStateProps`. The client adds its composed handlers between the two; the server adds nothing. External links return the collected props with `ref` and `href`. Element props therefore pass through as given instead of being stripped and re-added: external links forward them verbatim, falsy values included, and `useLinkProps` returns `children` for router-controlled links as it already did for external ones. Class and style are assigned only when the link or its state props provide one, so links without them carry no `undefined` keys and empty strings are still dropped. Measurements (macOS arm64, Node 24.8.0, local, against the previous commit): - react-router.minimal gzip 86019 -> 85984 (-35); -28 against the stack base, which this branch previously exceeded by 7. - Link client paired runner (3 repeats): shared-params CPU -13.8%, unique-params -11.4%, middleware -8.6%, encoding -13.2%, active -16.9%, all "faster". A 35-key object rest costs about 440 ns per call, the key set copy about 50 ns. - Link SSR paired runner (6 repeats): +0.4% to +1.5%, inside the runner's +/-4% noise floor measured head-against-head. SSR bundle 189850 -> 189523. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/brisk-links-serve.md | 2 + packages/react-router/src/link.tsx | 296 +++++++++++------------------ 2 files changed, 110 insertions(+), 188 deletions(-) diff --git a/.changeset/brisk-links-serve.md b/.changeset/brisk-links-serve.md index 504fd9414a..7b24280f24 100644 --- a/.changeset/brisk-links-serve.md +++ b/.changeset/brisk-links-serve.md @@ -6,3 +6,5 @@ Keep the Link location cache out of server bundles: `buildLocation` only creates, reads and writes it when `isServer` is false. Render React Links on the server without the extra prop copies and the forwarded-ref hook. Link SSR rendering is 20-40% faster in the Link benchmarks and the React Start SSR request loop about 7% faster. React `activeProps` and `inactiveProps` now follow one precedence rule on every link, including links whose destination is blocked for using a disallowed scheme: state props override element props, `ref` and event handlers, while `href`, `disabled` and `target` stay controlled by the router. Previously a blocked link ignored a `ref` or handler from its inactive props. + +React `Link` and `useLinkProps` split router options from element props with one key set on the client and the server. Element props pass through as given: external links forward them verbatim, falsy values included, and `useLinkProps` now returns `children` for router-controlled links as it already did for external ones. diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index b0006cb009..35d602ad83 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -194,50 +194,26 @@ function useLinkPropsFor< const innerRef = useForwardedRef(forwardedRef) const { - // custom props - activeProps, - inactiveProps, activeOptions, to: toOption, preload: userPreload, preloadDelay: userPreloadDelay, - preloadIntentProximity: _preloadIntentProximity, hashScrollIntoView, replace, startTransition, resetScroll, viewTransition, - // element props - children, - target, + ignoreBlocker, disabled, - style, - className, + target, onClick, onBlur, onFocus, onMouseEnter, onMouseLeave, onTouchStart, - ignoreBlocker, - // prevent these from being returned - params: _params, - search: _search, - hash: _hash, - state: _state, - mask: _mask, - reloadDocument: _reloadDocument, - unsafeRelative: _unsafeRelative, - from: _from, - _fromLocation, - _asChild: _asChildOption, - type, - ...propsSafeToSpread - } = options as typeof options & { _asChild?: unknown } + } = options const to = toOption as string | undefined - if (host === undefined && type !== undefined) { - ;(propsSafeToSpread as Record).type = type - } // eslint-disable-next-line react-hooks/rules-of-hooks const isHydrated = useHydrated() @@ -392,28 +368,14 @@ function useLinkPropsFor< } }, [doPreload, preload]) + const props = collectElementProps(options, host) + props.ref = innerRef + // External links get no router behavior: element props pass through as given. if (externalLink) { - return { - ...propsSafeToSpread, - ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], - href: externalLink, - ...(children && { children }), - ...(target && { target }), - ...(disabled && host !== 'a' && { disabled }), - ...(style && { style }), - ...(className && { className }), - ...(onClick && { onClick }), - ...(onBlur && { onBlur }), - ...(onFocus && { onFocus }), - ...(onMouseEnter && { onMouseEnter }), - ...(onMouseLeave && { onMouseLeave }), - ...(onTouchStart && { onTouchStart }), - } + props.href = externalLink + return props } - const [resolvedStateProps, resolvedClassName, resolvedStyle] = - resolveStateProps(isActive, activeProps, inactiveProps, className, style) - // The click handler const handleClick = (e: React.MouseEvent) => { // Check actual element's target attribute as fallback @@ -456,36 +418,30 @@ function useLinkPropsFor< } } - return { - ...propsSafeToSpread, - ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], - onClick: composeHandlers(onClick, handleClick), - onBlur: composeHandlers(onBlur, handleLeave), - onFocus: composeHandlers(onFocus, enqueuePreload), - onMouseEnter: composeHandlers(onMouseEnter, enqueuePreload), - onMouseLeave: composeHandlers(onMouseLeave, handleLeave), - onTouchStart: composeHandlers(onTouchStart, handleTouchStart), - // State props override element props, `ref` and handlers, but never the - // routing attributes below. - ...resolvedStateProps, - href, - ...(host !== 'a' && { disabled: !!linkDisabled }), - target, - ...(resolvedStyle && { style: resolvedStyle }), - ...(resolvedClassName && { className: resolvedClassName }), - ...(linkDisabled && STATIC_DISABLED_PROPS), - ...(isActive && STATIC_ACTIVE_PROPS), - } + props.onClick = composeHandlers(onClick, handleClick) + props.onBlur = composeHandlers(onBlur, handleLeave) + props.onFocus = composeHandlers(onFocus, enqueuePreload) + props.onMouseEnter = composeHandlers(onMouseEnter, enqueuePreload) + props.onMouseLeave = composeHandlers(onMouseLeave, handleLeave) + props.onTouchStart = composeHandlers(onTouchStart, handleTouchStart) + return applyLinkState(props, options, isActive, href, linkDisabled, host) } const STATIC_EMPTY_OBJECT = {} const STATIC_ACTIVE_OBJECT = { className: 'active' } -// Options consumed by the router and never forwarded to the element. -const LINK_OPTION_KEYS = /* @__PURE__ */ new Set([ - 'activeProps', - 'inactiveProps', - 'activeOptions', +// Options the router consumes; they never reach the element. Every other +// option is an element prop and passes through. +const ROUTER_OPTION_KEYS = /* @__PURE__ */ new Set([ 'to', + 'params', + 'search', + 'hash', + 'state', + 'mask', + 'from', + 'unsafeRelative', + '_fromLocation', + 'reloadDocument', 'preload', 'preloadDelay', 'preloadIntentProximity', @@ -494,101 +450,100 @@ const LINK_OPTION_KEYS = /* @__PURE__ */ new Set([ 'startTransition', 'resetScroll', 'viewTransition', - 'children', - 'target', - 'disabled', - 'style', - 'className', - 'onClick', - 'onBlur', - 'onFocus', - 'onMouseEnter', - 'onMouseLeave', - 'onTouchStart', 'ignoreBlocker', - 'params', - 'search', - 'hash', - 'state', - 'mask', - 'reloadDocument', - 'unsafeRelative', - 'from', - '_fromLocation', + 'activeProps', + 'inactiveProps', + 'activeOptions', '_asChild', ]) -const STATIC_DISABLED_PROPS = { role: 'link', 'aria-disabled': true } as const -const STATIC_ACTIVE_PROPS = { - 'data-status': 'active', - 'aria-current': 'page', -} as const -// Only one state contributes props; merge its class and style with the base ones. -function resolveStateProps( +// Copies the element props. An object rest would test every key against the +// whole exclusion list; the key set is much cheaper. `Link` hosts never render +// `type`, and an anchor has no `disabled` attribute. +function collectElementProps( + options: object, + host: 'a' | React.ElementType | undefined, +): Record { + const props: Record = {} + for (const key in options) { + if ( + ROUTER_OPTION_KEYS.has(key) || + (key === 'type' && host !== undefined) || + (key === 'disabled' && host === 'a') + ) { + continue + } + props[key] = (options as Record)[key] + } + return props +} + +// Finishes a router-controlled link: the selected state props, then the +// routing attributes. This is the one place that defines precedence: state +// props override element props, `ref` and handlers; `href`, `disabled`, +// `target` and the merged class and style always win. +function applyLinkState( + props: Record, + options: { + activeProps?: unknown + inactiveProps?: unknown + className?: string + style?: React.CSSProperties + target?: string + }, isActive: boolean | undefined, - activeProps: unknown, - inactiveProps: unknown, - className: string | undefined, - style: React.CSSProperties | undefined, -): [ - stateProps: React.HTMLAttributes, - className: string | undefined, - style: React.CSSProperties | undefined, -] { + href: string | undefined, + linkDisabled: boolean, + host: 'a' | React.ElementType | undefined, +): React.ComponentPropsWithRef<'a'> { + const { activeProps, inactiveProps, className, style, target } = options const stateProps: React.HTMLAttributes = functionalUpdate((isActive ? activeProps : inactiveProps) as any, {}) ?? (isActive ? STATIC_ACTIVE_OBJECT : STATIC_EMPTY_OBJECT) - const stateClassName = stateProps.className + Object.assign(props, stateProps) + props.href = href + if (host !== 'a') { + props.disabled = linkDisabled + } + props.target = target + // Merge class and style with the state's. Assign only when one side gave a + // value, so links without them do not carry `undefined` keys. const stateStyle = stateProps.style - return [ - stateProps, - className + if (style !== undefined || stateStyle !== undefined) { + props.style = + style && stateStyle ? { ...style, ...stateStyle } : style || stateStyle + } + const stateClassName = stateProps.className + if (className !== undefined || stateClassName !== undefined) { + props.className = className ? stateClassName ? `${className} ${stateClassName}` : className - : stateClassName, - style && stateStyle ? { ...style, ...stateStyle } : style || stateStyle, - ] + : stateClassName + } + if (linkDisabled) { + props.role = 'link' + props['aria-disabled'] = true + } + if (isActive) { + props['data-status'] = 'active' + props['aria-current'] = 'page' + } + return props } -// Server render of a Link: static props only. This reads the few options it -// needs directly and splits the element props with a key set. V8 checks every -// key of an object rest against the whole exclusion list, which made that -// split the most expensive part of rendering a Link on the server. Only -// server bundles keep this function and the key sets. +// Server render of a Link: static props only, no hooks. Only server bundles +// keep this function; the `isServer` check that calls it folds away on the client. function getServerLinkProps( router: AnyRouter, options: any, forwardedRef: React.ForwardedRef | undefined, host: 'a' | React.ElementType | undefined, ): React.ComponentPropsWithRef<'a'> { - const { - to, - disabled, - activeProps, - inactiveProps, - activeOptions, - children, - target, - style, - className, - } = options as { + const { to, disabled, activeOptions } = options as { to: string | undefined disabled: boolean | undefined - activeProps: unknown - inactiveProps: unknown activeOptions: ActiveOptions | undefined - children: ReactNode - target: string | undefined - style: React.CSSProperties | undefined - className: string | undefined - } - // `Link` additionally never renders a `type` attribute. - const props: Record = {} - for (const key in options) { - if (!LINK_OPTION_KEYS.has(key) && (key !== 'type' || host === undefined)) { - props[key] = options[key] - } } const directExternalLink = resolveExternalLink(to, router.protocolAllowlist) @@ -607,26 +562,10 @@ function getServerLinkProps( directExternalLink ?? (hrefOption && getUrlScheme(hrefOption) ? hrefOption : undefined) - // Assignments below mirror the client's spread order, so props keep the - // same precedence and the rendered attribute order stays identical. + const props = collectElementProps(options, host) + props.ref = forwardedRef if (externalLink) { - props.ref = forwardedRef props.href = externalLink - if (children) { - props.children = children - } - if (target) { - props.target = target - } - if (disabled && host !== 'a') { - props.disabled = disabled - } - if (style) { - props.style = style - } - if (className) { - props.className = className - } return props } @@ -642,33 +581,14 @@ function getServerLinkProps( router.basepath, false, ) - const [resolvedStateProps, resolvedClassName, resolvedStyle] = - resolveStateProps(isActive, activeProps, inactiveProps, className, style) - - // State props override element props and `ref`, but never the routing - // attributes assigned below. - props.ref = forwardedRef - Object.assign(props, resolvedStateProps) - props.href = hrefOption - if (host !== 'a') { - props.disabled = !!linkDisabled - } - props.target = target - if (resolvedStyle) { - props.style = resolvedStyle - } - if (resolvedClassName) { - props.className = resolvedClassName - } - if (linkDisabled) { - props.role = 'link' - props['aria-disabled'] = true - } - if (isActive) { - props['data-status'] = 'active' - props['aria-current'] = 'page' - } - return props + return applyLinkState( + props, + options, + isActive, + hrefOption, + linkDisabled, + host, + ) } const timeoutMap = new WeakMap>() From d740d8bf2d4633d6588ab3c5ff2bb2237df3765c Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:07 +0200 Subject: [PATCH 022/175] perf(react-router): fewer hooks per Link (#8404) A Link render ran about 25 hook slots. React allocates a hook object per slot per render, plus a deps array for every memo, callback and effect, so the slots set both the re-render cost and the retained fiber memory of a mounted Link. Five of them did not need to exist: - The three `useValueStable` refs for `search`, `params` and `activeOptions` become one `useStableValues` ref that replaces each entry only when its own contents change, so identities behave exactly as before. - `_options` and its `dest` copy come out of one memo instead of two. - `doPreload` is a module function, `preloadLink(router, options)`; the callback existed only to give the effects a stable identity. - The IntersectionObserver effect and the render-preload effect merge into one preload effect whose cleanup also cancels a pending intent timer, as the observer hook's cleanup did. `useIntersectionObserver` had no other consumer and is removed. `hasRenderFetched` stays: without it a link with an updater-function `search` would preload on every render. Measurements (macOS arm64, Node 24.8.0, local, 200 mounted Links): - retained heap per mounted app 2949 -> 2782 KB (-6%, about -0.8 KB per Link) - mount (router creation + first render) median 2.05 -> 1.90 ms - Link client paired runner (4 repeats): shared-params CPU -3.0% [-5.3, -0.6], active -3.3% [-8.4, 2.1] - react-router.minimal gzip 85984 -> 85968 (-16) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- packages/react-router/src/link.tsx | 104 +++++++++++++++++------------ packages/react-router/src/utils.ts | 53 --------------- 2 files changed, 60 insertions(+), 97 deletions(-) diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 35d602ad83..eca94ab56f 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -13,7 +13,7 @@ import { import { isServer } from '@tanstack/router-core/isServer' import { useRouter } from './useRouter' -import { useForwardedRef, useIntersectionObserver } from './utils' +import { useForwardedRef } from './utils' import { useHydrated } from './ClientOnly' import type { @@ -35,13 +35,14 @@ import type { // Keep that classification with the href instead of parsing it again on render. type LinkState = [href: string | undefined, isActive?: boolean] -// Keep a referentially stable value while the contents are equal. Links +// Keep referentially stable values while their contents are equal. Links // routinely pass inline `params` / `search` object literals, which would // otherwise change `_options` identity on every parent render, rebuild the -// store selector, and discard its memoized selection. +// store selector, and discard its memoized selection. One ref holds all of +// them; each entry is replaced only when its own contents change. // // The router reuses a built location for as long as it sees the same options -// object, so the reference returned here is its invalidation signal: pass a +// object, so the references returned here are its invalidation signal: pass a // new object to change a destination. Like every other React prop, an object // mutated in place is not re-read. `deepEqual` short-circuits on reference // equality, so an unchanged reference costs nothing. @@ -49,12 +50,22 @@ type LinkState = [href: string | undefined, isActive?: boolean] // `ignoreUndefined: false` is required: an explicit `undefined` clears an // inherited param or search key, so `{}` and `{ category: undefined }` build // different locations and must not be treated as equal here. -function useValueStable(value: T): T { - const ref = React.useRef(value) - if (!deepEqual(ref.current, value, { ignoreUndefined: false })) { - ref.current = value - } - return ref.current +function useStableValues>(...values: T): T { + const ref = React.useRef>(values) + const stable = ref.current as Array + values.forEach((value, index) => { + if (!deepEqual(stable[index], value, { ignoreUndefined: false })) { + stable[index] = value + } + }) + return ref.current as T +} + +function preloadLink(router: AnyRouter, options: unknown) { + router.preloadRoute(options as any).catch((err) => { + console.warn(err) + console.warn(preloadWarning) + }) } function compareLinkState(a: LinkState, b: LinkState) { @@ -219,14 +230,17 @@ function useLinkPropsFor< const isHydrated = useHydrated() // eslint-disable-next-line react-hooks/rules-of-hooks - const stableSearch = useValueStable(options.search) + const [stableSearch, stableParams, stableActiveOptions] = useStableValues( + options.search, + options.params, + activeOptions, + ) + // `_options` is the options object from the render that last changed the + // destination. `dest` is its copy that the link owns: one stable object per + // link lets the router reuse location-independent results. // eslint-disable-next-line react-hooks/rules-of-hooks - const stableParams = useValueStable(options.params) - // eslint-disable-next-line react-hooks/rules-of-hooks - const stableActiveOptions = useValueStable(activeOptions) - // eslint-disable-next-line react-hooks/rules-of-hooks - const _options = React.useMemo( - () => options, + const [_options, dest] = React.useMemo( + () => [options, { ...options } as any] as const, // eslint-disable-next-line react-hooks/exhaustive-deps [ router, @@ -241,9 +255,6 @@ function useLinkPropsFor< options.unsafeRelative, ], ) - // One stable object per link lets the router reuse location-independent results. - // eslint-disable-next-line react-hooks/rules-of-hooks - const dest = React.useMemo(() => ({ ..._options }) as any, [_options]) // Derive inside the selector so `compareLinkState` can bail out. Deriving after // the subscription instead re-renders every link on every navigation, because @@ -304,16 +315,8 @@ function useLinkPropsFor< const preloadDelay = userPreloadDelay ?? router.options.defaultPreloadDelay ?? 0 - // eslint-disable-next-line react-hooks/rules-of-hooks - const doPreload = React.useCallback(() => { - // `preloadRoute` builds the location itself; it is no longer held in render - // state. It only reads the options, so `_options` can go through as-is. - router.preloadRoute(_options as any).catch((err) => { - console.warn(err) - console.warn(preloadWarning) - }) - }, [router, _options]) - + // `preloadRoute` builds the location itself and only reads the options, so + // `_options` goes through as-is. // eslint-disable-next-line react-hooks/rules-of-hooks const enqueuePreload = React.useCallback( (e?: React.MouseEvent | React.FocusEvent | IntersectionObserverEntry) => { @@ -335,7 +338,7 @@ function useLinkPropsFor< } if (!preloadDelay) { - doPreload() + preloadLink(router, _options) return } @@ -347,26 +350,38 @@ function useLinkPropsFor< innerRef, setTimeout(() => { timeoutMap.delete(innerRef) - doPreload() + preloadLink(router, _options) }, preloadDelay), ) }, - [doPreload, innerRef, preload, preloadDelay], + [router, _options, innerRef, preload, preloadDelay], ) - // eslint-disable-next-line react-hooks/rules-of-hooks - useIntersectionObserver(innerRef, enqueuePreload, preload !== 'viewport') - + // Preload side effects: `render` preloads once per link, `viewport` watches + // the element. The cleanup also cancels a pending intent timer. // eslint-disable-next-line react-hooks/rules-of-hooks React.useEffect(() => { - if (hasRenderFetched.current) { - return - } - if (preload === 'render') { - doPreload() + if (preload === 'render' && !hasRenderFetched.current) { hasRenderFetched.current = true + preloadLink(router, _options) } - }, [doPreload, preload]) + let observer: IntersectionObserver | undefined + if ( + preload === 'viewport' && + innerRef.current && + typeof IntersectionObserver === 'function' + ) { + observer = new IntersectionObserver( + (entries) => enqueuePreload(entries.pop()), + { rootMargin: '100px' }, + ) + observer.observe(innerRef.current) + } + return () => { + observer?.disconnect() + enqueuePreload() + } + }, [router, _options, preload, enqueuePreload, innerRef]) const props = collectElementProps(options, host) props.ref = innerRef @@ -408,8 +423,9 @@ function useLinkPropsFor< } const handleTouchStart = () => { - if (preload !== 'intent') return - doPreload() + if (preload === 'intent') { + preloadLink(router, _options) + } } const handleLeave = () => { diff --git a/packages/react-router/src/utils.ts b/packages/react-router/src/utils.ts index b650e34388..f3a0351d6e 100644 --- a/packages/react-router/src/utils.ts +++ b/packages/react-router/src/utils.ts @@ -58,59 +58,6 @@ export function usePrevious(value: T): T | null { return ref.current.prev } -/** - * React hook to wrap `IntersectionObserver`. - * - * This hook will create an `IntersectionObserver` and observe the ref passed to it. - * - * When the intersection changes, the callback will be called with the `IntersectionObserverEntry`. - * - * @param ref - The ref to observe - * @param callback - The callback to call when the intersection changes - * @param disabled - Whether observation is disabled - * @returns The IntersectionObserver instance - * @example - * ```tsx - * const MyComponent = () => { - * const ref = React.useRef(null) - * useIntersectionObserver( - * ref, - * (entry) => { doSomething(entry) }, - * false - * ) - * return
- * ``` - */ -export function useIntersectionObserver( - ref: React.RefObject, - callback: (entry?: IntersectionObserverEntry) => void, - disabled?: boolean, -) { - React.useEffect(() => { - if ( - !ref.current || - disabled || - typeof IntersectionObserver !== 'function' - ) { - return () => callback() - } - - const observer = new IntersectionObserver( - (entries) => { - callback(entries.pop()) - }, - { rootMargin: '100px' }, - ) - - observer.observe(ref.current) - - return () => { - observer.disconnect() - callback() - } - }, [callback, disabled, ref]) -} - /** * React hook to take a `React.ForwardedRef` and returns a `ref` that can be used on a DOM element. * From 92719bd5861e703188ab963a83cdf917a846c5c6 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:07 +0200 Subject: [PATCH 023/175] perf(react-router): memoize Link and forward refs without an effect (#8405) * perf(react-router): memoize Link and forward refs without an effect When a layout re-renders on navigation, for instance because it reads `useLocation`, every Link below it re-renders too. Profiling 200 mounted Links showed that re-render dominated by React's per-hook update work, the element creation and the anchor's prop diff, not by the Link's own logic. A Link's output depends only on its props, the router context and the location store, all of which React tracks for memoized components, so `Link` is now wrapped in `React.memo`. Router options are compared by value, because destinations are usually inline object literals; element props are compared by reference, since they may hold arbitrary, even cyclic, user data. The comparator reuses `ROUTER_OPTION_KEYS`. The memo adds one fiber per Link. To pay for it, `useForwardedRef` goes: its `useImperativeHandle` was the only layout effect on a Link and ran for every Link although most never receive a ref. The link keeps a plain `useRef`; when a ref is forwarded, one callback fills both. The hook had no other consumer. `enqueuePreload` no longer doubles as the cleanup path: the preload effect cancels the intent timer directly. Measurements (macOS arm64, Node 24.8.0, local, against the previous commit): - Link client paired runner, 200 Links under a re-rendering layout (3 repeats): shared-params CPU -54%, masks -56%, rewrites -60%; links whose props can never compare equal (updater functions, inline `activeProps` functions) param-updaters +2.5% [-5.2, 10.9], location-updaters -1.0%, active -2.0%, all inconclusive. - retained heap per mounted app 2782 -> 2738 KB; mount unchanged within noise (the memo fiber and the removed layout effect cancel out). - react-router.minimal gzip 85968 -> 86008 (+40); the branch stays 4 bytes under the stack base. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * fix(react-router): memoize the Link's merged ref callback The merged ref that fills a forwarded ref alongside the link's own ref was an inline closure, so every Link render produced a new callback and React detached and re-attached it: a consumer's callback ref was called with `null` and then the element again on each location-driven re-render (3 calls after one navigation instead of 1), and an object ref was cleared and refilled inside the commit. `useImperativeHandle(ref, ..., [])` on main only re-ran when the consumer's ref changed. The callback is now memoized with `useCallback` on the forwarded ref, which restores that contract: the consumer is notified on mount, when their ref changes and on unmount. A cleanup returned by a consumer callback is still passed through to React. Nothing reads `innerRef.current` after a detach without a re-attach, so the wrapper that would clear it on cleanup is left out (+19 gzip for no observable behavior). `areLinkPropsEqual` keeps the same rule but states it in two steps, since the nested condition read as if `children` were deep-compared: element props (`children`, handlers, `style`, ...) only match by reference, and only router options fall through to `deepEqual`. Tests pin all three: a stable callback ref stays at one call across a location change and is released when swapped, a returned cleanup runs on unmount instead of a `null` call, and a new JSX child or a cyclic element prop re-renders the Link instead of being compared deeply. The ref test fails on the previous commit with `expected 1 call, got 3`. Measurements (local: macOS arm64, Node 24.8.0, production React 19.2.3): - `react-router.minimal` gzip 86008 -> 86004 (-4). The comparator restructure alone is -2; `useCallback` without the cleanup wrapper is neutral, the wrapper would have been +19. - Mount of the 200-Link benchmark app, medians of 60 runs: 4.97 ms with `useImperativeHandle` (main's mechanism on top of this branch), 4.71 ms with the inline callback, 4.69 ms memoized. Retained heap per mounted app: -23 KB against `useImperativeHandle` (its layout effect keeps an effect node, a bound function and two deps arrays per fiber pair). - Paired client runner, 3 repeats, memoized vs `useImperativeHandle`: 12/13 workloads inconclusive, `rewrites` -4.6% [-9.0, -0.2]. Memoized vs the inline callback: +2.5% [1.4, 3.7] on `param-updaters` and +1.4% [0.4, 2.5] on `relative`, where every Link re-renders per navigation and pays the extra hook; the other 11 workloads are inconclusive. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- packages/react-router/src/link.tsx | 109 +++++++---- packages/react-router/src/utils.ts | 19 -- .../react-router/tests/link-memo.test.tsx | 175 ++++++++++++++++++ 3 files changed, 249 insertions(+), 54 deletions(-) create mode 100644 packages/react-router/tests/link-memo.test.tsx diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index eca94ab56f..0116b1893c 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -13,8 +13,6 @@ import { import { isServer } from '@tanstack/router-core/isServer' import { useRouter } from './useRouter' -import { useForwardedRef } from './utils' - import { useHydrated } from './ClientOnly' import type { ActiveOptions, @@ -68,8 +66,8 @@ function preloadLink(router: AnyRouter, options: unknown) { }) } -function compareLinkState(a: LinkState, b: LinkState) { - return a[0] === b[0] && a[1] === b[1] +const LINK_SELECTOR_OPTIONS = { + compare: (a: LinkState, b: LinkState) => a[0] === b[0] && a[1] === b[1], } function resolveExternalLink( @@ -201,12 +199,31 @@ function useLinkPropsFor< // 3. In client bundles, `isServer` is `false`, so the early return never executes // ========================================================================== + // The link's own ref: the element for the viewport observer and the key + // of a pending intent timer. A forwarded ref is filled alongside it by one + // callback, memoized on the forwarded ref so React re-attaches it (and + // notifies the consumer) only when their ref changes, not on every render. + // A cleanup returned by a consumer callback is passed through to React. // eslint-disable-next-line react-hooks/rules-of-hooks - const innerRef = useForwardedRef(forwardedRef) + const innerRef = React.useRef(null) + // eslint-disable-next-line react-hooks/rules-of-hooks + const mergedRef = React.useCallback( + (element: Element | null) => { + innerRef.current = element + if (typeof forwardedRef === 'function') { + return forwardedRef(element) + } + if (forwardedRef) { + forwardedRef.current = element + } + return undefined + }, + [forwardedRef], + ) const { activeOptions, - to: toOption, + to, preload: userPreload, preloadDelay: userPreloadDelay, hashScrollIntoView, @@ -223,8 +240,7 @@ function useLinkPropsFor< onMouseEnter, onMouseLeave, onTouchStart, - } = options - const to = toOption as string | undefined + } = options as typeof options & { to?: string } // eslint-disable-next-line react-hooks/rules-of-hooks const isHydrated = useHydrated() @@ -300,7 +316,7 @@ function useLinkPropsFor< const [href, isActive] = useSelector( router.stores.location, selectLinkState, - { compare: compareLinkState }, + LINK_SELECTOR_OPTIONS, ) const externalLink = isActive === undefined ? href : undefined const linkDisabled = disabled || href === undefined @@ -320,18 +336,10 @@ function useLinkPropsFor< // eslint-disable-next-line react-hooks/rules-of-hooks const enqueuePreload = React.useCallback( (e?: React.MouseEvent | React.FocusEvent | IntersectionObserverEntry) => { - if (!e) { - cancelPreload(innerRef) - return - } - - if ( - !( - (e as IntersectionObserverEntry).isIntersecting ?? - preload === 'intent' - ) - ) { - if ((e as IntersectionObserverEntry).isIntersecting === false) { + const isIntersecting = (e as IntersectionObserverEntry | undefined) + ?.isIntersecting + if (!(isIntersecting ?? preload === 'intent')) { + if (isIntersecting === false) { cancelPreload(innerRef) } return @@ -379,12 +387,12 @@ function useLinkPropsFor< } return () => { observer?.disconnect() - enqueuePreload() + cancelPreload(innerRef) } }, [router, _options, preload, enqueuePreload, innerRef]) const props = collectElementProps(options, host) - props.ref = innerRef + props.ref = forwardedRef ? mergedRef : innerRef // External links get no router behavior: element props pass through as given. if (externalLink) { props.href = externalLink @@ -393,11 +401,12 @@ function useLinkPropsFor< // The click handler const handleClick = (e: React.MouseEvent) => { - // Check actual element's target attribute as fallback - const elementTarget = ( - e.currentTarget as HTMLAnchorElement | SVGAElement - ).getAttribute('target') - const effectiveTarget = target !== undefined ? target : elementTarget + // The element's own target attribute is the fallback. + const effectiveTarget = + target ?? + (e.currentTarget as HTMLAnchorElement | SVGAElement).getAttribute( + 'target', + ) if ( !linkDisabled && @@ -522,15 +531,15 @@ function applyLinkState( props.disabled = linkDisabled } props.target = target - // Merge class and style with the state's. Assign only when one side gave a - // value, so links without them do not carry `undefined` keys. + // Merge class and style with the state's. Links without either keep their + // props as given and carry no `undefined` keys. const stateStyle = stateProps.style - if (style !== undefined || stateStyle !== undefined) { + if (style || stateStyle) { props.style = style && stateStyle ? { ...style, ...stateStyle } : style || stateStyle } const stateClassName = stateProps.className - if (className !== undefined || stateClassName !== undefined) { + if (className || stateClassName) { props.className = className ? stateClassName ? `${className} ${stateClassName}` @@ -808,8 +817,8 @@ export function createLink( * @returns An anchor-like element that navigates without full page reloads. * @link https://tanstack.com/router/latest/docs/framework/react/api/router/linkComponent */ -export const Link: LinkComponent<'a'> = React.forwardRef( - (props, ref) => { +export const Link: LinkComponent<'a'> = React.memo( + React.forwardRef((props, ref) => { const host = props._asChild || 'a' const linkProps = useLinkPropsFor(props as any, ref, host) @@ -821,9 +830,39 @@ export const Link: LinkComponent<'a'> = React.forwardRef( : props.children return React.createElement(host, linkProps, children) - }, + }), + areLinkPropsEqual, ) as any +// A Link's output depends only on its props, the router context and the +// location store, which React tracks for memoized components, so a parent +// re-render with equal props can skip it. Router options are compared by +// value: destinations are usually inline object literals. Element props +// (`children`, handlers, `style`, ...) are compared by reference only, since +// they may hold arbitrary (even cyclic) data. +function areLinkPropsEqual( + prev: Record, + next: Record, +): boolean { + let extraKeys = 0 + for (const key in next) { + extraKeys++ + if (prev[key] === next[key]) { + continue + } + if ( + !ROUTER_OPTION_KEYS.has(key) || + !deepEqual(prev[key], next[key], { ignoreUndefined: false }) + ) { + return false + } + } + for (const _key in prev) { + extraKeys-- + } + return extraKeys === 0 +} + export type LinkOptionsFnOptions< TOptions, TComp, diff --git a/packages/react-router/src/utils.ts b/packages/react-router/src/utils.ts index f3a0351d6e..7887761993 100644 --- a/packages/react-router/src/utils.ts +++ b/packages/react-router/src/utils.ts @@ -57,22 +57,3 @@ export function usePrevious(value: T): T | null { // return the previous value only return ref.current.prev } - -/** - * React hook to take a `React.ForwardedRef` and returns a `ref` that can be used on a DOM element. - * - * @param ref - The forwarded ref - * @returns The inner ref returned by `useRef` - * @example - * ```tsx - * const MyComponent = React.forwardRef((props, ref) => { - * const innerRef = useForwardedRef(ref) - * return
- * }) - * ``` - */ -export function useForwardedRef(ref?: React.ForwardedRef) { - const innerRef = React.useRef(null) - React.useImperativeHandle(ref, () => innerRef.current!, []) - return innerRef -} diff --git a/packages/react-router/tests/link-memo.test.tsx b/packages/react-router/tests/link-memo.test.tsx new file mode 100644 index 0000000000..873bbf9e7a --- /dev/null +++ b/packages/react-router/tests/link-memo.test.tsx @@ -0,0 +1,175 @@ +import React from 'react' +import { act, cleanup, render } from '@testing-library/react' +import { afterEach, expect, test, vi } from 'vitest' +import { + Link, + RouterContextProvider, + createLink, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, +} from '../src' + +afterEach(cleanup) + +async function createPostsRouter() { + const root = createRootRoute() + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/posts/$postId' }), + ]), + history: createMemoryHistory({ initialEntries: ['/posts/1'] }), + }) + await router.load() + return router +} + +test('a parent re-render with equal props does not re-render the Link', async () => { + let hostRenders = 0 + const Host = React.forwardRef>( + (props, ref) => { + hostRenders++ + return + }, + ) + const CustomLink = createLink(Host) + const router = await createPostsRouter() + + let rerender = () => {} + let setPostId: React.Dispatch> = () => {} + function Parent() { + const [, setTick] = React.useState(0) + const [postId, set] = React.useState(1) + rerender = () => setTick((tick) => tick + 1) + setPostId = set + return ( + + + Post + + + ) + } + const view = render() + const anchor = view.getByText('Post') + expect(anchor).toHaveAttribute('href', '/posts/1') + expect(anchor).toHaveClass('current') + const rendersAfterMount = hostRenders + + // Same props, new inline objects: the memoized Link is skipped. + act(() => rerender()) + expect(hostRenders).toBe(rendersAfterMount) + + // A changed destination renders again. + act(() => setPostId(2)) + expect(hostRenders).toBe(rendersAfterMount + 1) + expect(anchor).toHaveAttribute('href', '/posts/2') + expect(anchor).not.toHaveClass('current') +}) + +test('element props are compared by reference: new children re-render, a cyclic prop does not throw', async () => { + let hostRenders = 0 + const Host = React.forwardRef< + HTMLAnchorElement, + React.ComponentProps<'a'> & { payload?: object } + >(({ payload: _payload, ...props }, ref) => { + hostRenders++ + return + }) + const CustomLink = createLink(Host) + const router = await createPostsRouter() + + let rerender = () => {} + function Parent() { + const [, setTick] = React.useState(0) + rerender = () => setTick((tick) => tick + 1) + // A new cyclic object per render: deep-comparing it would never return. + const cyclic: Record = {} + cyclic.self = cyclic + return ( + + + Post + + + ) + } + render() + expect(hostRenders).toBe(1) + + // Equal router options, but `children` is a new element and `payload` a + // new object, so the Link renders again instead of comparing them deeply. + act(() => rerender()) + expect(hostRenders).toBe(2) +}) + +test('a forwarded callback ref is notified once per element, not per Link render', async () => { + const router = await createPostsRouter() + const ref = vi.fn<(element: HTMLAnchorElement | null) => void>() + + const view = render( + + + Post + + , + ) + const anchor = view.getByText('Post') + expect(ref.mock.calls).toEqual([[anchor]]) + expect(anchor).toHaveAttribute('data-status', 'active') + + // A location change re-renders the Link (it is no longer active) without + // detaching and re-attaching the consumer's ref. + await act(() => + router.navigate({ to: '/posts/$postId', params: { postId: '2' } }), + ) + expect(anchor).not.toHaveAttribute('data-status') + expect(ref).toHaveBeenCalledTimes(1) + + // A different ref is attached to the same element; the old one is released. + const next = vi.fn<(element: HTMLAnchorElement | null) => void>() + view.rerender( + + + Post + + , + ) + expect(ref.mock.calls).toEqual([[anchor], [null]]) + expect(next.mock.calls).toEqual([[anchor]]) + + view.unmount() + expect(next.mock.calls).toEqual([[anchor], [null]]) +}) + +test('a cleanup returned by a forwarded callback ref runs on unmount', async () => { + const router = await createPostsRouter() + const cleanup = vi.fn() + const ref = vi.fn((_element: HTMLAnchorElement | null) => cleanup) + + const view = render( + + + Post + + , + ) + const anchor = view.getByText('Post') + expect(ref.mock.calls).toEqual([[anchor]]) + expect(cleanup).not.toHaveBeenCalled() + + view.unmount() + // React runs the cleanup instead of calling the ref with `null`. + expect(cleanup).toHaveBeenCalledTimes(1) + expect(ref).toHaveBeenCalledTimes(1) +}) From 1e6d9c8062a92c49f58c1fee8a3161e73ee3fa6b Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:08 +0200 Subject: [PATCH 024/175] perf(router-core): match the current location lazily in buildLocation (#8406) `buildLocation` matched the current location up front for every build, although the result is only read by relative destinations, inherited params, `search: true` or updater functions and search middlewares. An absolute destination with its params given, on a branch without search middlewares, never reads it, yet still paid three store reads and a WeakMap lookup per call. The match is now computed on first read, and the destination template is scanned for `$` once instead of twice. Server `buildLocation` of `/items/$itemId` with params on a middleware-free tree: 399 -> 382 ns per call (-4%). Builds that read the current match are unchanged. react-router.minimal gzip +4 (86008 -> 86012, the stack base). Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- packages/router-core/src/router.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index e97d1e9603..fc2b76d979 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -1928,18 +1928,17 @@ export class RouterCore< const currentLocation = dest._fromLocation || this._pendingLocation || this.latestLocation - // Use lightweight matching - only computes what buildLocation needs - // (fullPath, search, params) without creating full match objects - const lightweight = this.matchRoutesLightweight(currentLocation) - // Value-affecting reads of the current location go through these two. + // The lightweight match (fullPath, search, params without full match + // objects) is only computed when a build actually reads it. + let lightweight: LightweightRouteMatchResult | undefined const current = () => { usedCurrent = true return currentLocation } const currentMatch = () => { usedCurrent = true - return lightweight + return (lightweight ??= this.matchRoutesLightweight(currentLocation)) } // check that from path exists in the current route tree @@ -1982,10 +1981,11 @@ export class RouterCore< trimPathRight(nextTo) as keyof typeof this.routesByPath ] as AnyRoute | undefined + const isTemplate = nextTo.includes('$') let destRoutes: ReadonlyArray if (destRoute) { destRoutes = destRoute._branch ??= buildRouteBranch(destRoute) - } else if (nextTo.includes('$')) { + } else if (isTemplate) { // Route templates must match routesByPath exactly. A miss here is a // typed destination mismatch, not a concrete URL to route-match. destRoutes = [] @@ -2003,7 +2003,7 @@ export class RouterCore< } // One parsed template serves both trailing-slash variants. - const interpolation = nextTo.includes('$') + const interpolation = isTemplate ? (destRoute?._interpolation ?? parseSegments(false, { fullPath: nextTo }, 0)) : undefined From bc57fa3f12450cf34c731450947c7c8f1ea05e58 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 13 Sep 2026 13:55:08 +0200 Subject: [PATCH 025/175] fix(router-core): review follow-ups for Link stack (#8410) * chore(benchmarks): remove TSR_LINK_PERF opt-in flag The router-core Link/path benchmarks and the react-link-performance project are never part of the CodSpeed matrix or the client-nav/SSR aggregate projects, so the env-var gate only added friction. Rely on standard vitest name filtering (-t) to narrow runs instead. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * fix(router-core): treat 0 and false as provided _splat values Splat interpolation used a falsy check, so _splat: 0 was omitted like a missing param while $id: 0 interpolated to '/0'. Only undefined, null, and '' now omit a splat segment, matching how other path params are stringified. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * test(router-core): use path-derived ids in original-param-names fixtures The matcher only uses route ids as routesById keys and for the pathless '_' check, so unrelated ids worked but never occur in a real router. Align the fixtures with the sibling test file's convention where each id mirrors its fullPath. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * perf(solid-router): shorten conditional Link class and style spreads Spread `cond && { value }` instead of `cond ? { value } : undefined`, matching the neighbouring `active && STATIC_ACTIVE_ATTRIBUTES` spread. Falsy operands spread to nothing, so the emitted props are unchanged. Measured with the bundle-size benchmark on solid-router.full: gzip 39205 -> 39198 (-7), raw -12, brotli -33. Covered by the existing `six-adults-open` changeset. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * test(router-core): drop the unused server axis from interpolatePath tests The `interpolatePath (server: $server)` block never read its `server` argument since interpolation stopped taking a server flag, so it ran every case twice under a misleading label. The remaining diff is re-indentation; review with `git show -w`. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * test(router-core): interpolate paths through the production API in tests `interpolateTestPath` only survived as a compatibility layer from the segment-reuse refactor: it emulated the removed `(path, params, decoder, usedParams, keys, metadata)` signature by parsing the template, re-implementing the param-name loop and folding `hasMissingPathParams` into a metadata flag. Call the real functions instead. Tests now parse templates with `parseSegments(false, { fullPath }, 0)` exactly like `buildLocation` does for templates without a processed route, pass the segments to `interpolatePath`, and read names and availability from `getParamNames` and `hasMissingPathParams`. The prepared-route tests compare route-owned segments against that standalone parse directly, and the interpolation bench derives its reference values the same way. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/quiet-zeros-stay.md | 5 + benchmarks/client-nav/README.md | 18 +- .../link-performance/config.test.ts | 83 +- .../client-nav/link-performance/config.ts | 4 +- .../link-performance/stable-runner.ts | 4 - benchmarks/ssr/README.md | 5 +- packages/router-core/src/path.ts | 9 +- .../tests/lightweight-location.bench.ts | 111 ++- .../tests/matching-interpolation.bench.ts | 153 ++- .../tests/optional-path-params-clean.test.ts | 112 +-- .../tests/optional-path-params.test.ts | 9 +- .../tests/original-param-names.test.ts | 20 +- .../router-core/tests/path-decoder.bench.ts | 112 ++- .../tests/path-interpolation.bench.ts | 31 +- packages/router-core/tests/path.test.ts | 893 +++++++++--------- .../tests/route-interpolation.test.ts | 53 +- .../tests/route-tree-construction.bench.ts | 106 +-- packages/router-core/tests/routerTestUtils.ts | 26 +- packages/solid-router/src/link.tsx | 4 +- 19 files changed, 852 insertions(+), 906 deletions(-) create mode 100644 .changeset/quiet-zeros-stay.md diff --git a/.changeset/quiet-zeros-stay.md b/.changeset/quiet-zeros-stay.md new file mode 100644 index 0000000000..13ec72d8d3 --- /dev/null +++ b/.changeset/quiet-zeros-stay.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Treat `0` and `false` as provided `_splat` values when interpolating paths. Only `undefined`, `null`, and `''` now omit a splat segment, matching how other path params are stringified. diff --git a/benchmarks/client-nav/README.md b/benchmarks/client-nav/README.md index 76e3d3e238..c8ebbf06bc 100644 --- a/benchmarks/client-nav/README.md +++ b/benchmarks/client-nav/README.md @@ -123,7 +123,7 @@ construction. `scenarios/mount` includes construction but also rendering and loading. To isolate initialization, use the core construction benchmark: ```bash -TSR_LINK_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @tanstack/router-core:test:unit --outputStyle=stream --skipRemoteCache -- bench tests/route-tree-construction.bench.ts --run --testNamePattern=1000.routes --outputJson /tmp/route-tree-construction.json +CI=1 NX_DAEMON=false pnpm nx run @tanstack/router-core:test:unit --outputStyle=stream --skipRemoteCache -- bench tests/route-tree-construction.bench.ts --run --testNamePattern=1000.routes --outputJson /tmp/route-tree-construction.json ``` It covers 100, 1,000, and 10,000 static, dynamic, nested, or mixed routes. @@ -138,16 +138,16 @@ router or repeatedly initialized tree is not a construction baseline. `link-performance/` contains additional client-navigation and SSR workloads for focused Link work. They are **not included** in the regular client-nav/SSR -aggregate projects or their CodSpeed build dependencies. Benchmark discovery -also requires `TSR_LINK_PERF=1`; without it, no extended benchmark files or app -bundles are imported. +aggregate projects or their CodSpeed build dependencies; they only run through +the dedicated `@benchmarks/react-link-performance` targets below. Use `-t` to +narrow a run to specific cases. ```bash -TSR_LINK_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:client --outputStyle=stream --skipRemoteCache -- --run -TSR_LINK_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:ssr --outputStyle=stream --skipRemoteCache -- --run +CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:client --outputStyle=stream --skipRemoteCache -- --run +CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:ssr --outputStyle=stream --skipRemoteCache -- --run # Select a feature and save the normal Vitest JSON report. -TSR_LINK_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:client --outputStyle=stream --skipRemoteCache -- --run -t "updater|optional|splat" --outputJson /tmp/link-perf.json +CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:client --outputStyle=stream --skipRemoteCache -- --run -t "updater|optional|splat" --outputJson /tmp/link-perf.json ``` The cases cover repeated versus unique destination params, updater functions, @@ -203,12 +203,12 @@ harness loader does not transpile their emitted JavaScript a second time. ```bash # Build the baseline using these same benchmark sources in its own checkout. # --baseline points to that checkout's link-performance/dist directory. -TSR_LINK_PERF=1 pnpm nx run @benchmarks/react-link-performance:test:perf:stable -- \ +pnpm nx run @benchmarks/react-link-performance:test:perf:stable -- \ --baseline /path/to/baseline/benchmarks/client-nav/link-performance/dist \ --outputJson /tmp/paired-links.json # Narrow a comparison, or increase independent process repetitions. -TSR_LINK_PERF=1 pnpm nx run @benchmarks/react-link-performance:test:perf:stable -- \ +pnpm nx run @benchmarks/react-link-performance:test:perf:stable -- \ --baseline /path/to/baseline/benchmarks/client-nav/link-performance/dist \ --mode ssr -t "middleware|unique-params" --repeats 6 \ --outputJson /tmp/paired-links-ssr.json diff --git a/benchmarks/client-nav/link-performance/config.test.ts b/benchmarks/client-nav/link-performance/config.test.ts index 3f2624677f..1a468a3169 100644 --- a/benchmarks/client-nav/link-performance/config.test.ts +++ b/benchmarks/client-nav/link-performance/config.test.ts @@ -3,55 +3,40 @@ import { createLinkPerformanceConfig } from './config' afterEach(() => vi.unstubAllEnvs()) -describe.each(['client', 'ssr'] as const)( - '%s opt-in configuration', - (target) => { - test.each([undefined, '', '0', 'false'])( - 'does not discover benchmarks with TSR_LINK_PERF=%s', - (value) => { - vi.stubEnv('TSR_LINK_PERF', value) - const config = createLinkPerformanceConfig(target) - expect(config.test?.benchmark?.include).toEqual([]) - expect(config.test?.passWithNoTests).toBe(true) - }, +describe.each(['client', 'ssr'] as const)('%s configuration', (target) => { + test('discovers only the requested suite', () => { + const config = createLinkPerformanceConfig(target) + expect(config.test?.benchmark?.include).toEqual([`${target}.bench.ts`]) + }) + + test('builds production code for the correct environment', () => { + const config = createLinkPerformanceConfig(target) + expect(config.define?.['process.env.NODE_ENV']).toBe('"production"') + expect(config.resolve?.conditions).toContain( + target === 'ssr' ? 'node' : 'browser', ) + expect(config.build?.ssr).toBe(target === 'ssr') + expect(config.build?.outDir).toBe(`./dist/${target}`) + expect(config.build?.rolldownOptions?.platform).toBe('node') + expect(config.build?.rolldownOptions?.external).toEqual([ + 'node:module', + 'module', + /^react(?:\/|$)/, + /^react-dom(?:\/|$)/, + ]) + }) - test('discovers only the requested suite when explicitly enabled', () => { - vi.stubEnv('TSR_LINK_PERF', '1') - const config = createLinkPerformanceConfig(target) - expect(config.test?.benchmark?.include).toEqual([`${target}.bench.ts`]) - expect(config.test?.passWithNoTests).toBe(false) - }) + test('does not retransform built bundles in the test environment', () => { + vi.stubEnv('VITEST', 'true') + const config = createLinkPerformanceConfig(target) + expect(config.ssr?.noExternal).toBeUndefined() + expect(config.test?.server?.deps?.external).toEqual([ + /\/link-performance\/dist\//, + ]) + }) - test('builds production code for the correct environment', () => { - const config = createLinkPerformanceConfig(target) - expect(config.define?.['process.env.NODE_ENV']).toBe('"production"') - expect(config.resolve?.conditions).toContain( - target === 'ssr' ? 'node' : 'browser', - ) - expect(config.build?.ssr).toBe(target === 'ssr') - expect(config.build?.outDir).toBe(`./dist/${target}`) - expect(config.build?.rolldownOptions?.platform).toBe('node') - expect(config.build?.rolldownOptions?.external).toEqual([ - 'node:module', - 'module', - /^react(?:\/|$)/, - /^react-dom(?:\/|$)/, - ]) - }) - - test('does not retransform built bundles in the test environment', () => { - vi.stubEnv('VITEST', 'true') - const config = createLinkPerformanceConfig(target) - expect(config.ssr?.noExternal).toBeUndefined() - expect(config.test?.server?.deps?.external).toEqual([ - /\/link-performance\/dist\//, - ]) - }) - - test('bundles router dependencies when building app snapshots', () => { - vi.stubEnv('VITEST', undefined) - expect(createLinkPerformanceConfig(target).ssr?.noExternal).toBe(true) - }) - }, -) + test('bundles router dependencies when building app snapshots', () => { + vi.stubEnv('VITEST', undefined) + expect(createLinkPerformanceConfig(target).ssr?.noExternal).toBe(true) + }) +}) diff --git a/benchmarks/client-nav/link-performance/config.ts b/benchmarks/client-nav/link-performance/config.ts index ef5e4f29ca..416b027057 100644 --- a/benchmarks/client-nav/link-performance/config.ts +++ b/benchmarks/client-nav/link-performance/config.ts @@ -9,7 +9,6 @@ export function createLinkPerformanceConfig( target: 'client' | 'ssr', ): UserConfig { const server = target === 'ssr' - const enabled = process.env.TSR_LINK_PERF === '1' return { root, @@ -62,9 +61,8 @@ export function createLinkPerformanceConfig( }, }, include: [], - passWithNoTests: !enabled, benchmark: { - include: enabled ? [`${target}.bench.ts`] : [], + include: [`${target}.bench.ts`], }, }, } diff --git a/benchmarks/client-nav/link-performance/stable-runner.ts b/benchmarks/client-nav/link-performance/stable-runner.ts index 83f63ff6d2..59ccfa3cb4 100644 --- a/benchmarks/client-nav/link-performance/stable-runner.ts +++ b/benchmarks/client-nav/link-performance/stable-runner.ts @@ -159,10 +159,6 @@ async function sampleReplica( } async function main() { - if (process.env.TSR_LINK_PERF !== '1') { - console.log('Link performance sampling is disabled; set TSR_LINK_PERF=1.') - return - } const { values } = parseArgs({ options: { baseline: { type: 'string' }, diff --git a/benchmarks/ssr/README.md b/benchmarks/ssr/README.md index 1f1c232922..3d90af1598 100644 --- a/benchmarks/ssr/README.md +++ b/benchmarks/ssr/README.md @@ -108,9 +108,8 @@ rewrites, and active props. Each timed batch creates four fresh routers and renders their Links to HTML; it does not measure Start HTTP/streaming overhead. ```bash -TSR_LINK_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:ssr --outputStyle=stream --skipRemoteCache -- --run +CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:ssr --outputStyle=stream --skipRemoteCache -- --run ``` These cases are excluded from this directory's aggregate projects and normal -CodSpeed dependency graph. The flag must be explicitly enabled when invoking -the dedicated target. +CodSpeed dependency graph; they only run through the dedicated target above. diff --git a/packages/router-core/src/path.ts b/packages/router-core/src/path.ts index 74247cd0f2..88837db2b1 100644 --- a/packages/router-core/src/path.ts +++ b/packages/router-core/src/path.ts @@ -218,6 +218,11 @@ export function getRouteSegments(route: AnyRoute) { return route._interpolation } +/** A splat is missing when it has no value; `0` and `false` are stringified like any other param. */ +function isMissingSplat(value: unknown): boolean { + return value == null || value === '' +} + /** Devtools checks navigation availability separately from the hot formatter. */ export function hasMissingPathParams( segments: RouteInterpolation, @@ -229,7 +234,7 @@ export function hasMissingPathParams( } const [kind, key] = part return kind === SEGMENT_TYPE_WILDCARD - ? !params[key] + ? isMissingSplat(params[key]) : kind === SEGMENT_TYPE_PARAM && !(key in params) }) } @@ -290,7 +295,7 @@ export function interpolatePath( usedParams['*'] = paramValue } } - if (splat && !paramValue) { + if (splat && isMissingSplat(paramValue)) { // A missing wildcard keeps its affixes, but omits a bare segment. if (prefix === '/' && !suffix) { continue diff --git a/packages/router-core/tests/lightweight-location.bench.ts b/packages/router-core/tests/lightweight-location.bench.ts index a9189801c8..2470f40cc1 100644 --- a/packages/router-core/tests/lightweight-location.bench.ts +++ b/packages/router-core/tests/lightweight-location.bench.ts @@ -3,62 +3,57 @@ import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { createTestRouter } from './routerTestUtils' -if (process.env.TSR_LINK_PERF === '1') { - describe.each([false, true])( - 'cold lightweight locations (server: %s)', - (isServer) => { - for (const count of [1, 8, 32]) { - const root = new BaseRootRoute({}) - const segments = Array.from( - { length: count }, - (_, index) => `$p${index}`, - ) - const source = new BaseRoute({ - getParentRoute: () => root, - path: `/source/${segments.join('/')}`, - }) - const target = new BaseRoute({ - getParentRoute: () => root, - path: '/target', - }) - const history = createMemoryHistory({ initialEntries: ['/'] }) - const router = createTestRouter({ - routeTree: root.addChildren([source, target]), - history, - isServer, - scrollRestoration: false, - }) - history.destroy() - const pathname = `/source/${segments.map((_, index) => String(index)).join('/')}` - const location = { - ...router.latestLocation, - pathname, - href: pathname, - publicHref: pathname, - } - let checksum = 0 - const iterations = 256 - function run() { - checksum = 0 - for (let index = 0; index < iterations; index++) { - checksum += router.buildLocation({ - to: '/target', - params: true, - _fromLocation: { ...location }, - }).pathname.length - } - } - run() - expect(checksum).toBe(iterations * '/target'.length) - bench(`${count} source params`, run, { - time: 1000, - warmupTime: 200, - throws: true, - teardown: () => { - expect(checksum).toBe(iterations * '/target'.length) - }, - }) +describe.each([false, true])( + 'cold lightweight locations (server: %s)', + (isServer) => { + for (const count of [1, 8, 32]) { + const root = new BaseRootRoute({}) + const segments = Array.from({ length: count }, (_, index) => `$p${index}`) + const source = new BaseRoute({ + getParentRoute: () => root, + path: `/source/${segments.join('/')}`, + }) + const target = new BaseRoute({ + getParentRoute: () => root, + path: '/target', + }) + const history = createMemoryHistory({ initialEntries: ['/'] }) + const router = createTestRouter({ + routeTree: root.addChildren([source, target]), + history, + isServer, + scrollRestoration: false, + }) + history.destroy() + const pathname = `/source/${segments.map((_, index) => String(index)).join('/')}` + const location = { + ...router.latestLocation, + pathname, + href: pathname, + publicHref: pathname, } - }, - ) -} + let checksum = 0 + const iterations = 256 + function run() { + checksum = 0 + for (let index = 0; index < iterations; index++) { + checksum += router.buildLocation({ + to: '/target', + params: true, + _fromLocation: { ...location }, + }).pathname.length + } + } + run() + expect(checksum).toBe(iterations * '/target'.length) + bench(`${count} source params`, run, { + time: 1000, + warmupTime: 200, + throws: true, + teardown: () => { + expect(checksum).toBe(iterations * '/target'.length) + }, + }) + } + }, +) diff --git a/packages/router-core/tests/matching-interpolation.bench.ts b/packages/router-core/tests/matching-interpolation.bench.ts index 8932897ec2..f86cd0b87e 100644 --- a/packages/router-core/tests/matching-interpolation.bench.ts +++ b/packages/router-core/tests/matching-interpolation.bench.ts @@ -39,85 +39,82 @@ const cases = [ }, ] -// Opt in explicitly; these extra cases are not part of default CI benchmarks. -if (process.env.TSR_LINK_PERF === '1') { - for (const server of [false, true]) { - for (const primeLinks of [false, true]) { - describe(`matching interpolation (server: ${server}, Link-primed: ${primeLinks})`, () => { - for (const scenario of cases) { - const root = new BaseRootRoute({}) - let parent: AnyRoute = root - for (const path of scenario.segments) { - const parentRoute = parent - const route = new BaseRoute({ - getParentRoute: () => parentRoute, - path, - }) - parent.addChildren([route]) - parent = route - } - const history = createMemoryHistory({ initialEntries: ['/'] }) - const router = createTestRouter({ - routeTree: root, - history, - isServer: server, - scrollRestoration: false, +for (const server of [false, true]) { + for (const primeLinks of [false, true]) { + describe(`matching interpolation (server: ${server}, Link-primed: ${primeLinks})`, () => { + for (const scenario of cases) { + const root = new BaseRootRoute({}) + let parent: AnyRoute = root + for (const path of scenario.segments) { + const parentRoute = parent + const route = new BaseRoute({ + getParentRoute: () => parentRoute, + path, }) - history.destroy() - const options = { _controller: new AbortController() } - - for (const path of scenario.paths) { - router.getMatchedRoutes(path) - } - if (primeLinks) { - const paths = scenario.misses - ? scenario.paths - .slice(0, 32) - .map((path) => path.replace('item%20', 'cached%20')) - : scenario.paths - for (const path of paths) { - const [routes, params] = router.getMatchedRoutes(path) - for (const route of routes) { - const to: string = route.fullPath - if (to.includes('$')) { - router.buildLocation({ to, params }) - } - } - } - } - - let expected = 0 - for (const path of scenario.paths) { - const matches = router.matchRoutes(path, {}, options) - expect(matches.at(-1)?.routeId).toBe(parent.id) - for (const match of matches) { - expect(match.paramsError).toBeUndefined() - expected += - match.id.length + Object.keys(match._strictParams).length - } - } - let checksum = 0 - bench( - scenario.name, - () => { - let length = 0 - for (const path of scenario.paths) { - for (const match of router.matchRoutes(path, {}, options)) { - length += - match.id.length + Object.keys(match._strictParams).length - } - } - checksum = length - }, - { - time: 1000, - warmupTime: 300, - throws: true, - teardown: () => expect(checksum).toBe(expected), - }, - ) + parent.addChildren([route]) + parent = route } - }) - } + const history = createMemoryHistory({ initialEntries: ['/'] }) + const router = createTestRouter({ + routeTree: root, + history, + isServer: server, + scrollRestoration: false, + }) + history.destroy() + const options = { _controller: new AbortController() } + + for (const path of scenario.paths) { + router.getMatchedRoutes(path) + } + if (primeLinks) { + const paths = scenario.misses + ? scenario.paths + .slice(0, 32) + .map((path) => path.replace('item%20', 'cached%20')) + : scenario.paths + for (const path of paths) { + const [routes, params] = router.getMatchedRoutes(path) + for (const route of routes) { + const to: string = route.fullPath + if (to.includes('$')) { + router.buildLocation({ to, params }) + } + } + } + } + + let expected = 0 + for (const path of scenario.paths) { + const matches = router.matchRoutes(path, {}, options) + expect(matches.at(-1)?.routeId).toBe(parent.id) + for (const match of matches) { + expect(match.paramsError).toBeUndefined() + expected += + match.id.length + Object.keys(match._strictParams).length + } + } + let checksum = 0 + bench( + scenario.name, + () => { + let length = 0 + for (const path of scenario.paths) { + for (const match of router.matchRoutes(path, {}, options)) { + length += + match.id.length + Object.keys(match._strictParams).length + } + } + checksum = length + }, + { + time: 1000, + warmupTime: 300, + throws: true, + teardown: () => expect(checksum).toBe(expected), + }, + ) + } + }) } } diff --git a/packages/router-core/tests/optional-path-params-clean.test.ts b/packages/router-core/tests/optional-path-params-clean.test.ts index 2e2db43496..36ed96f227 100644 --- a/packages/router-core/tests/optional-path-params-clean.test.ts +++ b/packages/router-core/tests/optional-path-params-clean.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' +import { interpolatePath } from '../src/path' import { - interpolateTestPath as interpolatePath, parseTestPathname as parsePathname, processTestRouteTree as processRouteTree, } from './routerTestUtils' @@ -9,6 +9,7 @@ import { SEGMENT_TYPE_PATHNAME, SEGMENT_TYPE_WILDCARD, findSingleMatch, + parseSegments, } from '../src/new-process-route-tree' describe('Optional Path Parameters - Clean Comprehensive Tests', () => { @@ -51,44 +52,40 @@ describe('Optional Path Parameters - Clean Comprehensive Tests', () => { describe('interpolatePath', () => { it('should interpolate optional dynamic params when present', () => { - const result = interpolatePath('/posts/{-$category}', { - category: 'tech', - }) - expect(result).toBe('/posts/tech') + const path = '/posts/{-$category}' + const segments = parseSegments(false, { fullPath: path }, 0) + expect(interpolatePath(path, segments, { category: 'tech' })).toBe( + '/posts/tech', + ) }) it('should omit optional dynamic params when missing', () => { - const result = interpolatePath('/posts/{-$category}', {}) - expect(result).toBe('/posts') + const path = '/posts/{-$category}' + const segments = parseSegments(false, { fullPath: path }, 0) + expect(interpolatePath(path, segments, {})).toBe('/posts') }) it('should handle multiple optional dynamic params', () => { - const result1 = interpolatePath('/posts/{-$category}/{-$slug}', { - category: 'tech', - slug: 'hello', - }) - expect(result1).toBe('/posts/tech/hello') - - const result2 = interpolatePath('/posts/{-$category}/{-$slug}', { - category: 'tech', - }) - expect(result2).toBe('/posts/tech') - - const result3 = interpolatePath('/posts/{-$category}/{-$slug}', {}) - expect(result3).toBe('/posts') + const path = '/posts/{-$category}/{-$slug}' + const segments = parseSegments(false, { fullPath: path }, 0) + expect( + interpolatePath(path, segments, { category: 'tech', slug: 'hello' }), + ).toBe('/posts/tech/hello') + expect(interpolatePath(path, segments, { category: 'tech' })).toBe( + '/posts/tech', + ) + expect(interpolatePath(path, segments, {})).toBe('/posts') }) it('should handle mixed required and optional dynamic params', () => { - const result = interpolatePath('/posts/{-$category}/user/$id', { - category: 'tech', - id: '123', - }) - expect(result).toBe('/posts/tech/user/123') - - const result2 = interpolatePath('/posts/{-$category}/user/$id', { - id: '123', - }) - expect(result2).toBe('/posts/user/123') + const path = '/posts/{-$category}/user/$id' + const segments = parseSegments(false, { fullPath: path }, 0) + expect( + interpolatePath(path, segments, { category: 'tech', id: '123' }), + ).toBe('/posts/tech/user/123') + expect(interpolatePath(path, segments, { id: '123' })).toBe( + '/posts/user/123', + ) }) }) @@ -161,41 +158,46 @@ describe('Optional Path Parameters - Clean Comprehensive Tests', () => { describe('Edge Cases', () => { it('should handle optional params with wildcards', () => { - const result = interpolatePath('/docs/{-$version}/$', { - version: 'v1', - _splat: 'guide/intro', - }) - expect(result).toBe('/docs/v1/guide/intro') - - const result2 = interpolatePath('/docs/{-$version}/$', { - _splat: 'guide/intro', - }) - expect(result2).toBe('/docs/guide/intro') + const path = '/docs/{-$version}/$' + const segments = parseSegments(false, { fullPath: path }, 0) + expect( + interpolatePath(path, segments, { + version: 'v1', + _splat: 'guide/intro', + }), + ).toBe('/docs/v1/guide/intro') + expect(interpolatePath(path, segments, { _splat: 'guide/intro' })).toBe( + '/docs/guide/intro', + ) }) it('should work with complex patterns', () => { const pattern = '/app/{-$env}/api/{-$version}/users/$id/{-$tab}' + const segments = parseSegments(false, { fullPath: pattern }, 0) // All params provided - const result1 = interpolatePath(pattern, { - env: 'prod', - version: 'v2', - id: '123', - tab: 'settings', - }) - expect(result1).toBe('/app/prod/api/v2/users/123/settings') + expect( + interpolatePath(pattern, segments, { + env: 'prod', + version: 'v2', + id: '123', + tab: 'settings', + }), + ).toBe('/app/prod/api/v2/users/123/settings') // Only required param - const result2 = interpolatePath(pattern, { id: '123' }) - expect(result2).toBe('/app/api/users/123') + expect(interpolatePath(pattern, segments, { id: '123' })).toBe( + '/app/api/users/123', + ) // Mix of optional and required - const result3 = interpolatePath(pattern, { - env: 'dev', - id: '456', - tab: 'profile', - }) - expect(result3).toBe('/app/dev/api/users/456/profile') + expect( + interpolatePath(pattern, segments, { + env: 'dev', + id: '456', + tab: 'profile', + }), + ).toBe('/app/dev/api/users/456/profile') }) }) }) diff --git a/packages/router-core/tests/optional-path-params.test.ts b/packages/router-core/tests/optional-path-params.test.ts index d9f669f7ea..4d3c2ee76e 100644 --- a/packages/router-core/tests/optional-path-params.test.ts +++ b/packages/router-core/tests/optional-path-params.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' +import { interpolatePath } from '../src/path' import { - interpolateTestPath as interpolatePath, parseTestPathname as parsePathname, processTestRouteTree as processRouteTree, } from './routerTestUtils' @@ -10,6 +10,7 @@ import { SEGMENT_TYPE_PATHNAME, SEGMENT_TYPE_WILDCARD, findSingleMatch, + parseSegments, } from '../src/new-process-route-tree' import type { SegmentKind } from '../src/new-process-route-tree' @@ -343,7 +344,8 @@ describe('Optional Path Parameters', () => { result: '/posts/42', }, ])('$name', ({ path, params, result }) => { - expect(interpolatePath(path, params)).toBe(result) + const segments = parseSegments(false, { fullPath: path }, 0) + expect(interpolatePath(path, segments, params)).toBe(result) }) }) @@ -472,8 +474,9 @@ describe('Optional Path Parameters', () => { it('should handle optional parameters with validation', () => { // This test will be expanded when we implement params.parse for optional params const path = '/posts/{-$category}' + const segments = parseSegments(false, { fullPath: path }, 0) const params = { category: 'tech' } - expect(interpolatePath(path, params)).toBe('/posts/tech') + expect(interpolatePath(path, segments, params)).toBe('/posts/tech') }) it('should handle multiple consecutive optional parameters correctly', () => { diff --git a/packages/router-core/tests/original-param-names.test.ts b/packages/router-core/tests/original-param-names.test.ts index e94e0ff412..aca4c61ae4 100644 --- a/packages/router-core/tests/original-param-names.test.ts +++ b/packages/router-core/tests/original-param-names.test.ts @@ -13,8 +13,12 @@ test('keeps original names when different templates share a trie prefix', () => isRoot: true, fullPath: '/', children: [ - { id: '/first', path: '$id/first', fullPath: '/$id/first' }, - { id: '/second', path: '{$name}/second', fullPath: '/{$name}/second' }, + { id: '/$id/first', path: '$id/first', fullPath: '/$id/first' }, + { + id: '/{$name}/second', + path: '{$name}/second', + fullPath: '/{$name}/second', + }, ], }).processedTree expect(findRouteMatch('/one/first', tree)?.rawParams).toEqual({ id: 'one' }) @@ -23,20 +27,20 @@ test('keeps original names when different templates share a trie prefix', () => }) }) -test('keeps a terminal route names when a later alias adds a parser', () => { +test("keeps a terminal route's names when a later alias adds a parser", () => { const tree = processRouteTree({ id: '__root__', isRoot: true, fullPath: '/', children: [ - { id: '/first', path: '$id/detail', fullPath: '/$id/detail' }, + { id: '/$id/detail', path: '$id/detail', fullPath: '/$id/detail' }, { - id: '/alias', + id: '/$name', path: '$name', fullPath: '/$name', children: [ { - id: '/alias/detail', + id: '/$name/detail', path: 'detail', fullPath: '/$name/detail', options: { @@ -48,7 +52,7 @@ test('keeps a terminal route names when a later alias adds a parser', () => { ], }).processedTree const match = findRouteMatch('/abc/detail', tree) - expect(match?.route.id).toBe('/first') + expect(match?.route.id).toBe('/$id/detail') expect(match?.rawParams).toEqual({ id: 'abc' }) }) @@ -76,7 +80,7 @@ test('resumes through a route-less parse gate with skipped optional names', () = }, children: [ { - id: '/leaf', + id: '/$id/_layout/{-$lang}/$slug', path: '{-$lang}/$slug', fullPath: '/$id/{-$lang}/$slug', }, diff --git a/packages/router-core/tests/path-decoder.bench.ts b/packages/router-core/tests/path-decoder.bench.ts index 05971c30f6..23060b33be 100644 --- a/packages/router-core/tests/path-decoder.bench.ts +++ b/packages/router-core/tests/path-decoder.bench.ts @@ -3,61 +3,59 @@ import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { createTestRouter } from './routerTestUtils' -if (process.env.TSR_LINK_PERF === '1') { - describe.each(['stable', 'new-router', 'no-update'] as const)( - 'path decoder: %s configuration', - (mode) => { - const makeRouter = (allowed: ReadonlyArray<'@' | '+'>) => { - const root = new BaseRootRoute({}) - const item = new BaseRoute({ - getParentRoute: () => root, - path: '/items/$id', - }) - const router = createTestRouter({ - routeTree: root.addChildren([item]), - history: createMemoryHistory({ initialEntries: ['/'] }), - pathParamsAllowedCharacters: allowed, - scrollRestoration: false, - }) - router.history.destroy() - return router - } - let router = makeRouter(['@']) - const inputs = Array.from({ length: 200 }, (_, index) => ({ - to: '/items/$id', - params: { id: `item-${index % 40}@+` }, - })) - let count = 0 - let lastHref = '' - const run = () => { - count++ - if (mode === 'new-router') { - router = makeRouter(count % 2 === 0 ? ['+'] : ['@']) - } else if (mode === 'stable') { - router.update({ - ...router.options, - context: { count }, - }) - } - for (const input of inputs) { - lastHref = router.buildLocation(input).href - } - } - const verify = () => { - expect(lastHref).toBe( - mode === 'new-router' && count % 2 === 0 - ? '/items/item-39%40+' - : '/items/item-39@%2B', - ) - } - run() - verify() - bench('update and build 200 locations', run, { - time: 1500, - warmupTime: 500, - throws: true, - teardown: verify, +describe.each(['stable', 'new-router', 'no-update'] as const)( + 'path decoder: %s configuration', + (mode) => { + const makeRouter = (allowed: ReadonlyArray<'@' | '+'>) => { + const root = new BaseRootRoute({}) + const item = new BaseRoute({ + getParentRoute: () => root, + path: '/items/$id', }) - }, - ) -} + const router = createTestRouter({ + routeTree: root.addChildren([item]), + history: createMemoryHistory({ initialEntries: ['/'] }), + pathParamsAllowedCharacters: allowed, + scrollRestoration: false, + }) + router.history.destroy() + return router + } + let router = makeRouter(['@']) + const inputs = Array.from({ length: 200 }, (_, index) => ({ + to: '/items/$id', + params: { id: `item-${index % 40}@+` }, + })) + let count = 0 + let lastHref = '' + const run = () => { + count++ + if (mode === 'new-router') { + router = makeRouter(count % 2 === 0 ? ['+'] : ['@']) + } else if (mode === 'stable') { + router.update({ + ...router.options, + context: { count }, + }) + } + for (const input of inputs) { + lastHref = router.buildLocation(input).href + } + } + const verify = () => { + expect(lastHref).toBe( + mode === 'new-router' && count % 2 === 0 + ? '/items/item-39%40+' + : '/items/item-39@%2B', + ) + } + run() + verify() + bench('update and build 200 locations', run, { + time: 1500, + warmupTime: 500, + throws: true, + teardown: verify, + }) + }, +) diff --git a/packages/router-core/tests/path-interpolation.bench.ts b/packages/router-core/tests/path-interpolation.bench.ts index 0f6840752d..53498b5198 100644 --- a/packages/router-core/tests/path-interpolation.bench.ts +++ b/packages/router-core/tests/path-interpolation.bench.ts @@ -7,7 +7,7 @@ import { BaseRootRoute, BaseRoute } from '../src' import { compileDecodeCharMap, interpolatePath } from '../src/path' import { parseSegments } from '../src/new-process-route-tree' import { decodePath } from '../src/utils' -import { createTestRouter, interpolateTestPath } from './routerTestUtils' +import { createTestRouter } from './routerTestUtils' import type { AnyRoute } from '../src' import type { PathInterpolationTestOptions } from './routerTestUtils' @@ -146,6 +146,15 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { scrollRestoration: false, }) router.history.destroy() + // Reference values come from a fresh standalone parse, independent of any + // route-owned segments under test. + const referencePathname = (input: PathInterpolationTestOptions) => + interpolatePath( + input.path, + parseSegments(false, { fullPath: input.path }, 0), + input.params, + input.decoder, + ) // Mirrors how buildLocation turns a template into a canonical pathname. const canonicalPathname = ( path: string, @@ -168,27 +177,11 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { path: input.path, params: input.params, route: register ? routes.get(input.path) : undefined, - expected: decodePath( - interpolateTestPath( - input.path, - input.params, - input.decoder, - undefined, - undefined, - ), - ), + expected: decodePath(referencePathname(input)), })) let checksum = 0 const expected = inputs.reduce( - (sum, input) => - sum + - interpolateTestPath( - input.path, - input.params, - input.decoder, - undefined, - undefined, - ).length, + (sum, input) => sum + referencePathname(input).length, 0, ) const cachedExpected = calls.reduce((sum, call) => { diff --git a/packages/router-core/tests/path.test.ts b/packages/router-core/tests/path.test.ts index 7d6eed9de7..8dc964bcd6 100644 --- a/packages/router-core/tests/path.test.ts +++ b/packages/router-core/tests/path.test.ts @@ -2,6 +2,8 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import { compileDecodeCharMap, exactPathTest, + hasMissingPathParams, + interpolatePath, removeTrailingSlash, resolvePath, trimPathLeft, @@ -11,11 +13,12 @@ import { SEGMENT_TYPE_PATHNAME, SEGMENT_TYPE_WILDCARD, findSingleMatch, + getParamNames, + parseSegments, } from '../src/new-process-route-tree' import { createSieveCache } from '../src/sieve-cache' import { createTestPathInterpolator as createPathInterpolator, - interpolateTestPath as interpolatePath, parseTestPathname as parsePathname, processTestRouteTree as processRouteTree, } from './routerTestUtils' @@ -81,6 +84,12 @@ describe.each([false, true])( expected: '/files/prefixa/bsuffix', }, { path: '/files/$', params: { _splat: '' }, expected: '/files' }, + { path: '/files/$', params: { _splat: 0 }, expected: '/files/0' }, + { + path: '/files/prefix{$}.txt', + params: { _splat: 0 }, + expected: '/files/prefix0.txt', + }, { path: '/$id/$id/', params: { id: '123' }, @@ -91,9 +100,8 @@ describe.each([false, true])( ({ path, params, expected, normalized }) => { const interpolate = createPathInterpolator({ isServer: server }) const options = { path, params, server } - expect( - interpolatePath(path, params, undefined, undefined, undefined), - ).toBe(expected) + const segments = parseSegments(false, { fullPath: path }, 0) + expect(interpolatePath(path, segments, params)).toBe(expected) expect(interpolate(options)).toBe(normalized ?? expected) expect(interpolate({ ...options, params: { ...params } })).toBe( normalized ?? expected, @@ -231,18 +239,18 @@ describe.each([false, true])( const usedParams: Record = Object.create(null) interpolatePath( '/posts/{-$category}', + parseSegments(false, { fullPath: '/posts/{-$category}' }, 0), {}, undefined, usedParams, - undefined, ) expect(usedParams).toEqual({}) interpolatePath( '/files/$', + parseSegments(false, { fullPath: '/files/$' }, 0), { _splat: 'docs/guide' }, undefined, usedParams, - undefined, ) expect(usedParams).toEqual({ _splat: 'docs/guide', @@ -278,25 +286,15 @@ describe.each([false, true])( 'keeps mixed segment metadata in one pass for $params', ({ params, path, used, missing }) => { const template = '/root/prefix{$id}suffix/{-$language}/files/{$}.txt' + const segments = parseSegments(false, { fullPath: template }, 0) const usedParams: Record = Object.create(null) - const keys: Array = [] - const metadata = { isMissingParams: false } expect( - interpolatePath( - template, - params, - undefined, - usedParams, - keys, - metadata, - ), + interpolatePath(template, segments, params, undefined, usedParams), ).toBe(path) - expect(keys).toEqual(['id', 'language', '_splat']) + expect(getParamNames(segments)).toEqual(['id', 'language', '_splat']) expect(usedParams).toEqual(used) - expect(metadata.isMissingParams).toBe(missing) - expect( - interpolatePath(template, params, undefined, undefined, undefined), - ).toBe(path) + expect(hasMissingPathParams(segments, params)).toBe(missing) + expect(interpolatePath(template, segments, params)).toBe(path) }, ) @@ -339,20 +337,13 @@ describe.each([false, true])( ])( 'preserves missing-param metadata for $path with $params', ({ path, params, pathname, usedParams, missing }) => { + const segments = parseSegments(false, { fullPath: path }, 0) const collectedParams: Record = Object.create(null) - const metadata = { isMissingParams: false } expect( - interpolatePath( - path, - params, - undefined, - collectedParams, - undefined, - metadata, - ), + interpolatePath(path, segments, params, undefined, collectedParams), ).toBe(pathname) expect(collectedParams).toEqual(usedParams) - expect(metadata.isMissingParams).toBe(missing) + expect(hasMissingPathParams(segments, params)).toBe(missing) }, ) @@ -662,465 +653,447 @@ describe('resolvePath', () => { }) }) -describe.each([{ server: true }, { server: false }])( - 'interpolatePath (server: $server)', - ({ server }) => { - it.each(['value', '', undefined])( - 'stops interpolation at a bare splat with value %s', - (_splat) => { - const params = { - _splat, - get ignored() { - throw new Error('A bare splat consumes the rest of the template') - }, - } - const used: Record = Object.create(null) - const keys: Array = [] - expect( - interpolatePath('/files/$/$ignored', params, undefined, used, keys), - ).toBe(_splat ? '/files/value' : '/files') - expect(keys).toEqual(['_splat']) - expect(used).toEqual({ _splat, '*': _splat }) - }, - ) - - it.each([ - { path: '/', expected: '/' }, - { path: '/about/', expected: '/about/' }, - ])('preserves static paths: $path', ({ path, expected }) => { +describe('interpolatePath', () => { + it.each(['value', '', undefined])( + 'stops interpolation at a bare splat with value %s', + (_splat) => { const params = { - get unused() { - throw new Error('Static paths must not read params') + _splat, + get ignored() { + throw new Error('A bare splat consumes the rest of the template') }, } - const decoder = vi.fn() - const usedParams: Record = Object.create(null) - const keys: Array = [] - const metadata = { isMissingParams: false } + const segments = parseSegments( + false, + { fullPath: '/files/$/$ignored' }, + 0, + ) + const used: Record = Object.create(null) expect( - interpolatePath(path, params, decoder, usedParams, keys, metadata), - ).toBe(expected) - expect(usedParams).toEqual({}) - expect(keys).toEqual([]) - expect(metadata.isMissingParams).toBe(false) - expect(decoder).not.toHaveBeenCalled() - }) + interpolatePath('/files/$/$ignored', segments, params, undefined, used), + ).toBe(_splat ? '/files/value' : '/files') + expect(getParamNames(segments)).toEqual(['_splat']) + expect(used).toEqual({ _splat, '*': _splat }) + }, + ) + it.each([ + { path: '/', expected: '/' }, + { path: '/about/', expected: '/about/' }, + ])('preserves static paths: $path', ({ path, expected }) => { + const params = { + get unused() { + throw new Error('Static paths must not read params') + }, + } + const segments = parseSegments(false, { fullPath: path }, 0) + const decoder = vi.fn() + const usedParams: Record = Object.create(null) + expect(interpolatePath(path, segments, params, decoder, usedParams)).toBe( + expected, + ) + expect(usedParams).toEqual({}) + expect(getParamNames(segments)).toEqual([]) + expect(hasMissingPathParams(segments, params)).toBe(false) + expect(decoder).not.toHaveBeenCalled() + }) + + it.each([ + { + path: '/users/$id', + params: {}, + expected: '/users/undefined', + missing: true, + }, + { + path: '/users/$id', + params: { id: 'one' }, + expected: '/users/one', + missing: false, + }, + { + path: '/posts/{-$category}', + params: {}, + expected: '/posts', + missing: false, + }, + { path: '/files/$', params: {}, expected: '/files', missing: true }, + ])( + 'collects only missing status for $path', + ({ path, params, expected, missing }) => { + const segments = parseSegments(false, { fullPath: path }, 0) + expect(interpolatePath(path, segments, params)).toBe(expected) + expect(hasMissingPathParams(segments, params)).toBe(missing) + }, + ) + + describe('regular usage', () => { it.each([ { + name: 'should interpolate the path', path: '/users/$id', - params: {}, - expected: '/users/undefined', - missing: true, + params: { id: '123' }, + result: '/users/123', }, { + name: 'should interpolate the path', path: '/users/$id', - params: { id: 'one' }, - expected: '/users/one', - missing: false, + params: { id: '123_' }, + result: '/users/123_', }, { - path: '/posts/{-$category}', + name: 'should interpolate the path with multiple params', + path: '/users/$id/$name', + params: { id: '123', name: 'tanner' }, + result: '/users/123/tanner', + }, + { + name: 'should interpolate the path with multiple params', + path: '/users/$id/$name', + params: { id: '123_', name: 'tanner' }, + result: '/users/123_/tanner', + }, + { + name: 'should interpolate the path with extra params', + path: '/users/$id', + params: { id: '123', name: 'tanner' }, + result: '/users/123', + }, + { + name: 'should interpolate the path with missing params', + path: '/users/$id/$name', + params: { id: '123' }, + result: '/users/123/undefined', + }, + { + name: 'should interpolate the path with missing params and extra params', + path: '/users/$id', + params: { name: 'john' }, + result: '/users/undefined', + }, + { + name: 'should interpolate the path with the param being a number', + path: '/users/$id', + params: { id: 123 }, + result: '/users/123', + }, + { + name: 'should interpolate the path with the param being a falsey number', + path: '/users/$id', + params: { id: 0 }, + result: '/users/0', + }, + { + name: 'should interpolate the path with the splat param being a falsey number', + path: '/users/$', + params: { _splat: 0 }, + result: '/users/0', + }, + { + name: 'should interpolate the path with URI component encoding', + path: '/users/$id', + params: { id: '?#@john+smith' }, + result: '/users/%3F%23%40john%2Bsmith', + }, + { + name: 'should interpolate the path without URI encoding characters in decodeCharMap', + path: '/users/$id', + params: { id: '?#@john+smith' }, + result: '/users/%3F%23@john+smith', + decoder: compileDecodeCharMap(['@', '+']), + }, + { + name: 'should interpolate the path with the splat param at the end', + path: '/users/$', + params: { _splat: '123' }, + result: '/users/123', + }, + { + name: 'should interpolate the path with a single named path param and the splat param at the end', + path: '/users/$username/$', + params: { username: 'seancassiere', _splat: '123' }, + result: '/users/seancassiere/123', + }, + { + name: 'should interpolate the path with 2 named path params with the splat param at the end', + path: '/users/$username/$id/$', + params: { username: 'seancassiere', id: '123', _splat: '456' }, + result: '/users/seancassiere/123/456', + }, + { + name: 'should interpolate the path with multiple named path params with the splat param at the end', + path: '/$username/settings/$repo/$id/$', + params: { + username: 'sean-cassiere', + repo: 'my-repo', + id: '123', + _splat: '456', + }, + result: '/sean-cassiere/settings/my-repo/123/456', + }, + { + name: 'should interpolate the path with the splat param containing slashes', + path: '/users/$', + params: { _splat: 'sean/cassiere' }, + result: '/users/sean/cassiere', + }, + ])('$name', ({ path, params, decoder, result }) => { + const segments = parseSegments(false, { fullPath: path }, 0) + expect(interpolatePath(path, segments, params, decoder)).toBe(result) + }) + }) + + describe('preserve trailing slash', () => { + it.each([ + { + path: '/', params: {}, - expected: '/posts', - missing: false, + result: '/', + }, + { + path: '/a/b/', + params: {}, + result: '/a/b/', + }, + { + path: '/a/$id/', + params: { id: '123' }, + result: '/a/123/', + }, + { + path: '/a/{-$id}/', + params: { id: '123' }, + result: '/a/123/', }, - { path: '/files/$', params: {}, expected: '/files', missing: true }, ])( - 'collects only missing status for $path', - ({ path, params, expected, missing }) => { - const metadata = { isMissingParams: false } - expect( - interpolatePath( - path, - params, - undefined, - undefined, - undefined, - metadata, - ), - ).toBe(expected) - expect(metadata.isMissingParams).toBe(missing) + 'should preserve trailing slash for $path', + ({ path, params, result }) => { + const segments = parseSegments(false, { fullPath: path }, 0) + expect(interpolatePath(path, segments, params)).toBe(result) }, ) + }) - describe('regular usage', () => { - it.each([ - { - name: 'should interpolate the path', - path: '/users/$id', - params: { id: '123' }, - result: '/users/123', - }, - { - name: 'should interpolate the path', - path: '/users/$id', - params: { id: '123_' }, - result: '/users/123_', - }, - { - name: 'should interpolate the path with multiple params', - path: '/users/$id/$name', - params: { id: '123', name: 'tanner' }, - result: '/users/123/tanner', - }, - { - name: 'should interpolate the path with multiple params', - path: '/users/$id/$name', - params: { id: '123_', name: 'tanner' }, - result: '/users/123_/tanner', - }, - { - name: 'should interpolate the path with extra params', - path: '/users/$id', - params: { id: '123', name: 'tanner' }, - result: '/users/123', - }, - { - name: 'should interpolate the path with missing params', - path: '/users/$id/$name', - params: { id: '123' }, - result: '/users/123/undefined', - }, - { - name: 'should interpolate the path with missing params and extra params', - path: '/users/$id', - params: { name: 'john' }, - result: '/users/undefined', - }, - { - name: 'should interpolate the path with the param being a number', - path: '/users/$id', - params: { id: 123 }, - result: '/users/123', - }, - { - name: 'should interpolate the path with the param being a falsey number', - path: '/users/$id', - params: { id: 0 }, - result: '/users/0', - }, - { - name: 'should interpolate the path with URI component encoding', - path: '/users/$id', - params: { id: '?#@john+smith' }, - result: '/users/%3F%23%40john%2Bsmith', - }, - { - name: 'should interpolate the path without URI encoding characters in decodeCharMap', - path: '/users/$id', - params: { id: '?#@john+smith' }, - result: '/users/%3F%23@john+smith', - decoder: compileDecodeCharMap(['@', '+']), - }, - { - name: 'should interpolate the path with the splat param at the end', - path: '/users/$', - params: { _splat: '123' }, - result: '/users/123', - }, - { - name: 'should interpolate the path with a single named path param and the splat param at the end', - path: '/users/$username/$', - params: { username: 'seancassiere', _splat: '123' }, - result: '/users/seancassiere/123', - }, - { - name: 'should interpolate the path with 2 named path params with the splat param at the end', - path: '/users/$username/$id/$', - params: { username: 'seancassiere', id: '123', _splat: '456' }, - result: '/users/seancassiere/123/456', - }, - { - name: 'should interpolate the path with multiple named path params with the splat param at the end', - path: '/$username/settings/$repo/$id/$', - params: { - username: 'sean-cassiere', - repo: 'my-repo', - id: '123', - _splat: '456', - }, - result: '/sean-cassiere/settings/my-repo/123/456', - }, - { - name: 'should interpolate the path with the splat param containing slashes', - path: '/users/$', - params: { _splat: 'sean/cassiere' }, - result: '/users/sean/cassiere', - }, - ])('$name', ({ path, params, decoder, result }) => { - expect( - interpolatePath(path, params, decoder, undefined, undefined), - ).toBe(result) - }) + describe('wildcard (prefix + suffix)', () => { + it.each([ + { + name: 'regular', + to: '/$', + params: { _splat: 'bar/foo/me' }, + result: '/bar/foo/me', + }, + { + name: 'regular curly braces', + to: '/{$}', + params: { _splat: 'bar/foo/me' }, + result: '/bar/foo/me', + }, + { + name: 'with prefix', + to: '/prefix{$}', + params: { _splat: 'bar' }, + result: '/prefixbar', + }, + { + name: 'with suffix', + to: '/{$}-suffix', + params: { _splat: 'bar' }, + result: '/bar-suffix', + }, + { + name: 'with prefix + suffix', + to: '/prefix{$}-suffix', + params: { _splat: 'bar' }, + result: '/prefixbar-suffix', + }, + ])('$name', ({ to, params, result }) => { + const segments = parseSegments(false, { fullPath: to }, 0) + expect(interpolatePath(to, segments, params)).toBe(result) }) + }) - describe('preserve trailing slash', () => { - it.each([ - { - path: '/', - params: {}, - result: '/', - }, - { - path: '/a/b/', - params: {}, - result: '/a/b/', - }, - { - path: '/a/$id/', - params: { id: '123' }, - result: '/a/123/', - }, - { - path: '/a/{-$id}/', - params: { id: '123' }, - result: '/a/123/', - }, - ])( - 'should preserve trailing slash for $path', - ({ path, params, result }) => { - expect( - interpolatePath(path, params, undefined, undefined, undefined), - ).toBe(result) - }, - ) + describe('splat params with special characters', () => { + it.each([ + { + name: 'should encode spaces in splat param', + path: '/$', + params: { _splat: 'file name.pdf' }, + result: '/file%20name.pdf', + }, + { + name: 'should preserve parentheses in splat param (RFC 3986 unreserved)', + path: '/$', + params: { _splat: 'file(1).pdf' }, + result: '/file(1).pdf', + }, + { + name: 'should encode brackets in splat param', + path: '/$', + params: { _splat: 'file[1].pdf' }, + result: '/file%5B1%5D.pdf', + }, + { + name: 'should encode spaces in nested splat param paths', + path: '/$', + params: { _splat: 'folder/sub folder/file name.pdf' }, + result: '/folder/sub%20folder/file%20name.pdf', + }, + { + name: 'should encode spaces and brackets but preserve parentheses', + path: '/$', + params: { _splat: 'docs/file (copy) [2].pdf' }, + result: '/docs/file%20(copy)%20%5B2%5D.pdf', + }, + { + name: 'should encode hash in splat param', + path: '/$', + params: { _splat: 'page#section' }, + result: '/page%23section', + }, + { + name: 'should handle splat param with prefix and special characters', + path: '/files/prefix{$}', + params: { _splat: 'my file.pdf' }, + result: '/files/prefixmy%20file.pdf', + }, + { + name: 'should encode plus signs in splat param', + path: '/$', + params: { _splat: 'file+name.pdf' }, + result: '/file%2Bname.pdf', + }, + { + name: 'should encode equals signs in splat param', + path: '/$', + params: { _splat: 'query=value' }, + result: '/query%3Dvalue', + }, + ])('$name', ({ path, params, result }) => { + const segments = parseSegments(false, { fullPath: path }, 0) + expect(interpolatePath(path, segments, params)).toBe(result) }) + }) - describe('wildcard (prefix + suffix)', () => { - it.each([ - { - name: 'regular', - to: '/$', - params: { _splat: 'bar/foo/me' }, - result: '/bar/foo/me', - }, - { - name: 'regular curly braces', - to: '/{$}', - params: { _splat: 'bar/foo/me' }, - result: '/bar/foo/me', - }, - { - name: 'with prefix', - to: '/prefix{$}', - params: { _splat: 'bar' }, - result: '/prefixbar', - }, - { - name: 'with suffix', - to: '/{$}-suffix', - params: { _splat: 'bar' }, - result: '/bar-suffix', - }, - { - name: 'with prefix + suffix', - to: '/prefix{$}-suffix', - params: { _splat: 'bar' }, - result: '/prefixbar-suffix', - }, - ])('$name', ({ to, params, result }) => { - expect( - interpolatePath(to, params, undefined, undefined, undefined), - ).toBe(result) - }) + describe('named params (prefix + suffix)', () => { + it.each([ + { + name: 'regular', + to: '/$foo', + params: { foo: 'bar' }, + result: '/bar', + }, + { + name: 'regular curly braces', + to: '/{$foo}', + params: { foo: 'bar' }, + result: '/bar', + }, + { + name: 'with prefix', + to: '/prefix{$bar}', + params: { bar: 'baz' }, + result: '/prefixbaz', + }, + { + name: 'with suffix', + to: '/{$foo}.suffix', + params: { foo: 'bar' }, + result: '/bar.suffix', + }, + { + name: 'with suffix', + to: '/{$foo}.suffix', + params: { foo: 'bar_' }, + result: '/bar_.suffix', + }, + { + name: 'with prefix and suffix', + to: '/prefix{$param}.suffix', + params: { param: 'foobar' }, + result: '/prefixfoobar.suffix', + }, + ])('$name', ({ to, params, result }) => { + const segments = parseSegments(false, { fullPath: to }, 0) + expect(interpolatePath(to, segments, params)).toBe(result) }) + }) - describe('splat params with special characters', () => { - it.each([ - { - name: 'should encode spaces in splat param', - path: '/$', - params: { _splat: 'file name.pdf' }, - result: '/file%20name.pdf', + describe('should handle missing _splat parameter for', () => { + it.each([ + { + name: 'basic splat route', + path: '/hello/$', + params: {}, + expectedResult: '/hello', + }, + { + name: 'splat route with prefix', + path: '/hello/prefix{$}', + params: {}, + expectedResult: '/hello/prefix', + }, + { + name: 'splat route with suffix', + path: '/hello/{$}suffix', + params: {}, + expectedResult: '/hello/suffix', + }, + { + name: 'splat route with prefix and suffix', + path: '/hello/prefix{$}suffix', + params: {}, + expectedResult: '/hello/prefixsuffix', + }, + { + name: 'splat route with empty splat', + path: '/hello/$', + params: { + _splat: '', }, - { - name: 'should preserve parentheses in splat param (RFC 3986 unreserved)', - path: '/$', - params: { _splat: 'file(1).pdf' }, - result: '/file(1).pdf', + expectedResult: '/hello', + }, + { + name: 'splat route with undefined splat', + path: '/hello/$', + params: { + _splat: undefined, }, - { - name: 'should encode brackets in splat param', - path: '/$', - params: { _splat: 'file[1].pdf' }, - result: '/file%5B1%5D.pdf', - }, - { - name: 'should encode spaces in nested splat param paths', - path: '/$', - params: { _splat: 'folder/sub folder/file name.pdf' }, - result: '/folder/sub%20folder/file%20name.pdf', - }, - { - name: 'should encode spaces and brackets but preserve parentheses', - path: '/$', - params: { _splat: 'docs/file (copy) [2].pdf' }, - result: '/docs/file%20(copy)%20%5B2%5D.pdf', - }, - { - name: 'should encode hash in splat param', - path: '/$', - params: { _splat: 'page#section' }, - result: '/page%23section', - }, - { - name: 'should handle splat param with prefix and special characters', - path: '/files/prefix{$}', - params: { _splat: 'my file.pdf' }, - result: '/files/prefixmy%20file.pdf', - }, - { - name: 'should encode plus signs in splat param', - path: '/$', - params: { _splat: 'file+name.pdf' }, - result: '/file%2Bname.pdf', - }, - { - name: 'should encode equals signs in splat param', - path: '/$', - params: { _splat: 'query=value' }, - result: '/query%3Dvalue', - }, - ])('$name', ({ path, params, result }) => { - expect( - interpolatePath(path, params, undefined, undefined, undefined), - ).toBe(result) - }) + expectedResult: '/hello', + }, + ])('$name', ({ path, params, expectedResult }) => { + const segments = parseSegments(false, { fullPath: path }, 0) + expect(interpolatePath(path, segments, params)).toBe(expectedResult) + expect(hasMissingPathParams(segments, params)).toBe(true) }) + }) - describe('named params (prefix + suffix)', () => { - it.each([ - { - name: 'regular', - to: '/$foo', - params: { foo: 'bar' }, - result: '/bar', - }, - { - name: 'regular curly braces', - to: '/{$foo}', - params: { foo: 'bar' }, - result: '/bar', - }, - { - name: 'with prefix', - to: '/prefix{$bar}', - params: { bar: 'baz' }, - result: '/prefixbaz', - }, - { - name: 'with suffix', - to: '/{$foo}.suffix', - params: { foo: 'bar' }, - result: '/bar.suffix', - }, - { - name: 'with suffix', - to: '/{$foo}.suffix', - params: { foo: 'bar_' }, - result: '/bar_.suffix', - }, - { - name: 'with prefix and suffix', - to: '/prefix{$param}.suffix', - params: { param: 'foobar' }, - result: '/prefixfoobar.suffix', - }, - ])('$name', ({ to, params, result }) => { - expect( - interpolatePath(to, params, undefined, undefined, undefined), - ).toBe(result) - }) - }) - - describe('should handle missing _splat parameter for', () => { - it.each([ - { - name: 'basic splat route', - path: '/hello/$', - params: {}, - expectedResult: '/hello', - }, - { - name: 'splat route with prefix', - path: '/hello/prefix{$}', - params: {}, - expectedResult: '/hello/prefix', - }, - { - name: 'splat route with suffix', - path: '/hello/{$}suffix', - params: {}, - expectedResult: '/hello/suffix', - }, - { - name: 'splat route with prefix and suffix', - path: '/hello/prefix{$}suffix', - params: {}, - expectedResult: '/hello/prefixsuffix', - }, - { - name: 'splat route with empty splat', - path: '/hello/$', - params: { - _splat: '', - }, - expectedResult: '/hello', - }, - { - name: 'splat route with undefined splat', - path: '/hello/$', - params: { - _splat: undefined, - }, - expectedResult: '/hello', - }, - ])('$name', ({ path, params, expectedResult }) => { - const metadata = { isMissingParams: false } - const result = interpolatePath( - path, - params, - undefined, - undefined, - undefined, - metadata, + describe('resolvePath + interpolatePath', () => { + it.each(['never', 'preserve', 'always'] as const)( + 'trailing slash: %s', + (trailingSlash) => { + const tail = trailingSlash === 'always' ? '/' : '' + const defaultedFromPath = '/' + const fromPath = resolvePath({ + base: defaultedFromPath, + to: '.', + trailingSlash, + }) + const nextTo = resolvePath({ + base: fromPath, + to: '/splat/$', + trailingSlash, + }) + const nextParams = { _splat: '' } + const interpolatedNextTo = interpolatePath( + nextTo, + parseSegments(false, { fullPath: nextTo }, 0), + nextParams, ) - expect(result).toBe(expectedResult) - expect(metadata.isMissingParams).toBe(true) - }) - }) - - describe('resolvePath + interpolatePath', () => { - it.each(['never', 'preserve', 'always'] as const)( - 'trailing slash: %s', - (trailingSlash) => { - const tail = trailingSlash === 'always' ? '/' : '' - const defaultedFromPath = '/' - const fromPath = resolvePath({ - base: defaultedFromPath, - to: '.', - trailingSlash, - }) - const nextTo = resolvePath({ - base: fromPath, - to: '/splat/$', - trailingSlash, - }) - const nextParams = { _splat: '' } - const interpolatedNextTo = interpolatePath( - nextTo, - nextParams, - undefined, - undefined, - undefined, - ) - expect(interpolatedNextTo).toBe(`/splat${tail}`) - }, - ) - }) - }, -) + expect(interpolatedNextTo).toBe(`/splat${tail}`) + }, + ) + }) +}) describe('matchPathname', () => { const { processedTree } = processRouteTree({ diff --git a/packages/router-core/tests/route-interpolation.test.ts b/packages/router-core/tests/route-interpolation.test.ts index 3f8428dfd9..8743f8bc04 100644 --- a/packages/router-core/tests/route-interpolation.test.ts +++ b/packages/router-core/tests/route-interpolation.test.ts @@ -2,12 +2,13 @@ import { afterEach, describe, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { + cleanPath, compileDecodeCharMap, hasMissingPathParams, interpolatePath, } from '../src/path' import * as routeTreeUtils from '../src/new-process-route-tree' -import { createTestRouter, interpolateTestPath } from './routerTestUtils' +import { createTestRouter } from './routerTestUtils' afterEach(() => vi.restoreAllMocks()) @@ -19,8 +20,10 @@ test.each([ { path: '/{-$id}', params: {}, missing: false }, { path: '/pre{-$id}suffix', params: { id: null }, missing: false }, { path: '/files/$', params: {}, missing: true }, + { path: '/files/$', params: { _splat: null }, missing: true }, { path: '/files/$', params: { _splat: '' }, missing: true }, - { path: '/files/{$}.txt', params: { _splat: 0 }, missing: true }, + { path: '/files/{$}.txt', params: { _splat: 0 }, missing: false }, + { path: '/files/{$}.txt', params: { _splat: false }, missing: false }, { path: '/files/$/ignored', params: { _splat: 'a/b' }, missing: false }, ])( 'preserves navigation availability for $path: $params', @@ -31,6 +34,11 @@ test.each([ ) test('encodes splats equivalently without interpreting literal encoded separators', () => { + const segments = routeTreeUtils.parseSegments( + false, + { fullPath: '/files/$' }, + 0, + ) for (const allowed of [[], ['@', '+'], ['%'], ['/']]) { const decoder = compileDecodeCharMap(allowed) for (const value of [ @@ -43,9 +51,9 @@ test('encodes splats equivalently without interpreting literal encoded separator .split('/') .map((part) => decoder(encodeURIComponent(part))) .join('/') - expect(interpolateTestPath('/files/$', { _splat: value }, decoder)).toBe( - `/files/${expected}`, - ) + expect( + interpolatePath('/files/$', segments, { _splat: value }, decoder), + ).toBe(`/files/${expected}`) } } }) @@ -77,6 +85,14 @@ describe.each([false, true])( scrollRestoration: false, }) history.destroy() + // The reference is the standalone parse buildLocation uses for templates + // without a processed route. + const template = routeTreeUtils.parseSegments( + false, + { fullPath: cleanPath(path) }, + 0, + ) + const decoder = compileDecodeCharMap(['@', '+']) const inputs: Array> = [ {}, { id: '', lang: null, _splat: '' }, @@ -87,19 +103,12 @@ describe.each([false, true])( for (const params of [...inputs, ...inputs]) { const expectedUsed = Object.create(null) const actualUsed = Object.create(null) - const expectedKeys: Array = [] - const actualKeys = (route._interpolation ?? []).flatMap((part) => - typeof part === 'string' ? [] : [part[1 /* key */]], - ) - const expectedMeta = { isMissingParams: false } - const decoder = compileDecodeCharMap(['@', '+']) - const expected = interpolateTestPath( + const expected = interpolatePath( path, + template, params, decoder, expectedUsed, - expectedKeys, - expectedMeta, ) expect( route._interpolation @@ -113,12 +122,16 @@ describe.each([false, true])( : path, ).toBe(expected) expect(actualUsed).toEqual(expectedUsed) - expect(actualKeys).toEqual(expectedKeys) + expect( + route._interpolation + ? routeTreeUtils.getParamNames(route._interpolation) + : [], + ).toEqual(routeTreeUtils.getParamNames(template)) expect( route._interpolation ? hasMissingPathParams(route._interpolation, params) : false, - ).toBe(expectedMeta.isMissingParams) + ).toBe(hasMissingPathParams(template, params)) } }) @@ -255,7 +268,13 @@ test.each([false, true])( const params = { _splat: 'a/b', lang: 'en' } expect( interpolatePath(child.fullPath, child._interpolation!, params), - ).toBe(interpolateTestPath(child.fullPath, params)) + ).toBe( + interpolatePath( + child.fullPath, + routeTreeUtils.parseSegments(false, { fullPath: child.fullPath }, 0), + params, + ), + ) } }, ) diff --git a/packages/router-core/tests/route-tree-construction.bench.ts b/packages/router-core/tests/route-tree-construction.bench.ts index 56324db9aa..6d564d9e84 100644 --- a/packages/router-core/tests/route-tree-construction.bench.ts +++ b/packages/router-core/tests/route-tree-construction.bench.ts @@ -40,61 +40,59 @@ function createTree(count: number, shape: Shape) { } // Keep first-use interpolation and object allocation out of the processing-only case. -if (process.env.TSR_LINK_PERF === '1') { - for (const count of [100, 1000, 10000]) { - describe.each(['static', 'dynamic', 'nested', 'mixed'])( - `route-tree construction (${count} routes, %s)`, - (shape) => { - let tree = createTree(count, shape) - let result = processRouteTree(tree) - const expectedPath = - shape === 'static' - ? '/static-0/about' - : shape === 'dynamic' - ? '/section-0/one' - : shape === 'nested' - ? '/orgs/group-0/one/items/section-0/two' - : '/mixed-0/one/items/two' - const verify = () => { - expect(Object.keys(result.routesById)).toHaveLength(count + 1) - expect( - findRouteMatch(expectedPath, result.processedTree), - ).not.toBeNull() - } - verify() +for (const count of [100, 1000, 10000]) { + describe.each(['static', 'dynamic', 'nested', 'mixed'])( + `route-tree construction (${count} routes, %s)`, + (shape) => { + let tree = createTree(count, shape) + let result = processRouteTree(tree) + const expectedPath = + shape === 'static' + ? '/static-0/about' + : shape === 'dynamic' + ? '/section-0/one' + : shape === 'nested' + ? '/orgs/group-0/one/items/section-0/two' + : '/mixed-0/one/items/two' + const verify = () => { + expect(Object.keys(result.routesById)).toHaveLength(count + 1) + expect( + findRouteMatch(expectedPath, result.processedTree), + ).not.toBeNull() + } + verify() - bench( - 'processRouteTree + route.init on fresh objects', - () => { - result = processRouteTree(tree) + bench( + 'processRouteTree + route.init on fresh objects', + () => { + result = processRouteTree(tree) + }, + { + setup: (task) => { + // Vitest forwards Bench options, not per-iteration Task options. + task.opts.beforeEach = () => { + tree = createTree(count, shape) + } }, - { - setup: (task) => { - // Vitest forwards Bench options, not per-iteration Task options. - task.opts.beforeEach = () => { - tree = createTree(count, shape) - } - }, - teardown: verify, - time: 1500, - warmupTime: 500, - throws: true, - }, - ) + teardown: verify, + time: 1500, + warmupTime: 500, + throws: true, + }, + ) - bench( - 'route objects + processRouteTree + route.init', - () => { - result = processRouteTree(createTree(count, shape)) - }, - { - teardown: verify, - time: 1500, - warmupTime: 500, - throws: true, - }, - ) - }, - ) - } + bench( + 'route objects + processRouteTree + route.init', + () => { + result = processRouteTree(createTree(count, shape)) + }, + { + teardown: verify, + time: 1500, + warmupTime: 500, + throws: true, + }, + ) + }, + ) } diff --git a/packages/router-core/tests/routerTestUtils.ts b/packages/router-core/tests/routerTestUtils.ts index 51a785819f..490eacdb33 100644 --- a/packages/router-core/tests/routerTestUtils.ts +++ b/packages/router-core/tests/routerTestUtils.ts @@ -8,14 +8,13 @@ import { createNonReactiveReadonlyStore, } from '../src' import { createRequestHandler } from '../src/ssr/createRequestHandler' -import { cleanPath, hasMissingPathParams, interpolatePath } from '../src/path' import { SEGMENT_TYPE_PATHNAME, SEGMENT_TYPE_WILDCARD, parseSegment, - parseSegments, processRouteTree, } from '../src/new-process-route-tree' +import type { interpolatePath } from '../src/path' import type { SegmentKind } from '../src/new-process-route-tree' import type { RouterHistory } from '@tanstack/history' import type { @@ -117,29 +116,6 @@ export function createTestPathInterpolator( } } -export function interpolateTestPath( - path: string, - params: Record, - decoder?: (encoded: string) => string, - usedParams?: Record, - keys?: Array, - metadata?: { isMissingParams: boolean }, -) { - const segments = parseSegments(false, { fullPath: cleanPath(path) }, 0) - if (keys) { - for (const segment of segments) { - if (typeof segment !== 'string') { - keys.push(segment[1 /* key */]) - } - } - } - const pathname = interpolatePath(path, segments, params, decoder, usedParams) - if (metadata && hasMissingPathParams(segments, params)) { - metadata.isMissingParams = true - } - return pathname -} - export function parseTestPathname(to: string | undefined) { const path = to ?? '' const segments: Array<{ diff --git a/packages/solid-router/src/link.tsx b/packages/solid-router/src/link.tsx index ab5efb1d4d..aeaf6a4a20 100644 --- a/packages/solid-router/src/link.tsx +++ b/packages/solid-router/src/link.tsx @@ -276,8 +276,8 @@ export function useLinkProps< href: base.href, disabled: base.disabled, target: base.target, - ...(style && hasKeys(style) ? { style } : undefined), - ...(className ? { class: className } : undefined), + ...(style && hasKeys(style) && { style }), + ...(className && { class: className }), ...(active && STATIC_ACTIVE_ATTRIBUTES), } as ResolvedLinkStateProps } From 6954a370a76251cf933ede95562c968adc4e847b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 13 Sep 2026 15:13:54 +0200 Subject: [PATCH 026/175] ci: Version Packages (#8355) ci: changeset release Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/bright-dryers-vanish.md | 5 - .changeset/brisk-links-serve.md | 10 - .changeset/calm-locations-unshared.md | 5 - .changeset/chatty-streets-strive.md | 5 - .changeset/chubby-wasps-yawn.md | 5 - .changeset/cyan-beers-kneel.md | 5 - .changeset/deep-chefs-work.md | 5 - .changeset/forty-loops-sing.md | 5 - .changeset/happy-turkeys-write.md | 5 - .changeset/history-forward-entries.md | 5 - .changeset/lazy-locations-listen.md | 5 - .changeset/loud-times-tie.md | 5 - .changeset/loud-weeks-boil.md | 7 - .changeset/lucky-candies-smoke.md | 5 - .changeset/mean-mice-design.md | 5 - .changeset/old-turkeys-fall.md | 8 - .changeset/plain-helpers-hide.md | 8 - .changeset/pretty-lies-tan.md | 5 - .changeset/quick-otters-switch.md | 5 - .changeset/quiet-zeros-stay.md | 5 - .changeset/rare-chefs-shine.md | 5 - .changeset/sad-pans-design.md | 7 - .changeset/six-adults-open.md | 6 - .changeset/smart-corners-rhyme.md | 6 - .changeset/soft-pandas-burn.md | 5 - .changeset/soft-parts-count.md | 6 - .changeset/spotty-bats-jog.md | 6 - .changeset/steady-loops-compile.md | 5 - .changeset/still-links-rest.md | 6 - .changeset/violet-emus-teach.md | 5 - .changeset/whole-ants-battle.md | 6 - .changeset/yummy-days-poke.md | 5 - .../package.json | 6 +- .../react/authenticated-routes/package.json | 6 +- .../basic-default-search-params/package.json | 4 +- .../react/basic-devtools-panel/package.json | 4 +- examples/react/basic-file-based/package.json | 6 +- .../basic-non-nested-devtools/package.json | 4 +- .../basic-react-query-file-based/package.json | 6 +- examples/react/basic-react-query/package.json | 4 +- .../react/basic-ssr-file-based/package.json | 6 +- .../package.json | 6 +- .../basic-virtual-file-based/package.json | 6 +- .../package.json | 6 +- examples/react/basic/package.json | 4 +- examples/react/deferred-data/package.json | 4 +- examples/react/i18n-paraglide/package.json | 4 +- .../kitchen-sink-file-based/package.json | 6 +- .../package.json | 6 +- .../kitchen-sink-react-query/package.json | 4 +- examples/react/kitchen-sink/package.json | 4 +- examples/react/large-file-based/package.json | 6 +- examples/react/location-masking/package.json | 4 +- .../react/navigation-blocking/package.json | 4 +- .../package.json | 6 +- .../react/quickstart-file-based/package.json | 6 +- .../quickstart-rspack-file-based/package.json | 6 +- .../package.json | 6 +- examples/react/quickstart/package.json | 4 +- .../router-monorepo-react-query/package.json | 6 +- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 +- .../router-monorepo-simple-lazy/package.json | 6 +- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 +- .../react/router-monorepo-simple/package.json | 6 +- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 +- .../react/scroll-restoration/package.json | 4 +- .../search-validator-adapters/package.json | 6 +- examples/react/start-bare/package.json | 6 +- examples/react/start-basic-auth/package.json | 6 +- .../react/start-basic-authjs/package.json | 6 +- .../react/start-basic-cloudflare/package.json | 6 +- .../start-basic-react-query/package.json | 6 +- .../react/start-basic-rsbuild/package.json | 6 +- .../react/start-basic-static/package.json | 8 +- examples/react/start-basic/package.json | 6 +- examples/react/start-bun/package.json | 8 +- examples/react/start-clerk-basic/package.json | 6 +- .../react/start-convex-trellaux/package.json | 6 +- examples/react/start-counter/package.json | 6 +- .../react/start-i18n-paraglide/package.json | 6 +- examples/react/start-large/package.json | 6 +- examples/react/start-material-ui/package.json | 6 +- .../react/start-next-migration/package.json | 4 +- examples/react/start-rscs/package.json | 6 +- .../package.json | 6 +- .../react/start-supabase-basic/package.json | 6 +- examples/react/start-tailwind-v4/package.json | 6 +- examples/react/start-trellaux/package.json | 6 +- examples/react/start-workos/package.json | 6 +- examples/react/view-transitions/package.json | 6 +- .../react/with-framer-motion/package.json | 4 +- .../react/with-trpc-react-query/package.json | 6 +- examples/react/with-trpc/package.json | 6 +- .../package.json | 6 +- .../solid/authenticated-routes/package.json | 6 +- .../basic-default-search-params/package.json | 4 +- .../solid/basic-devtools-panel/package.json | 4 +- examples/solid/basic-file-based/package.json | 6 +- .../basic-non-nested-devtools/package.json | 4 +- .../basic-solid-query-file-based/package.json | 6 +- examples/solid/basic-solid-query/package.json | 6 +- .../solid/basic-ssr-file-based/package.json | 6 +- .../package.json | 6 +- .../basic-virtual-file-based/package.json | 6 +- .../package.json | 6 +- examples/solid/basic/package.json | 4 +- examples/solid/deferred-data/package.json | 4 +- examples/solid/i18n-paraglide/package.json | 4 +- .../kitchen-sink-file-based/package.json | 6 +- .../package.json | 6 +- .../kitchen-sink-solid-query/package.json | 4 +- examples/solid/kitchen-sink/package.json | 4 +- examples/solid/large-file-based/package.json | 6 +- examples/solid/location-masking/package.json | 4 +- .../solid/navigation-blocking/package.json | 4 +- .../package.json | 6 +- .../solid/quickstart-file-based/package.json | 6 +- .../quickstart-rspack-file-based/package.json | 6 +- .../package.json | 6 +- examples/solid/quickstart/package.json | 4 +- .../router-monorepo-simple-lazy/package.json | 6 +- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 +- .../solid/router-monorepo-simple/package.json | 6 +- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 +- .../router-monorepo-solid-query/package.json | 6 +- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 +- .../solid/scroll-restoration/package.json | 4 +- .../search-validator-adapters/package.json | 6 +- examples/solid/start-basic-auth/package.json | 6 +- .../solid/start-basic-authjs/package.json | 6 +- .../solid/start-basic-cloudflare/package.json | 6 +- .../solid/start-basic-netlify/package.json | 6 +- examples/solid/start-basic-nitro/package.json | 6 +- .../start-basic-solid-query/package.json | 6 +- .../solid/start-basic-static/package.json | 8 +- examples/solid/start-basic/package.json | 6 +- examples/solid/start-bun/package.json | 8 +- .../start-convex-better-auth/package.json | 6 +- examples/solid/start-counter/package.json | 6 +- .../solid/start-i18n-paraglide/package.json | 6 +- examples/solid/start-large/package.json | 6 +- .../package.json | 6 +- .../solid/start-supabase-basic/package.json | 6 +- examples/solid/start-tailwind-v4/package.json | 6 +- examples/solid/view-transitions/package.json | 6 +- .../solid/with-framer-motion/package.json | 4 +- examples/solid/with-trpc/package.json | 6 +- .../vue/basic-file-based-jsx/package.json | 6 +- .../vue/basic-file-based-sfc/package.json | 6 +- examples/vue/basic/package.json | 4 +- packages/history/CHANGELOG.md | 12 + packages/history/package.json | 2 +- packages/react-router-devtools/CHANGELOG.md | 9 + packages/react-router-devtools/package.json | 2 +- packages/react-router/CHANGELOG.md | 28 + packages/react-router/package.json | 2 +- packages/react-start-client/CHANGELOG.md | 9 + packages/react-start-client/package.json | 2 +- packages/react-start-rsc/CHANGELOG.md | 11 + packages/react-start-rsc/package.json | 2 +- packages/react-start-server/CHANGELOG.md | 9 + packages/react-start-server/package.json | 2 +- packages/react-start/CHANGELOG.md | 13 + packages/react-start/package.json | 2 +- packages/router-cli/CHANGELOG.md | 7 + packages/router-cli/package.json | 2 +- packages/router-core/CHANGELOG.md | 57 + packages/router-core/package.json | 2 +- packages/router-devtools-core/CHANGELOG.md | 13 + packages/router-devtools-core/package.json | 2 +- packages/router-devtools/CHANGELOG.md | 8 + packages/router-devtools/package.json | 2 +- packages/router-generator/CHANGELOG.md | 7 + packages/router-generator/package.json | 2 +- packages/router-plugin/CHANGELOG.md | 9 + packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/CHANGELOG.md | 7 + packages/router-vite-plugin/package.json | 2 +- packages/solid-router-devtools/CHANGELOG.md | 9 + packages/solid-router-devtools/package.json | 2 +- packages/solid-router/CHANGELOG.md | 18 + packages/solid-router/package.json | 2 +- packages/solid-start-client/CHANGELOG.md | 9 + packages/solid-start-client/package.json | 2 +- packages/solid-start-server/CHANGELOG.md | 9 + packages/solid-start-server/package.json | 2 +- packages/solid-start/CHANGELOG.md | 12 + packages/solid-start/package.json | 2 +- packages/start-client-core/CHANGELOG.md | 8 + packages/start-client-core/package.json | 2 +- packages/start-plugin-core/CHANGELOG.md | 10 + packages/start-plugin-core/package.json | 2 +- packages/start-server-core/CHANGELOG.md | 12 + packages/start-server-core/package.json | 2 +- .../CHANGELOG.md | 9 + .../package.json | 2 +- packages/start-storage-context/CHANGELOG.md | 7 + packages/start-storage-context/package.json | 2 +- packages/vue-router-devtools/CHANGELOG.md | 9 + packages/vue-router-devtools/package.json | 2 +- packages/vue-router/CHANGELOG.md | 18 + packages/vue-router/package.json | 2 +- packages/vue-start-client/CHANGELOG.md | 9 + packages/vue-start-client/package.json | 2 +- packages/vue-start-server/CHANGELOG.md | 9 + packages/vue-start-server/package.json | 2 +- packages/vue-start/CHANGELOG.md | 12 + packages/vue-start/package.json | 2 +- pnpm-lock.yaml | 1395 ++++++++--------- 215 files changed, 1419 insertions(+), 1244 deletions(-) delete mode 100644 .changeset/bright-dryers-vanish.md delete mode 100644 .changeset/brisk-links-serve.md delete mode 100644 .changeset/calm-locations-unshared.md delete mode 100644 .changeset/chatty-streets-strive.md delete mode 100644 .changeset/chubby-wasps-yawn.md delete mode 100644 .changeset/cyan-beers-kneel.md delete mode 100644 .changeset/deep-chefs-work.md delete mode 100644 .changeset/forty-loops-sing.md delete mode 100644 .changeset/happy-turkeys-write.md delete mode 100644 .changeset/history-forward-entries.md delete mode 100644 .changeset/lazy-locations-listen.md delete mode 100644 .changeset/loud-times-tie.md delete mode 100644 .changeset/loud-weeks-boil.md delete mode 100644 .changeset/lucky-candies-smoke.md delete mode 100644 .changeset/mean-mice-design.md delete mode 100644 .changeset/old-turkeys-fall.md delete mode 100644 .changeset/plain-helpers-hide.md delete mode 100644 .changeset/pretty-lies-tan.md delete mode 100644 .changeset/quick-otters-switch.md delete mode 100644 .changeset/quiet-zeros-stay.md delete mode 100644 .changeset/rare-chefs-shine.md delete mode 100644 .changeset/sad-pans-design.md delete mode 100644 .changeset/six-adults-open.md delete mode 100644 .changeset/smart-corners-rhyme.md delete mode 100644 .changeset/soft-pandas-burn.md delete mode 100644 .changeset/soft-parts-count.md delete mode 100644 .changeset/spotty-bats-jog.md delete mode 100644 .changeset/steady-loops-compile.md delete mode 100644 .changeset/still-links-rest.md delete mode 100644 .changeset/violet-emus-teach.md delete mode 100644 .changeset/whole-ants-battle.md delete mode 100644 .changeset/yummy-days-poke.md diff --git a/.changeset/bright-dryers-vanish.md b/.changeset/bright-dryers-vanish.md deleted file mode 100644 index 6216bd3e83..0000000000 --- a/.changeset/bright-dryers-vanish.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Cache route branches and interpolated paths on their route objects, removing the fixed template limit for registered routes and reusing cached paths across server requests. Rebuild tree-dependent caches together, preserve decoder and trailing-slash isolation, and keep unregistered templates bounded. diff --git a/.changeset/brisk-links-serve.md b/.changeset/brisk-links-serve.md deleted file mode 100644 index 7b24280f24..0000000000 --- a/.changeset/brisk-links-serve.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/react-router': patch ---- - -Keep the Link location cache out of server bundles: `buildLocation` only creates, reads and writes it when `isServer` is false. Render React Links on the server without the extra prop copies and the forwarded-ref hook. Link SSR rendering is 20-40% faster in the Link benchmarks and the React Start SSR request loop about 7% faster. - -React `activeProps` and `inactiveProps` now follow one precedence rule on every link, including links whose destination is blocked for using a disallowed scheme: state props override element props, `ref` and event handlers, while `href`, `disabled` and `target` stay controlled by the router. Previously a blocked link ignored a `ref` or handler from its inactive props. - -React `Link` and `useLinkProps` split router options from element props with one key set on the client and the server. Element props pass through as given: external links forward them verbatim, falsy values included, and `useLinkProps` now returns `children` for router-controlled links as it already did for external ones. diff --git a/.changeset/calm-locations-unshared.md b/.changeset/calm-locations-unshared.md deleted file mode 100644 index 1d3b74c795..0000000000 --- a/.changeset/calm-locations-unshared.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -`buildLocation` no longer structurally shares the built `search` and `state` with the current location. The observable `location.search` and `location.state` still preserve equal nested references across navigations, because `parseLocation` stabilizes them once a location is committed. A search whose contents equal the current search but list its keys in a different order now serializes in the requested order, so navigating to it creates a new history entry instead of being treated as the same location. A `state` object passed to `navigate` or `buildLocation` is never mutated. diff --git a/.changeset/chatty-streets-strive.md b/.changeset/chatty-streets-strive.md deleted file mode 100644 index 7b94c9aa32..0000000000 --- a/.changeset/chatty-streets-strive.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Reuse the already-owned raw-param snapshot during lightweight source matching instead of copying it again. diff --git a/.changeset/chubby-wasps-yawn.md b/.changeset/chubby-wasps-yawn.md deleted file mode 100644 index 9d52402d19..0000000000 --- a/.changeset/chubby-wasps-yawn.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Reduce transient JIT compilation memory during navigation by separating search middleware collection from recursive execution. diff --git a/.changeset/cyan-beers-kneel.md b/.changeset/cyan-beers-kneel.md deleted file mode 100644 index 1bdbfe6ded..0000000000 --- a/.changeset/cyan-beers-kneel.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/vue-router': patch ---- - -Remove an unnecessary match Fragment to reduce VNode allocation and transient JIT compilation memory while preserving route content and scroll restoration. diff --git a/.changeset/deep-chefs-work.md b/.changeset/deep-chefs-work.md deleted file mode 100644 index c3d5311ed1..0000000000 --- a/.changeset/deep-chefs-work.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/react-router': patch ---- - -Reuse hydration snapshot getters to avoid unnecessary store-instance effect updates when Links and other hydration-aware components rerender. diff --git a/.changeset/forty-loops-sing.md b/.changeset/forty-loops-sing.md deleted file mode 100644 index 7200420363..0000000000 --- a/.changeset/forty-loops-sing.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/solid-router': patch ---- - -Keep Solid Link's computed `href`, `target`, and `disabled` values authoritative when active or inactive state props contain routing options, while preserving state-prop refs, event handlers, and class/style merging. diff --git a/.changeset/happy-turkeys-write.md b/.changeset/happy-turkeys-write.md deleted file mode 100644 index b40a832c1b..0000000000 --- a/.changeset/happy-turkeys-write.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/history': patch ---- - -Normalize memory history hrefs consistently with browser and server history, including protocol-relative paths and control characters. diff --git a/.changeset/history-forward-entries.md b/.changeset/history-forward-entries.md deleted file mode 100644 index a4517e4c6a..0000000000 --- a/.changeset/history-forward-entries.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/history': patch ---- - -Avoid temporary arrays when replacing forward memory-history entries. diff --git a/.changeset/lazy-locations-listen.md b/.changeset/lazy-locations-listen.md deleted file mode 100644 index d048bbebe4..0000000000 --- a/.changeset/lazy-locations-listen.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/history': patch ---- - -Avoid generating unused history keys for locations with existing state. diff --git a/.changeset/loud-times-tie.md b/.changeset/loud-times-tie.md deleted file mode 100644 index 71d1ccf62c..0000000000 --- a/.changeset/loud-times-tie.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Collect shared pathname-cache keys during interpolation instead of parsing templates twice, and share dynamic-segment handling to reduce bundle size. diff --git a/.changeset/loud-weeks-boil.md b/.changeset/loud-weeks-boil.md deleted file mode 100644 index 9df1ba41b7..0000000000 --- a/.changeset/loud-weeks-boil.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@tanstack/react-router': patch -'@tanstack/solid-router': patch -'@tanstack/vue-router': patch ---- - -Allow active and inactive Link props to override base element props in React and Solid while preserving class/style merging. Keep React's `href`, `target`, and `disabled` values controlled by routing options. Preserve Vue object and nested-array class bindings, including reactive updates and server rendering, without mutating cached bindings during VNode normalization. diff --git a/.changeset/lucky-candies-smoke.md b/.changeset/lucky-candies-smoke.md deleted file mode 100644 index 29b62a90b9..0000000000 --- a/.changeset/lucky-candies-smoke.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Simplify path interpolation into ordered segment-type blocks with shared prefix/value/suffix assembly. Preserve one-pass parsing and optional metadata collection, and reuse the public result object instead of allocating and clearing a missing-parameter callback. diff --git a/.changeset/mean-mice-design.md b/.changeset/mean-mice-design.md deleted file mode 100644 index 2225bdac9c..0000000000 --- a/.changeset/mean-mice-design.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Reuse pathname interpolation across Links with bounded router-scoped caches. Keep parameter callbacks and navigation state independent of the cache. diff --git a/.changeset/old-turkeys-fall.md b/.changeset/old-turkeys-fall.md deleted file mode 100644 index 2c87a166d8..0000000000 --- a/.changeset/old-turkeys-fall.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/react-router': patch -'@tanstack/solid-router': patch -'@tanstack/vue-router': patch ---- - -Make `pathParamsAllowedCharacters` initialization-only. Configure it when creating the router; changing allowed characters requires a new router instance. Remove decoder-update bookkeeping and decoder-change checks from route-owned path caches. diff --git a/.changeset/plain-helpers-hide.md b/.changeset/plain-helpers-hide.md deleted file mode 100644 index 78b25ed483..0000000000 --- a/.changeset/plain-helpers-hide.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/react-router': patch -'@tanstack/solid-router': patch -'@tanstack/vue-router': patch ---- - -Stop exporting the internal `isPlainObject` and `isPlainArray` helpers. diff --git a/.changeset/pretty-lies-tan.md b/.changeset/pretty-lies-tan.md deleted file mode 100644 index 97bd55a286..0000000000 --- a/.changeset/pretty-lies-tan.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Initialize routes directly during route-tree processing, removing the callback indirection while preserving parent-first initialization and route indexes. diff --git a/.changeset/quick-otters-switch.md b/.changeset/quick-otters-switch.md deleted file mode 100644 index 2207d8c008..0000000000 --- a/.changeset/quick-otters-switch.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Reduce duplication in navigation parameter handling while preserving parameter inheritance, null-prototype dictionaries, and updater isolation. diff --git a/.changeset/quiet-zeros-stay.md b/.changeset/quiet-zeros-stay.md deleted file mode 100644 index 13ec72d8d3..0000000000 --- a/.changeset/quiet-zeros-stay.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Treat `0` and `false` as provided `_splat` values when interpolating paths. Only `undefined`, `null`, and `''` now omit a splat segment, matching how other path params are stringified. diff --git a/.changeset/rare-chefs-shine.md b/.changeset/rare-chefs-shine.md deleted file mode 100644 index 18e7bfae3d..0000000000 --- a/.changeset/rare-chefs-shine.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/react-router': patch ---- - -Avoid a redundant prop copy when rendering native Links while preserving custom-component props and the public hook result. diff --git a/.changeset/sad-pans-design.md b/.changeset/sad-pans-design.md deleted file mode 100644 index 3976f1cc28..0000000000 --- a/.changeset/sad-pans-design.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@tanstack/start-server-core': patch -'@tanstack/router-core': patch -'@tanstack/history': patch ---- - -Use lightweight request history for SSR and make server navigation a no-op. Use redirect() to issue HTTP redirects. Server hrefs use the same normalization as browser history to handle protocol-relative URLs and control characters. diff --git a/.changeset/six-adults-open.md b/.changeset/six-adults-open.md deleted file mode 100644 index f5486a5ff9..0000000000 --- a/.changeset/six-adults-open.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/solid-router': patch -'@tanstack/vue-router': patch ---- - -Reduce Link bundle size by sharing exact/fuzzy active-path checks and resolving only the selected active or inactive props. Avoid unnecessary class/style allocations while preserving reactive style updates, server rendering, and each framework's prop-override behavior. diff --git a/.changeset/smart-corners-rhyme.md b/.changeset/smart-corners-rhyme.md deleted file mode 100644 index 87ae320554..0000000000 --- a/.changeset/smart-corners-rhyme.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/router-devtools-core': patch ---- - -Consolidate internal path interpolation into `interpolatePath`, returning a pathname directly and collecting metadata only when requested. Update router and devtools callers without changing route parsing or interpolation caching. diff --git a/.changeset/soft-pandas-burn.md b/.changeset/soft-pandas-burn.md deleted file mode 100644 index c39081f749..0000000000 --- a/.changeset/soft-pandas-burn.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Reduce route-tree initialization work by avoiding temporary path-joining arrays and duplicate ID normalization. diff --git a/.changeset/soft-parts-count.md b/.changeset/soft-parts-count.md deleted file mode 100644 index 76d7d423ac..0000000000 --- a/.changeset/soft-parts-count.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/router-devtools-core': patch ---- - -Reuse parsed route segments when generating paths for navigation, Links, and Devtools. Preserve interpolation metadata and refresh segments when the route tree is rebuilt, without reparsing templates for new parameter values. diff --git a/.changeset/spotty-bats-jog.md b/.changeset/spotty-bats-jog.md deleted file mode 100644 index da338b6d22..0000000000 --- a/.changeset/spotty-bats-jog.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/react-router': patch ---- - -Reduce the bundle cost of shared Link pathname interpolation while preserving its rendering performance. Reuse one interpolation pass for pathname and optional metadata, keep the bounded cache on the router, and simplify React Link active-state and prop merging. diff --git a/.changeset/steady-loops-compile.md b/.changeset/steady-loops-compile.md deleted file mode 100644 index 5a243a4205..0000000000 --- a/.changeset/steady-loops-compile.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Collect search middlewares with a counted loop so the optimized code stays valid across navigations. This removes a JIT recompilation that raised peak memory in the interrupted-navigations client memory benchmark. diff --git a/.changeset/still-links-rest.md b/.changeset/still-links-rest.md deleted file mode 100644 index 830506b9c4..0000000000 --- a/.changeset/still-links-rest.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/react-router': patch ---- - -Reuse built locations for Links whose destination does not depend on the current location. `buildLocation` keeps the result per options object when the build never read the current location, and the React `Link` passes one stable options object per instance, so navigations resolve unchanged Links with a lookup instead of a full build. The per-route pathname interpolation cache this replaces is removed. Link `params`, `search` and `activeOptions` are compared by value on render, so inline object literals with unchanged contents keep reusing the Link's location. Pass a new object to change a destination; like any other React prop, an object mutated in place is not re-read. diff --git a/.changeset/violet-emus-teach.md b/.changeset/violet-emus-teach.md deleted file mode 100644 index 2b38e22fd7..0000000000 --- a/.changeset/violet-emus-teach.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Cache normalized route pathnames so repeated Link destinations do not decode the same interpolation result again. diff --git a/.changeset/whole-ants-battle.md b/.changeset/whole-ants-battle.md deleted file mode 100644 index bdf6ed05bc..0000000000 --- a/.changeset/whole-ants-battle.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/router-devtools-core': patch ---- - -Share compact parsed route segments between matching and interpolation, preserve original parameter names, and avoid reparsing templates while building paths. Simplify route-tree traversal, reuse existing path helpers, and keep Devtools-only navigation validation out of the production formatter. Preserve dynamic match identity for standalone legacy fallback routes. diff --git a/.changeset/yummy-days-poke.md b/.changeset/yummy-days-poke.md deleted file mode 100644 index ae92d1a194..0000000000 --- a/.changeset/yummy-days-poke.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Pass route initialization indexes directly instead of wrapping each index in an options object. diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 8c117f0692..68e38ba66b 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "firebase": "^11.4.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index fe774daf2e..569842fa38 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 3221a1f185..d73063a93a 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index c91dbd3c07..bd7ae35825 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -12,8 +12,8 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.67.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 50e23b461c..be8b5980bc 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 283d0dcb14..b64f9b35ab 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 3d1a59a030..91cbf7662e 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 48b8b0c186..bf89a84839 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -12,8 +12,8 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.json index d3b3a4beab..cb35a5c5d3 100644 --- a/examples/react/basic-ssr-file-based/package.json +++ b/examples/react/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.38", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", @@ -21,7 +21,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router-devtools": "^1.167.2", "@types/express": "^5.0.6", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.1", diff --git a/examples/react/basic-ssr-streaming-file-based/package.json b/examples/react/basic-ssr-streaming-file-based/package.json index a79bbe88b3..d0ad562dbe 100644 --- a/examples/react/basic-ssr-streaming-file-based/package.json +++ b/examples/react/basic-ssr-streaming-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.38", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", @@ -21,7 +21,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router-devtools": "^1.167.2", "@types/express": "^5.0.6", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 03cafd37a3..71c68a1ab8 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index ddc71963ab..68e51a59dd 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 9938d4400b..b848b3d9bd 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 0e43adba25..77464ff729 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/i18n-paraglide/package.json b/examples/react/i18n-paraglide/package.json index 857e2b598f..3c2f03e0b4 100644 --- a/examples/react/i18n-paraglide/package.json +++ b/examples/react/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 221d97cf44..b78d2d1729 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 012bc20c5c..34458e391a 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 19bd29a6f7..c171b649cb 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -12,8 +12,8 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 6bb895d361..741e2610b9 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 0da9f08318..d11bbc45d4 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -13,9 +13,9 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index e6144131f0..14ede14d3b 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -12,8 +12,8 @@ "@radix-ui/react-dialog": "^1.1.6", "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index e5c4ff09d0..423d750909 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 829ce87bb6..63a9b19515 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index abe05c4172..d7631039b8 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index a36d234608..0d1d117380 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -9,8 +9,8 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "postcss": "^8.5.1", "react": "^19.0.0", "react-dom": "^19.0.0", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/router-plugin": "^1.168.38", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index fae05b7955..a0f5bbde8c 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.15.33", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/router-plugin": "^1.168.38", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index d8f7a64c2a..7d5979feb0 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwindcss": "^4.2.2" diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 7bac03d213..d027be47a4 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index cbbf07dac5..5818e84c1a 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -16,7 +16,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router-devtools": "^1.167.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 144140d0f1..29d158f1ee 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -9,10 +9,10 @@ "types": "./dist/index.d.ts", "dependencies": { "@router-mono-react-query/post-query": "workspace:*", - "@tanstack/history": "^1.162.3", + "@tanstack/history": "^1.162.4", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 07e1b19351..4c1b45f0c6 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index a1e792cc3d..1f16998e3d 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -15,7 +15,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router-devtools": "^1.167.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 29d2b39cb3..8a5aa19de5 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.3", - "@tanstack/react-router": "^1.170.35", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/history": "^1.162.4", + "@tanstack/react-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index b0d629e142..28d5c554cb 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index 01da864c38..7f5183d633 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -15,7 +15,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router-devtools": "^1.167.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index ec94aa87d6..ab5c4ab110 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.3", - "@tanstack/react-router": "^1.170.35", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/history": "^1.162.4", + "@tanstack/react-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 8141904381..3b214fd937 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-virtual": "^3.13.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index f301a0a7e2..509fd19a1d 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 3a279b9547..a528ec5a6c 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "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 4390a35207..d6f4054ce1 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index 6d773c3e0a..715c156f56 100644 --- a/examples/react/start-basic-authjs/package.json +++ b/examples/react/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "react": "^19.0.0", "react-dom": "^19.0.0", "start-authjs": "^1.0.0", diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index b47789c61a..466b468b98 100644 --- a/examples/react/start-basic-cloudflare/package.json +++ b/examples/react/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index bed46f2c3b..fef333212d 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -13,10 +13,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.2", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-start": "^1.168.53", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json index d2dbce7fb6..1cfacf4077 100644 --- a/examples/react/start-basic-rsbuild/package.json +++ b/examples/react/start-basic-rsbuild/package.json @@ -10,9 +10,9 @@ "start": "srvx --prod -s ../client dist/server/index.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "react": "^19.2.3", "react-dom": "^19.2.3", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index c65664e078..602e643840 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", - "@tanstack/start-static-server-functions": "^1.167.34", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", + "@tanstack/start-static-server-functions": "^1.167.35", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 5cf41bc904..4edee9969a 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index 96ad7192b2..6ef0e1b34b 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.2", - "@tanstack/react-start": "^1.168.52", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-start": "^1.168.53", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index ed37e68dbb..ddaabd339e 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "^0.27.14", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index c0e1828d68..d14fa92189 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -15,10 +15,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.2", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-start": "^1.168.53", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 708f027cbb..b2937e7a70 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "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 12ec13aa97..3639e8879b 100644 --- a/examples/react/start-i18n-paraglide/package.json +++ b/examples/react/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "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 683035eb0e..2049355af1 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "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 d2a9cae589..5ea77d0de8 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,9 +15,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json index c7074023fb..a238ee3c9d 100644 --- a/examples/react/start-next-migration/package.json +++ b/examples/react/start-next-migration/package.json @@ -12,8 +12,8 @@ "test:e2e": "playwright test" }, "dependencies": { - "@tanstack/react-router": "workspace:^", - "@tanstack/react-start": "workspace:^", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-start": "^1.168.53", "iron-session": "^9.0.0", "next": "16.3.4", "react": "^19.2.3", diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index 527b24a484..dd6f244e3c 100644 --- a/examples/react/start-rscs/package.json +++ b/examples/react/start-rscs/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "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 6de5882044..c9c1fdf5eb 100644 --- a/examples/react/start-streaming-data-from-server-functions/package.json +++ b/examples/react/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "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 875f1aecfc..c73970f2d1 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 94323f5183..7a249f70e8 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "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 702da4a783..8ea0303532 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.2", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-start": "^1.168.53", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 762b60d716..dd9381ad1c 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.3.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/react-start": "^1.168.52", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-start": "^1.168.53", "@workos/authkit-tanstack-react-start": "^0.5.0", "react": "^19.0.0", "react-dom": "^19.0.0" diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 9e6406ea05..5c134c716b 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index c0d504b926..0c3d192e7e 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index f9aedebe59..f01809847a 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "@trpc/tanstack-react-query": "^11.4.3", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 2b3dbc8c24..f1716612f9 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.35", - "@tanstack/react-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "express": "^5.2.1", diff --git a/examples/solid/authenticated-routes-firebase/package.json b/examples/solid/authenticated-routes-firebase/package.json index 2d595cec26..5f728a8f27 100644 --- a/examples/solid/authenticated-routes-firebase/package.json +++ b/examples/solid/authenticated-routes-firebase/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.37", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "firebase": "^11.4.0", "redaxios": "^0.5.1", "simple-icons": "^14.9.0", diff --git a/examples/solid/authenticated-routes/package.json b/examples/solid/authenticated-routes/package.json index fc3209e76c..bf8cb4500b 100644 --- a/examples/solid/authenticated-routes/package.json +++ b/examples/solid/authenticated-routes/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.37", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/basic-default-search-params/package.json b/examples/solid/basic-default-search-params/package.json index 16029d3631..c762662f3d 100644 --- a/examples/solid/basic-default-search-params/package.json +++ b/examples/solid/basic-default-search-params/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 28b3ab7255..5bbe9c4674 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index 0373ddd9f9..f6b4e7f45c 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -10,15 +10,15 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/router-plugin": "^1.168.38", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 0fe301e87b..0c1d038e2f 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 4639782529..2ca4738e8b 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -13,15 +13,15 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/router-plugin": "^1.168.38", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 2458034f38..9842bc5dff 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -12,14 +12,14 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/router-plugin": "^1.168.38", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-ssr-file-based/package.json b/examples/solid/basic-ssr-file-based/package.json index 759ffb708c..ebcc7a1723 100644 --- a/examples/solid/basic-ssr-file-based/package.json +++ b/examples/solid/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/solid-router": "^1.170.33", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.38", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", @@ -20,7 +20,7 @@ "solid-js": "^1.9.10" }, "devDependencies": { - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router-devtools": "^1.167.2", "@types/express": "^5.0.6", "vite-plugin-solid": "^2.11.11", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json index 3c59007da9..95393e6326 100644 --- a/examples/solid/basic-ssr-streaming-file-based/package.json +++ b/examples/solid/basic-ssr-streaming-file-based/package.json @@ -12,8 +12,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", @@ -24,7 +24,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/router-plugin": "^1.168.38", "@types/express": "^5.0.6", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/solid/basic-virtual-file-based/package.json b/examples/solid/basic-virtual-file-based/package.json index 9d7a0d9b0a..843ac32384 100644 --- a/examples/solid/basic-virtual-file-based/package.json +++ b/examples/solid/basic-virtual-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.37", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-virtual-inside-file-based/package.json b/examples/solid/basic-virtual-inside-file-based/package.json index f7fa4c20ae..1796b70bdb 100644 --- a/examples/solid/basic-virtual-inside-file-based/package.json +++ b/examples/solid/basic-virtual-inside-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.37", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index 16601fb4fc..4733f57433 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/deferred-data/package.json b/examples/solid/deferred-data/package.json index 4549a5b864..d3d8f8f4f6 100644 --- a/examples/solid/deferred-data/package.json +++ b/examples/solid/deferred-data/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json index 9162290883..3ad847bfef 100644 --- a/examples/solid/i18n-paraglide/package.json +++ b/examples/solid/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.38", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 7c82c9c186..713bbcc7fa 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -19,7 +19,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/router-plugin": "^1.168.38", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/kitchen-sink-solid-query-file-based/package.json b/examples/solid/kitchen-sink-solid-query-file-based/package.json index 87d474da92..1f929f1049 100644 --- a/examples/solid/kitchen-sink-solid-query-file-based/package.json +++ b/examples/solid/kitchen-sink-solid-query-file-based/package.json @@ -10,11 +10,11 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/router-plugin": "^1.168.38", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json index 3232f6f929..b0fcb6fe35 100644 --- a/examples/solid/kitchen-sink-solid-query/package.json +++ b/examples/solid/kitchen-sink-solid-query/package.json @@ -12,8 +12,8 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/kitchen-sink/package.json b/examples/solid/kitchen-sink/package.json index 557d63a7bd..6a06f227ac 100644 --- a/examples/solid/kitchen-sink/package.json +++ b/examples/solid/kitchen-sink/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/large-file-based/package.json b/examples/solid/large-file-based/package.json index 819eaae484..b1c9550c40 100644 --- a/examples/solid/large-file-based/package.json +++ b/examples/solid/large-file-based/package.json @@ -12,10 +12,10 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/router-plugin": "^1.168.38", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/location-masking/package.json b/examples/solid/location-masking/package.json index 1b999052b7..7995e04508 100644 --- a/examples/solid/location-masking/package.json +++ b/examples/solid/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2" diff --git a/examples/solid/navigation-blocking/package.json b/examples/solid/navigation-blocking/package.json index c26c348f5e..6bc9780ccc 100644 --- a/examples/solid/navigation-blocking/package.json +++ b/examples/solid/navigation-blocking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2" diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json index 6f41c2a16a..a99060555a 100644 --- a/examples/solid/quickstart-esbuild-file-based/package.json +++ b/examples/solid/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/router-plugin": "^1.168.37", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index ba2d5b5081..f9987e3dd4 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -10,15 +10,15 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/router-plugin": "^1.168.38", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/quickstart-rspack-file-based/package.json b/examples/solid/quickstart-rspack-file-based/package.json index 561c004baa..a1b5fe1ef8 100644 --- a/examples/solid/quickstart-rspack-file-based/package.json +++ b/examples/solid/quickstart-rspack-file-based/package.json @@ -9,8 +9,8 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "postcss": "^8.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" @@ -19,7 +19,7 @@ "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/router-plugin": "^1.168.38", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2" } diff --git a/examples/solid/quickstart-webpack-file-based/package.json b/examples/solid/quickstart-webpack-file-based/package.json index c8369f3e24..9d0b4a7c73 100644 --- a/examples/solid/quickstart-webpack-file-based/package.json +++ b/examples/solid/quickstart-webpack-file-based/package.json @@ -7,15 +7,15 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { "@babel/core": "^7.28.5", "@babel/preset-typescript": "^7.27.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/router-plugin": "^1.168.38", "babel-loader": "^10.0.0", "babel-preset-solid": "^1.9.10", "css-loader": "^7.1.2", diff --git a/examples/solid/quickstart/package.json b/examples/solid/quickstart/package.json index 15d516971f..9b17a249d7 100644 --- a/examples/solid/quickstart/package.json +++ b/examples/solid/quickstart/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, diff --git a/examples/solid/router-monorepo-simple-lazy/package.json b/examples/solid/router-monorepo-simple-lazy/package.json index 22bb18c42f..b1018b7c4b 100644 --- a/examples/solid/router-monorepo-simple-lazy/package.json +++ b/examples/solid/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple-lazy/packages/app/package.json b/examples/solid/router-monorepo-simple-lazy/packages/app/package.json index 3cfa6a1377..976a2ad861 100644 --- a/examples/solid/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/solid/router-monorepo-simple-lazy/packages/app/package.json @@ -20,7 +20,7 @@ "@vitejs/plugin-react": "^6.0.1", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router-devtools": "^1.167.2", "tailwindcss": "^4.2.2", "vite": "^8.0.14", "vite-plugin-dts": "^4.5.4", diff --git a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json index ef3c64592a..e4c43a7f66 100644 --- a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.3", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/history": "^1.162.4", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.38", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json index b127e563e1..43d5b66462 100644 --- a/examples/solid/router-monorepo-simple/package.json +++ b/examples/solid/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple/packages/app/package.json b/examples/solid/router-monorepo-simple/packages/app/package.json index 937bf9795c..b10a4109b5 100644 --- a/examples/solid/router-monorepo-simple/packages/app/package.json +++ b/examples/solid/router-monorepo-simple/packages/app/package.json @@ -17,7 +17,7 @@ "vite-plugin-solid": "^2.11.11", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router-devtools": "^1.167.2", "vite": "^8.0.14", "tailwindcss": "^4.2.2", "vite-plugin-dts": "^4.5.4", diff --git a/examples/solid/router-monorepo-simple/packages/router/package.json b/examples/solid/router-monorepo-simple/packages/router/package.json index 28111efdd8..4643ad139f 100644 --- a/examples/solid/router-monorepo-simple/packages/router/package.json +++ b/examples/solid/router-monorepo-simple/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.3", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/history": "^1.162.4", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.38", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json index d689a10fa4..2fc254c18a 100644 --- a/examples/solid/router-monorepo-solid-query/package.json +++ b/examples/solid/router-monorepo-solid-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-solid-query/packages/app/package.json b/examples/solid/router-monorepo-solid-query/packages/app/package.json index bf2cc8ab04..80f711e201 100644 --- a/examples/solid/router-monorepo-solid-query/packages/app/package.json +++ b/examples/solid/router-monorepo-solid-query/packages/app/package.json @@ -18,7 +18,7 @@ "vite-plugin-solid": "^2.11.11", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router-devtools": "^1.167.2", "tailwindcss": "^4.2.2", "vite": "^8.0.14", "vite-plugin-dts": "^4.5.4", diff --git a/examples/solid/router-monorepo-solid-query/packages/router/package.json b/examples/solid/router-monorepo-solid-query/packages/router/package.json index 7806bf6aea..a08cc35674 100644 --- a/examples/solid/router-monorepo-solid-query/packages/router/package.json +++ b/examples/solid/router-monorepo-solid-query/packages/router/package.json @@ -8,10 +8,10 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.3", + "@tanstack/history": "^1.162.4", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.38", "@router-solid-mono-solid-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^4.4.3", diff --git a/examples/solid/scroll-restoration/package.json b/examples/solid/scroll-restoration/package.json index 5866680884..54decafbf6 100644 --- a/examples/solid/scroll-restoration/package.json +++ b/examples/solid/scroll-restoration/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-virtual": "^3.13.0", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/search-validator-adapters/package.json b/examples/solid/search-validator-adapters/package.json index 69a9c0a07d..106e8d3783 100644 --- a/examples/solid/search-validator-adapters/package.json +++ b/examples/solid/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.168.38", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json index 9248d85c12..b1d4ad59a6 100644 --- a/examples/solid/start-basic-auth/package.json +++ b/examples/solid/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index 16589c8771..c0883ba560 100644 --- a/examples/solid/start-basic-authjs/package.json +++ b/examples/solid/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "solid-js": "^1.9.10", "start-authjs": "^1.0.0", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json index e1407d8270..596dc0ad0b 100644 --- a/examples/solid/start-basic-cloudflare/package.json +++ b/examples/solid/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json index 3ae6fac3af..8b09eb5781 100644 --- a/examples/solid/start-basic-netlify/package.json +++ b/examples/solid/start-basic-netlify/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json index d2b844bafe..336affdf26 100644 --- a/examples/solid/start-basic-nitro/package.json +++ b/examples/solid/start-basic-nitro/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json index f423f9322d..f1d0592ce6 100644 --- a/examples/solid/start-basic-solid-query/package.json +++ b/examples/solid/start-basic-solid-query/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.2", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-start": "^1.168.51", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 3e7a0f67f5..80cf4b5e24 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", - "@tanstack/start-static-server-functions": "^1.167.34", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", + "@tanstack/start-static-server-functions": "^1.167.35", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 94a6cc5bb7..c98eae7f5c 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index 103e7e4abf..e1112c36a5 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.2", - "@tanstack/solid-start": "^1.168.50", - "@tanstack/router-plugin": "^1.168.37", + "@tanstack/solid-start": "^1.168.51", + "@tanstack/router-plugin": "^1.168.38", "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 e025ec1610..4c0548c222 100644 --- a/examples/solid/start-convex-better-auth/package.json +++ b/examples/solid/start-convex-better-auth/package.json @@ -13,9 +13,9 @@ "dependencies": { "@convex-dev/better-auth": "^0.9.7", "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "better-auth": "^1.6.19", "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 b7b853201d..35c81204d9 100644 --- a/examples/solid/start-counter/package.json +++ b/examples/solid/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "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 e08ddbef2d..83f56793c6 100644 --- a/examples/solid/start-i18n-paraglide/package.json +++ b/examples/solid/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index 5f9b5cf7d2..e2f24a1efb 100644 --- a/examples/solid/start-large/package.json +++ b/examples/solid/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "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 047dc8fa75..b260672cd9 100644 --- a/examples/solid/start-streaming-data-from-server-functions/package.json +++ b/examples/solid/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "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 b20c7022e0..3e54b8d7ab 100644 --- a/examples/solid/start-supabase-basic/package.json +++ b/examples/solid/start-supabase-basic/package.json @@ -14,9 +14,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "solid-js": "^1.9.9", "redaxios": "^0.5.1" }, diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json index 2a01439cf4..9713054dea 100644 --- a/examples/solid/start-tailwind-v4/package.json +++ b/examples/solid/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", - "@tanstack/solid-start": "^1.168.50", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-start": "^1.168.51", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json index c02a621704..54382d494e 100644 --- a/examples/solid/view-transitions/package.json +++ b/examples/solid/view-transitions/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.37", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json index ca8a276cf2..e72157f496 100644 --- a/examples/solid/with-framer-motion/package.json +++ b/examples/solid/with-framer-motion/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "solid-motionone": "^1.0.4", diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json index 19a34f0769..1271b8093a 100644 --- a/examples/solid/with-trpc/package.json +++ b/examples/solid/with-trpc/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.37", - "@tanstack/solid-router": "^1.170.33", - "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router-devtools": "^1.167.2", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "express": "^5.2.1", diff --git a/examples/vue/basic-file-based-jsx/package.json b/examples/vue/basic-file-based-jsx/package.json index c3ca8b613a..bba31464a2 100644 --- a/examples/vue/basic-file-based-jsx/package.json +++ b/examples/vue/basic-file-based-jsx/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.37", - "@tanstack/vue-router": "^1.170.32", - "@tanstack/vue-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.38", + "@tanstack/vue-router": "^1.170.33", + "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", "vue": "^3.5.16", diff --git a/examples/vue/basic-file-based-sfc/package.json b/examples/vue/basic-file-based-sfc/package.json index 1dadc2c3e6..55b3bfcb66 100644 --- a/examples/vue/basic-file-based-sfc/package.json +++ b/examples/vue/basic-file-based-sfc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.37", - "@tanstack/vue-router": "^1.170.32", - "@tanstack/vue-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.38", + "@tanstack/vue-router": "^1.170.33", + "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", "vue": "^3.5.16", diff --git a/examples/vue/basic/package.json b/examples/vue/basic/package.json index 8b70fa8fc1..fbfe8878c4 100644 --- a/examples/vue/basic/package.json +++ b/examples/vue/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/vue-router": "^1.170.32", - "@tanstack/vue-router-devtools": "^1.167.1", + "@tanstack/vue-router": "^1.170.33", + "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "vue": "^3.5.13", "tailwindcss": "4.1.18" diff --git a/packages/history/CHANGELOG.md b/packages/history/CHANGELOG.md index 91aa0d6e2f..ae0e23af42 100644 --- a/packages/history/CHANGELOG.md +++ b/packages/history/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/history +## 1.162.4 + +### Patch Changes + +- [#8359](https://github.com/TanStack/router/pull/8359) [`8fff7fa`](https://github.com/TanStack/router/commit/8fff7fa1f2e6f061916b0bf5e0ec486b2e732f94) - Normalize memory history hrefs consistently with browser and server history, including protocol-relative paths and control characters. + +- [#8352](https://github.com/TanStack/router/pull/8352) [`f021f6d`](https://github.com/TanStack/router/commit/f021f6d1c6dce6c9b54d70766f1d636d8fd9e184) - Avoid temporary arrays when replacing forward memory-history entries. + +- [#8349](https://github.com/TanStack/router/pull/8349) [`ae68535`](https://github.com/TanStack/router/commit/ae68535929043607d4ee9438f8ae401f3a064862) - Avoid generating unused history keys for locations with existing state. + +- [#8354](https://github.com/TanStack/router/pull/8354) [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244) - Use lightweight request history for SSR and make server navigation a no-op. Use redirect() to issue HTTP redirects. Server hrefs use the same normalization as browser history to handle protocol-relative URLs and control characters. + ## 1.162.3 ### Patch Changes diff --git a/packages/history/package.json b/packages/history/package.json index 6a082b1339..24987d12c7 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/history", - "version": "1.162.3", + "version": "1.162.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/CHANGELOG.md b/packages/react-router-devtools/CHANGELOG.md index 7634f3d19e..963524b66d 100644 --- a/packages/react-router-devtools/CHANGELOG.md +++ b/packages/react-router-devtools/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-router-devtools +## 1.167.2 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/react-router@1.170.36 + - @tanstack/router-devtools-core@1.168.2 + ## 1.167.1 ### Patch Changes diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index 64ddd15b16..fd750b4c2b 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.167.1", + "version": "1.167.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index b86a2723c3..5c5d1ff2c7 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,33 @@ # @tanstack/react-router +## 1.170.36 + +### Patch Changes + +- [#8390](https://github.com/TanStack/router/pull/8390) [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776) - Keep the Link location cache out of server bundles: `buildLocation` only creates, reads and writes it when `isServer` is false. Render React Links on the server without the extra prop copies and the forwarded-ref hook. Link SSR rendering is 20-40% faster in the Link benchmarks and the React Start SSR request loop about 7% faster. + + React `activeProps` and `inactiveProps` now follow one precedence rule on every link, including links whose destination is blocked for using a disallowed scheme: state props override element props, `ref` and event handlers, while `href`, `disabled` and `target` stay controlled by the router. Previously a blocked link ignored a `ref` or handler from its inactive props. + + React `Link` and `useLinkProps` split router options from element props with one key set on the client and the server. Element props pass through as given: external links forward them verbatim, falsy values included, and `useLinkProps` now returns `children` for router-controlled links as it already did for external ones. + +- [#8324](https://github.com/TanStack/router/pull/8324) [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2) - Reuse hydration snapshot getters to avoid unnecessary store-instance effect updates when Links and other hydration-aware components rerender. + +- [#8318](https://github.com/TanStack/router/pull/8318) [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8) - Allow active and inactive Link props to override base element props in React and Solid while preserving class/style merging. Keep React's `href`, `target`, and `disabled` values controlled by routing options. Preserve Vue object and nested-array class bindings, including reactive updates and server rendering, without mutating cached bindings during VNode normalization. + +- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Make `pathParamsAllowedCharacters` initialization-only. Configure it when creating the router; changing allowed characters requires a new router instance. Remove decoder-update bookkeeping and decoder-change checks from route-owned path caches. + +- [#8370](https://github.com/TanStack/router/pull/8370) [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5) - Stop exporting the internal `isPlainObject` and `isPlainArray` helpers. + +- [#8324](https://github.com/TanStack/router/pull/8324) [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2) - Avoid a redundant prop copy when rendering native Links while preserving custom-component props and the public hook result. + +- [#8252](https://github.com/TanStack/router/pull/8252) [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734) - Reduce the bundle cost of shared Link pathname interpolation while preserving its rendering performance. Reuse one interpolation pass for pathname and optional metadata, keep the bounded cache on the router, and simplify React Link active-state and prop merging. + +- [#8370](https://github.com/TanStack/router/pull/8370) [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5) - Reuse built locations for Links whose destination does not depend on the current location. `buildLocation` keeps the result per options object when the build never read the current location, and the React `Link` passes one stable options object per instance, so navigations resolve unchanged Links with a lookup instead of a full build. The per-route pathname interpolation cache this replaces is removed. Link `params`, `search` and `activeOptions` are compared by value on render, so inline object literals with unchanged contents keep reusing the Link's location. Pass a new object to change a destination; like any other React prop, an object mutated in place is not re-read. + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`8fff7fa`](https://github.com/TanStack/router/commit/8fff7fa1f2e6f061916b0bf5e0ec486b2e732f94), [`f021f6d`](https://github.com/TanStack/router/commit/f021f6d1c6dce6c9b54d70766f1d636d8fd9e184), [`ae68535`](https://github.com/TanStack/router/commit/ae68535929043607d4ee9438f8ae401f3a064862), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/history@1.162.4 + ## 1.170.35 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index a299eba62a..98895311b4 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.170.35", + "version": "1.170.36", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/CHANGELOG.md b/packages/react-start-client/CHANGELOG.md index 74706a04e6..755f99e7a6 100644 --- a/packages/react-start-client/CHANGELOG.md +++ b/packages/react-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-start-client +## 1.168.34 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/react-router@1.170.36 + - @tanstack/start-client-core@1.170.30 + ## 1.168.33 ### Patch Changes diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 39855b30c1..15600beb05 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.168.33", + "version": "1.168.34", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index c128981657..f74930517b 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,5 +1,16 @@ # @tanstack/react-start-rsc +## 0.1.52 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/react-router@1.170.36 + - @tanstack/start-client-core@1.170.30 + - @tanstack/start-plugin-core@1.171.43 + - @tanstack/start-storage-context@1.167.32 + ## 0.1.51 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index f4180689d9..3d3b57778d 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.51", + "version": "0.1.52", "description": "React Server Components support for TanStack Start", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/CHANGELOG.md b/packages/react-start-server/CHANGELOG.md index 931df23140..558227155a 100644 --- a/packages/react-start-server/CHANGELOG.md +++ b/packages/react-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-start-server +## 1.167.41 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/react-router@1.170.36 + - @tanstack/start-server-core@1.169.35 + ## 1.167.40 ### Patch Changes diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 24da489578..b2d5666efa 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.167.40", + "version": "1.167.41", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/CHANGELOG.md b/packages/react-start/CHANGELOG.md index f2264cb2f0..2ad111c7ca 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,5 +1,18 @@ # @tanstack/react-start +## 1.168.53 + +### Patch Changes + +- Updated dependencies [[`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5)]: + - @tanstack/react-router@1.170.36 + - @tanstack/start-server-core@1.169.35 + - @tanstack/react-start-client@1.168.34 + - @tanstack/react-start-rsc@0.1.52 + - @tanstack/react-start-server@1.167.41 + - @tanstack/start-client-core@1.170.30 + - @tanstack/start-plugin-core@1.171.43 + ## 1.168.52 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index dcc5d0fd4d..65af849c6b 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.168.52", + "version": "1.168.53", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/CHANGELOG.md b/packages/router-cli/CHANGELOG.md index 46069f4721..9640d444f8 100644 --- a/packages/router-cli/CHANGELOG.md +++ b/packages/router-cli/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-cli +## 1.167.36 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-generator@1.167.36 + ## 1.167.35 ### Patch Changes diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 2751830957..507c3d2e3b 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.167.35", + "version": "1.167.36", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/CHANGELOG.md b/packages/router-core/CHANGELOG.md index 00adc58808..932bb698d1 100644 --- a/packages/router-core/CHANGELOG.md +++ b/packages/router-core/CHANGELOG.md @@ -1,5 +1,62 @@ # @tanstack/router-core +## 1.171.30 + +### Patch Changes + +- [#8321](https://github.com/TanStack/router/pull/8321) [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6) - Cache route branches and interpolated paths on their route objects, removing the fixed template limit for registered routes and reusing cached paths across server requests. Rebuild tree-dependent caches together, preserve decoder and trailing-slash isolation, and keep unregistered templates bounded. + +- [#8390](https://github.com/TanStack/router/pull/8390) [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776) - Keep the Link location cache out of server bundles: `buildLocation` only creates, reads and writes it when `isServer` is false. Render React Links on the server without the extra prop copies and the forwarded-ref hook. Link SSR rendering is 20-40% faster in the Link benchmarks and the React Start SSR request loop about 7% faster. + + React `activeProps` and `inactiveProps` now follow one precedence rule on every link, including links whose destination is blocked for using a disallowed scheme: state props override element props, `ref` and event handlers, while `href`, `disabled` and `target` stay controlled by the router. Previously a blocked link ignored a `ref` or handler from its inactive props. + + React `Link` and `useLinkProps` split router options from element props with one key set on the client and the server. Element props pass through as given: external links forward them verbatim, falsy values included, and `useLinkProps` now returns `children` for router-controlled links as it already did for external ones. + +- [#8382](https://github.com/TanStack/router/pull/8382) [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed) - `buildLocation` no longer structurally shares the built `search` and `state` with the current location. The observable `location.search` and `location.state` still preserve equal nested references across navigations, because `parseLocation` stabilizes them once a location is committed. A search whose contents equal the current search but list its keys in a different order now serializes in the requested order, so navigating to it creates a new history entry instead of being treated as the same location. A `state` object passed to `navigate` or `buildLocation` is never mutated. + +- [#8325](https://github.com/TanStack/router/pull/8325) [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274) - Reuse the already-owned raw-param snapshot during lightweight source matching instead of copying it again. + +- [#8325](https://github.com/TanStack/router/pull/8325) [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274) - Reduce transient JIT compilation memory during navigation by separating search middleware collection from recursive execution. + +- [#8252](https://github.com/TanStack/router/pull/8252) [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734) - Collect shared pathname-cache keys during interpolation instead of parsing templates twice, and share dynamic-segment handling to reduce bundle size. + +- [#8319](https://github.com/TanStack/router/pull/8319) [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa) - Simplify path interpolation into ordered segment-type blocks with shared prefix/value/suffix assembly. Preserve one-pass parsing and optional metadata collection, and reuse the public result object instead of allocating and clearing a missing-parameter callback. + +- [#8252](https://github.com/TanStack/router/pull/8252) [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734) - Reuse pathname interpolation across Links with bounded router-scoped caches. Keep parameter callbacks and navigation state independent of the cache. + +- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Make `pathParamsAllowedCharacters` initialization-only. Configure it when creating the router; changing allowed characters requires a new router instance. Remove decoder-update bookkeeping and decoder-change checks from route-owned path caches. + +- [#8370](https://github.com/TanStack/router/pull/8370) [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5) - Stop exporting the internal `isPlainObject` and `isPlainArray` helpers. + +- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Initialize routes directly during route-tree processing, removing the callback indirection while preserving parent-first initialization and route indexes. + +- [#8328](https://github.com/TanStack/router/pull/8328) [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5) - Reduce duplication in navigation parameter handling while preserving parameter inheritance, null-prototype dictionaries, and updater isolation. + +- [#8410](https://github.com/TanStack/router/pull/8410) [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58) - Treat `0` and `false` as provided `_splat` values when interpolating paths. Only `undefined`, `null`, and `''` now omit a splat segment, matching how other path params are stringified. + +- [#8354](https://github.com/TanStack/router/pull/8354) [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244) - Use lightweight request history for SSR and make server navigation a no-op. Use redirect() to issue HTTP redirects. Server hrefs use the same normalization as browser history to handle protocol-relative URLs and control characters. + +- [#8321](https://github.com/TanStack/router/pull/8321) [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6) - Consolidate internal path interpolation into `interpolatePath`, returning a pathname directly and collecting metadata only when requested. Update router and devtools callers without changing route parsing or interpolation caching. + +- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Reduce route-tree initialization work by avoiding temporary path-joining arrays and duplicate ID normalization. + +- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Reuse parsed route segments when generating paths for navigation, Links, and Devtools. Preserve interpolation metadata and refresh segments when the route tree is rebuilt, without reparsing templates for new parameter values. + +- [#8252](https://github.com/TanStack/router/pull/8252) [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734) - Reduce the bundle cost of shared Link pathname interpolation while preserving its rendering performance. Reuse one interpolation pass for pathname and optional metadata, keep the bounded cache on the router, and simplify React Link active-state and prop merging. + +- [#8385](https://github.com/TanStack/router/pull/8385) [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09) - Collect search middlewares with a counted loop so the optimized code stays valid across navigations. This removes a JIT recompilation that raised peak memory in the interrupted-navigations client memory benchmark. + +- [#8370](https://github.com/TanStack/router/pull/8370) [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5) - Reuse built locations for Links whose destination does not depend on the current location. `buildLocation` keeps the result per options object when the build never read the current location, and the React `Link` passes one stable options object per instance, so navigations resolve unchanged Links with a lookup instead of a full build. The per-route pathname interpolation cache this replaces is removed. Link `params`, `search` and `activeOptions` are compared by value on render, so inline object literals with unchanged contents keep reusing the Link's location. Pass a new object to change a destination; like any other React prop, an object mutated in place is not re-read. + +- [#8325](https://github.com/TanStack/router/pull/8325) [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274) - Cache normalized route pathnames so repeated Link destinations do not decode the same interpolation result again. + +- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Share compact parsed route segments between matching and interpolation, preserve original parameter names, and avoid reparsing templates while building paths. Simplify route-tree traversal, reuse existing path helpers, and keep Devtools-only navigation validation out of the production formatter. Preserve dynamic match identity for standalone legacy fallback routes. + +- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Pass route initialization indexes directly instead of wrapping each index in an options object. + +- Updated dependencies [[`8fff7fa`](https://github.com/TanStack/router/commit/8fff7fa1f2e6f061916b0bf5e0ec486b2e732f94), [`f021f6d`](https://github.com/TanStack/router/commit/f021f6d1c6dce6c9b54d70766f1d636d8fd9e184), [`ae68535`](https://github.com/TanStack/router/commit/ae68535929043607d4ee9438f8ae401f3a064862), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244)]: + - @tanstack/history@1.162.4 + ## 1.171.29 ### Patch Changes diff --git a/packages/router-core/package.json b/packages/router-core/package.json index cdf2145133..6da94fab6c 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.171.29", + "version": "1.171.30", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/CHANGELOG.md b/packages/router-devtools-core/CHANGELOG.md index be1a138356..791c877aa9 100644 --- a/packages/router-devtools-core/CHANGELOG.md +++ b/packages/router-devtools-core/CHANGELOG.md @@ -1,5 +1,18 @@ # @tanstack/router-devtools-core +## 1.168.2 + +### Patch Changes + +- [#8321](https://github.com/TanStack/router/pull/8321) [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6) - Consolidate internal path interpolation into `interpolatePath`, returning a pathname directly and collecting metadata only when requested. Update router and devtools callers without changing route parsing or interpolation caching. + +- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Reuse parsed route segments when generating paths for navigation, Links, and Devtools. Preserve interpolation metadata and refresh segments when the route tree is rebuilt, without reparsing templates for new parameter values. + +- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Share compact parsed route segments between matching and interpolation, preserve original parameter names, and avoid reparsing templates while building paths. Simplify route-tree traversal, reuse existing path helpers, and keep Devtools-only navigation validation out of the production formatter. Preserve dynamic match identity for standalone legacy fallback routes. + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + ## 1.168.1 ### Patch Changes diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index d09debc2df..722a76e522 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.168.1", + "version": "1.168.2", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/CHANGELOG.md b/packages/router-devtools/CHANGELOG.md index 445e7578dc..3ba014e38f 100644 --- a/packages/router-devtools/CHANGELOG.md +++ b/packages/router-devtools/CHANGELOG.md @@ -1,5 +1,13 @@ # @tanstack/router-devtools +## 1.167.2 + +### Patch Changes + +- Updated dependencies [[`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5)]: + - @tanstack/react-router@1.170.36 + - @tanstack/react-router-devtools@1.167.2 + ## 1.167.1 ### Patch Changes diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index 65bbae13aa..2aa446dbab 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.167.1", + "version": "1.167.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/CHANGELOG.md b/packages/router-generator/CHANGELOG.md index c9d07c713c..adc652fd51 100644 --- a/packages/router-generator/CHANGELOG.md +++ b/packages/router-generator/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-generator +## 1.167.36 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + ## 1.167.35 ### Patch Changes diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index 558f307860..85a3dedc8d 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.167.35", + "version": "1.167.36", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/CHANGELOG.md b/packages/router-plugin/CHANGELOG.md index 2546e9da05..172fb3e48f 100644 --- a/packages/router-plugin/CHANGELOG.md +++ b/packages/router-plugin/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/router-plugin +## 1.168.38 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/react-router@1.170.36 + - @tanstack/router-generator@1.167.36 + ## 1.168.37 ### Patch Changes diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 1eb4c0bd04..3641b81e84 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.168.37", + "version": "1.168.38", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/CHANGELOG.md b/packages/router-vite-plugin/CHANGELOG.md index 8e4a382442..4706b7aa6d 100644 --- a/packages/router-vite-plugin/CHANGELOG.md +++ b/packages/router-vite-plugin/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-vite-plugin +## 1.167.38 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-plugin@1.168.38 + ## 1.167.37 ### Patch Changes diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index d8936d3aef..f1c4aaa6a4 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.167.37", + "version": "1.167.38", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/CHANGELOG.md b/packages/solid-router-devtools/CHANGELOG.md index 505ab5b756..9684a0567d 100644 --- a/packages/solid-router-devtools/CHANGELOG.md +++ b/packages/solid-router-devtools/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-router-devtools +## 1.167.2 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/solid-router@1.170.34 + - @tanstack/router-devtools-core@1.168.2 + ## 1.167.1 ### Patch Changes diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index ce8ac27244..80cdda7208 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.167.1", + "version": "1.167.2", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/CHANGELOG.md b/packages/solid-router/CHANGELOG.md index 6ea0f02d23..19b561901a 100644 --- a/packages/solid-router/CHANGELOG.md +++ b/packages/solid-router/CHANGELOG.md @@ -1,5 +1,23 @@ # @tanstack/solid-router +## 1.170.34 + +### Patch Changes + +- [#8318](https://github.com/TanStack/router/pull/8318) [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8) - Keep Solid Link's computed `href`, `target`, and `disabled` values authoritative when active or inactive state props contain routing options, while preserving state-prop refs, event handlers, and class/style merging. + +- [#8318](https://github.com/TanStack/router/pull/8318) [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8) - Allow active and inactive Link props to override base element props in React and Solid while preserving class/style merging. Keep React's `href`, `target`, and `disabled` values controlled by routing options. Preserve Vue object and nested-array class bindings, including reactive updates and server rendering, without mutating cached bindings during VNode normalization. + +- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Make `pathParamsAllowedCharacters` initialization-only. Configure it when creating the router; changing allowed characters requires a new router instance. Remove decoder-update bookkeeping and decoder-change checks from route-owned path caches. + +- [#8370](https://github.com/TanStack/router/pull/8370) [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5) - Stop exporting the internal `isPlainObject` and `isPlainArray` helpers. + +- [#8318](https://github.com/TanStack/router/pull/8318) [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8) - Reduce Link bundle size by sharing exact/fuzzy active-path checks and resolving only the selected active or inactive props. Avoid unnecessary class/style allocations while preserving reactive style updates, server rendering, and each framework's prop-override behavior. + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`8fff7fa`](https://github.com/TanStack/router/commit/8fff7fa1f2e6f061916b0bf5e0ec486b2e732f94), [`f021f6d`](https://github.com/TanStack/router/commit/f021f6d1c6dce6c9b54d70766f1d636d8fd9e184), [`ae68535`](https://github.com/TanStack/router/commit/ae68535929043607d4ee9438f8ae401f3a064862), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/history@1.162.4 + ## 1.170.33 ### Patch Changes diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index f8565d9803..973ec771cd 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.170.33", + "version": "1.170.34", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/CHANGELOG.md b/packages/solid-start-client/CHANGELOG.md index ef41079cc0..c64322654c 100644 --- a/packages/solid-start-client/CHANGELOG.md +++ b/packages/solid-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start-client +## 1.168.33 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/solid-router@1.170.34 + - @tanstack/start-client-core@1.170.30 + ## 1.168.32 ### Patch Changes diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 5c34a2f528..c5eac7c433 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.168.32", + "version": "1.168.33", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/CHANGELOG.md b/packages/solid-start-server/CHANGELOG.md index 76d03290db..c9c1c3779c 100644 --- a/packages/solid-start-server/CHANGELOG.md +++ b/packages/solid-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start-server +## 1.167.40 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/solid-router@1.170.34 + - @tanstack/start-server-core@1.169.35 + ## 1.167.39 ### Patch Changes diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 9308d2d45e..bb3d107552 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.167.39", + "version": "1.167.40", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/CHANGELOG.md b/packages/solid-start/CHANGELOG.md index c100757c91..d6df6fd469 100644 --- a/packages/solid-start/CHANGELOG.md +++ b/packages/solid-start/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/solid-start +## 1.168.51 + +### Patch Changes + +- Updated dependencies [[`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8)]: + - @tanstack/solid-router@1.170.34 + - @tanstack/start-server-core@1.169.35 + - @tanstack/solid-start-client@1.168.33 + - @tanstack/solid-start-server@1.167.40 + - @tanstack/start-client-core@1.170.30 + - @tanstack/start-plugin-core@1.171.43 + ## 1.168.50 ### Patch Changes diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index a2346beb6a..cc3a176270 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.168.50", + "version": "1.168.51", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/CHANGELOG.md b/packages/start-client-core/CHANGELOG.md index 717564e04c..4997522d08 100644 --- a/packages/start-client-core/CHANGELOG.md +++ b/packages/start-client-core/CHANGELOG.md @@ -1,5 +1,13 @@ # @tanstack/start-client-core +## 1.170.30 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/start-storage-context@1.167.32 + ## 1.170.29 ### Patch Changes diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index bbb5bac647..b837ee902c 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.170.29", + "version": "1.170.30", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/CHANGELOG.md b/packages/start-plugin-core/CHANGELOG.md index 1e7e2aaf94..51ad0f7ac2 100644 --- a/packages/start-plugin-core/CHANGELOG.md +++ b/packages/start-plugin-core/CHANGELOG.md @@ -1,5 +1,15 @@ # @tanstack/start-plugin-core +## 1.171.43 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/start-server-core@1.169.35 + - @tanstack/router-generator@1.167.36 + - @tanstack/router-plugin@1.168.38 + ## 1.171.42 ### Patch Changes diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 8b06ebe872..72ef829bcf 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.42", + "version": "1.171.43", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/CHANGELOG.md b/packages/start-server-core/CHANGELOG.md index 2fe93962c2..415eabbbab 100644 --- a/packages/start-server-core/CHANGELOG.md +++ b/packages/start-server-core/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/start-server-core +## 1.169.35 + +### Patch Changes + +- [#8354](https://github.com/TanStack/router/pull/8354) [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244) - Use lightweight request history for SSR and make server navigation a no-op. Use redirect() to issue HTTP redirects. Server hrefs use the same normalization as browser history to handle protocol-relative URLs and control characters. + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`8fff7fa`](https://github.com/TanStack/router/commit/8fff7fa1f2e6f061916b0bf5e0ec486b2e732f94), [`f021f6d`](https://github.com/TanStack/router/commit/f021f6d1c6dce6c9b54d70766f1d636d8fd9e184), [`ae68535`](https://github.com/TanStack/router/commit/ae68535929043607d4ee9438f8ae401f3a064862), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/history@1.162.4 + - @tanstack/start-client-core@1.170.30 + - @tanstack/start-storage-context@1.167.32 + ## 1.169.34 ### Patch Changes diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 389ecd5df3..2f9a8df05b 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.169.34", + "version": "1.169.35", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-static-server-functions/CHANGELOG.md b/packages/start-static-server-functions/CHANGELOG.md index fac3c56f0b..dedd66863b 100644 --- a/packages/start-static-server-functions/CHANGELOG.md +++ b/packages/start-static-server-functions/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/start-static-server-functions +## 1.167.35 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/start-client-core@1.170.30 + - @tanstack/react-start@1.168.53 + - @tanstack/solid-start@1.168.51 + ## 1.167.34 ### Patch Changes diff --git a/packages/start-static-server-functions/package.json b/packages/start-static-server-functions/package.json index e519d1dc24..e83124036c 100644 --- a/packages/start-static-server-functions/package.json +++ b/packages/start-static-server-functions/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-static-server-functions", - "version": "1.167.34", + "version": "1.167.35", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-storage-context/CHANGELOG.md b/packages/start-storage-context/CHANGELOG.md index 5d2f96bc38..479b58aa08 100644 --- a/packages/start-storage-context/CHANGELOG.md +++ b/packages/start-storage-context/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/start-storage-context +## 1.167.32 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + ## 1.167.31 ### Patch Changes diff --git a/packages/start-storage-context/package.json b/packages/start-storage-context/package.json index 5c314dc9b9..734722bd3a 100644 --- a/packages/start-storage-context/package.json +++ b/packages/start-storage-context/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-storage-context", - "version": "1.167.31", + "version": "1.167.32", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-router-devtools/CHANGELOG.md b/packages/vue-router-devtools/CHANGELOG.md index 4e20f51a13..275c8c9d48 100644 --- a/packages/vue-router-devtools/CHANGELOG.md +++ b/packages/vue-router-devtools/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-router-devtools +## 1.167.2 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`cb8749e`](https://github.com/TanStack/router/commit/cb8749e9fcd32d2290bf6c957b2701c3c0a14da5), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/vue-router@1.170.33 + - @tanstack/router-devtools-core@1.168.2 + ## 1.167.1 ### Patch Changes diff --git a/packages/vue-router-devtools/package.json b/packages/vue-router-devtools/package.json index 8310965e0c..4c8405dca7 100644 --- a/packages/vue-router-devtools/package.json +++ b/packages/vue-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-router-devtools", - "version": "1.167.1", + "version": "1.167.2", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-router/CHANGELOG.md b/packages/vue-router/CHANGELOG.md index 52c3ac0daf..d21b1c852c 100644 --- a/packages/vue-router/CHANGELOG.md +++ b/packages/vue-router/CHANGELOG.md @@ -1,5 +1,23 @@ # @tanstack/vue-router +## 1.170.33 + +### Patch Changes + +- [#8326](https://github.com/TanStack/router/pull/8326) [`cb8749e`](https://github.com/TanStack/router/commit/cb8749e9fcd32d2290bf6c957b2701c3c0a14da5) - Remove an unnecessary match Fragment to reduce VNode allocation and transient JIT compilation memory while preserving route content and scroll restoration. + +- [#8318](https://github.com/TanStack/router/pull/8318) [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8) - Allow active and inactive Link props to override base element props in React and Solid while preserving class/style merging. Keep React's `href`, `target`, and `disabled` values controlled by routing options. Preserve Vue object and nested-array class bindings, including reactive updates and server rendering, without mutating cached bindings during VNode normalization. + +- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Make `pathParamsAllowedCharacters` initialization-only. Configure it when creating the router; changing allowed characters requires a new router instance. Remove decoder-update bookkeeping and decoder-change checks from route-owned path caches. + +- [#8370](https://github.com/TanStack/router/pull/8370) [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5) - Stop exporting the internal `isPlainObject` and `isPlainArray` helpers. + +- [#8318](https://github.com/TanStack/router/pull/8318) [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8) - Reduce Link bundle size by sharing exact/fuzzy active-path checks and resolving only the selected active or inactive props. Avoid unnecessary class/style allocations while preserving reactive style updates, server rendering, and each framework's prop-override behavior. + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`8fff7fa`](https://github.com/TanStack/router/commit/8fff7fa1f2e6f061916b0bf5e0ec486b2e732f94), [`f021f6d`](https://github.com/TanStack/router/commit/f021f6d1c6dce6c9b54d70766f1d636d8fd9e184), [`ae68535`](https://github.com/TanStack/router/commit/ae68535929043607d4ee9438f8ae401f3a064862), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/history@1.162.4 + ## 1.170.32 ### Patch Changes diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index 9b53e1b7fe..7bafd7133e 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-router", - "version": "1.170.32", + "version": "1.170.33", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-client/CHANGELOG.md b/packages/vue-start-client/CHANGELOG.md index 774cfa7698..cb6913fe5b 100644 --- a/packages/vue-start-client/CHANGELOG.md +++ b/packages/vue-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-start-client +## 1.167.36 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`cb8749e`](https://github.com/TanStack/router/commit/cb8749e9fcd32d2290bf6c957b2701c3c0a14da5), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/vue-router@1.170.33 + - @tanstack/start-client-core@1.170.30 + ## 1.167.35 ### Patch Changes diff --git a/packages/vue-start-client/package.json b/packages/vue-start-client/package.json index e831c43747..2248242208 100644 --- a/packages/vue-start-client/package.json +++ b/packages/vue-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-client", - "version": "1.167.35", + "version": "1.167.36", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-server/CHANGELOG.md b/packages/vue-start-server/CHANGELOG.md index fcb8c65d25..71a9eed707 100644 --- a/packages/vue-start-server/CHANGELOG.md +++ b/packages/vue-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-start-server +## 1.167.40 + +### Patch Changes + +- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`cb8749e`](https://github.com/TanStack/router/commit/cb8749e9fcd32d2290bf6c957b2701c3c0a14da5), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: + - @tanstack/router-core@1.171.30 + - @tanstack/vue-router@1.170.33 + - @tanstack/start-server-core@1.169.35 + ## 1.167.39 ### Patch Changes diff --git a/packages/vue-start-server/package.json b/packages/vue-start-server/package.json index 3166ee0e6d..03b0c8da44 100644 --- a/packages/vue-start-server/package.json +++ b/packages/vue-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-server", - "version": "1.167.39", + "version": "1.167.40", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start/CHANGELOG.md b/packages/vue-start/CHANGELOG.md index 51040b0973..ea8cbca12c 100644 --- a/packages/vue-start/CHANGELOG.md +++ b/packages/vue-start/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/vue-start +## 1.168.50 + +### Patch Changes + +- Updated dependencies [[`cb8749e`](https://github.com/TanStack/router/commit/cb8749e9fcd32d2290bf6c957b2701c3c0a14da5), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8)]: + - @tanstack/vue-router@1.170.33 + - @tanstack/start-server-core@1.169.35 + - @tanstack/start-client-core@1.170.30 + - @tanstack/start-plugin-core@1.171.43 + - @tanstack/vue-start-client@1.167.36 + - @tanstack/vue-start-server@1.167.40 + ## 1.168.49 ### Patch Changes diff --git a/packages/vue-start/package.json b/packages/vue-start/package.json index 5c91470fa2..90a7bd7f2f 100644 --- a/packages/vue-start/package.json +++ b/packages/vue-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start", - "version": "1.168.49", + "version": "1.168.50", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 08b44bf2db..4dd7da41b9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10593,6 +10593,52 @@ 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.9.0) + examples/react/start-next-migration: + dependencies: + '@tanstack/react-router': + specifier: workspace:* + version: link:../../../packages/react-router + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start + iron-session: + specifier: ^9.0.0 + version: 9.0.1 + next: + specifier: 16.3.4 + version: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) + 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.61.0 + version: 1.61.1 + '@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) + '@vitejs/plugin-react': + specifier: ^6.0.1 + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + nitro: + specifier: ^3.0.260311-beta + version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + typescript: + specifier: npm:@typescript/typescript6@^6.0.2 + version: '@typescript/typescript6@6.0.2' + vite: + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + examples/react/start-rscs: dependencies: '@tanstack/react-router': @@ -11149,7 +11195,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11189,7 +11235,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11232,7 +11278,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11275,7 +11321,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11312,7 +11358,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11346,7 +11392,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11386,7 +11432,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11432,7 +11478,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11475,7 +11521,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11515,7 +11561,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router compression: specifier: ^1.8.0 @@ -11558,7 +11604,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11616,7 +11662,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11659,7 +11705,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11699,7 +11745,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11739,7 +11785,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router solid-js: specifier: 1.9.12 @@ -11773,7 +11819,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11813,7 +11859,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11862,7 +11908,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11911,7 +11957,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11957,7 +12003,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11997,7 +12043,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12034,7 +12080,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12068,7 +12114,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12099,7 +12145,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12130,7 +12176,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12170,7 +12216,7 @@ importers: specifier: ^4.2.2 version: 4.2.2 '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12207,7 +12253,7 @@ importers: examples/solid/quickstart-webpack-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12271,7 +12317,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12308,7 +12354,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12351,7 +12397,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12388,7 +12434,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12431,7 +12477,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12486,7 +12532,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12541,7 +12587,7 @@ importers: specifier: ^7.0.0 version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12593,7 +12639,7 @@ importers: specifier: ^0.41.1 version: 0.41.1 '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12636,7 +12682,7 @@ importers: examples/solid/start-basic-cloudflare: dependencies: '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12679,7 +12725,7 @@ importers: examples/solid/start-basic-netlify: dependencies: '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12719,7 +12765,7 @@ importers: examples/solid/start-basic-nitro: dependencies: '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12765,7 +12811,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12811,7 +12857,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12866,7 +12912,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12928,12 +12974,12 @@ importers: dependencies: '@convex-dev/better-auth': specifier: ^0.9.7 - version: 0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12943,7 +12989,7 @@ importers: version: link:../../../packages/solid-start better-auth: specifier: ^1.6.19 - version: 1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) clsx: specifier: ^2.1.1 version: 2.1.1 @@ -12986,12 +13032,12 @@ importers: 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.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) examples/solid/start-counter: dependencies: '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13037,7 +13083,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13080,7 +13126,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13126,7 +13172,7 @@ importers: examples/solid/start-streaming-data-from-server-functions: dependencies: '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13166,7 +13212,7 @@ importers: specifier: ^2.48.1 version: 2.48.1 '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13206,7 +13252,7 @@ importers: examples/solid/start-tailwind-v4: dependencies: '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13255,7 +13301,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13292,7 +13338,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13335,7 +13381,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.33 + specifier: ^1.170.34 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -14475,7 +14521,7 @@ importers: version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) webpack: specifier: ^5.104.1 - version: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) + version: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) packages/router-ssr-query-core: devDependencies: @@ -15582,52 +15628,6 @@ importers: specifier: ^3.24.2 version: 3.25.57 - examples/react/start-next-migration: - dependencies: - '@tanstack/react-router': - specifier: workspace:* - version: link:../../../packages/react-router - '@tanstack/react-start': - specifier: workspace:* - version: link:../../../packages/react-start - iron-session: - specifier: ^9.0.0 - version: 9.0.1 - next: - specifier: 16.3.4 - version: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) - 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.61.0 - version: 1.61.1 - '@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) - '@vitejs/plugin-react': - specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - typescript: - specifier: npm:@typescript/typescript6@^6.0.2 - version: '@typescript/typescript6@6.0.2' - vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - packages: '@adobe/css-tools@4.4.1': @@ -17835,6 +17835,10 @@ packages: resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==} engines: {node: '>=18'} + '@img/colour@1.1.0': + resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==} + engines: {node: '>=18'} + '@img/sharp-darwin-arm64@0.34.4': resolution: {integrity: sha512-sitdlPzDVyvmINUdJle3TNHl+AG9QcwiAMsXmccqsCOMZNIdW2/7S26w0LyU8euiLVzFBL3dXPwVCq/ODnf2vA==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -17847,6 +17851,12 @@ packages: cpu: [arm64] os: [darwin] + '@img/sharp-darwin-arm64@0.35.4': + resolution: {integrity: sha512-Uhfl4V4lhP2nbUVF9+hyH1+luj86f1gUFeo8ALYxFoULoU+G87D43BfeMP8XHsk9boxAnCY/bf2EHwhA7MuGsA==} + engines: {node: '>=20.9.0'} + cpu: [arm64] + os: [darwin] + '@img/sharp-darwin-x64@0.34.4': resolution: {integrity: sha512-rZheupWIoa3+SOdF/IcUe1ah4ZDpKBGWcsPX6MT0lYniH9micvIU7HQkYTfrx5Xi8u+YqwLtxC/3vl8TQN6rMg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -17859,6 +17869,17 @@ packages: cpu: [x64] os: [darwin] + '@img/sharp-darwin-x64@0.35.4': + resolution: {integrity: sha512-hWniXY3bG5qKpkKrAwPe4y+VTPmf086YQAnkxWh7uA1YrlRouWGa0M0Mxj3ZjnXFkv7/TD1bTy9lGUK26vRvWw==} + engines: {node: '>=20.9.0'} + cpu: [x64] + os: [darwin] + + '@img/sharp-freebsd-wasm32@0.35.4': + resolution: {integrity: sha512-lIsKw/BU+kjB4eZjxrYrZmwOJYi3Ajrv66iAlBmUPyKc3HpnloevB1g3wxGD9P/5BbQ1brBGl65VRRrCvQDEqA==} + engines: {node: '>=20.9.0'} + os: [freebsd] + '@img/sharp-libvips-darwin-arm64@1.2.3': resolution: {integrity: sha512-QzWAKo7kpHxbuHqUC28DZ9pIKpSi2ts2OJnoIGI26+HMgq92ZZ4vk8iJd4XsxN+tYfNJxzH6W62X5eTcsBymHw==} cpu: [arm64] @@ -17869,6 +17890,11 @@ packages: cpu: [arm64] os: [darwin] + '@img/sharp-libvips-darwin-arm64@1.3.3': + resolution: {integrity: sha512-suTBPTDGrI9WodccaDdwZItTSaBYASlBk1NSfElSHrUfzu3szG6lvIF58+WiFvnfzuK8ZBFS5zE00PxqxnRiPg==} + cpu: [arm64] + os: [darwin] + '@img/sharp-libvips-darwin-x64@1.2.3': resolution: {integrity: sha512-Ju+g2xn1E2AKO6YBhxjj+ACcsPQRHT0bhpglxcEf+3uyPY+/gL8veniKoo96335ZaPo03bdDXMv0t+BBFAbmRA==} cpu: [x64] @@ -17879,6 +17905,11 @@ packages: cpu: [x64] os: [darwin] + '@img/sharp-libvips-darwin-x64@1.3.3': + resolution: {integrity: sha512-FVJZ5mITMobmXIz/hPDTw0EintTW5H3WfrxwLqEqjiIihlu+hVRyGrFQ60xl0Lxn7Bt3zdpevPaQi0HEzqz9fw==} + cpu: [x64] + os: [darwin] + '@img/sharp-libvips-linux-arm64@1.2.3': resolution: {integrity: sha512-I4RxkXU90cpufazhGPyVujYwfIm9Nk1QDEmiIsaPwdnm013F7RIceaCc87kAH+oUB1ezqEvC6ga4m7MSlqsJvQ==} cpu: [arm64] @@ -17891,6 +17922,12 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-libvips-linux-arm64@1.3.3': + resolution: {integrity: sha512-0DaL0A6Xu6sQSQFwe4iVCrKWU2cCTItnRsYsCdxAMm9NF6twAA9BKnoqy4hqz4+azQ0JHuA26qiUKsf1XJ/v5A==} + cpu: [arm64] + os: [linux] + libc: [glibc] + '@img/sharp-libvips-linux-arm@1.2.3': resolution: {integrity: sha512-x1uE93lyP6wEwGvgAIV0gP6zmaL/a0tGzJs/BIDDG0zeBhMnuUPm7ptxGhUbcGs4okDJrk4nxgrmxpib9g6HpA==} cpu: [arm] @@ -17903,6 +17940,12 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-libvips-linux-arm@1.3.3': + resolution: {integrity: sha512-3rbU4vqXXc3hY/OiXdl52xZvT0F1yEngWfvqudtPJg/KkyiaQw2DRsFrNzpmLvfavbwOq3qXn36GP8obHRULQA==} + cpu: [arm] + os: [linux] + libc: [glibc] + '@img/sharp-libvips-linux-ppc64@1.2.3': resolution: {integrity: sha512-Y2T7IsQvJLMCBM+pmPbM3bKT/yYJvVtLJGfCs4Sp95SjvnFIjynbjzsa7dY1fRJX45FTSfDksbTp6AGWudiyCg==} cpu: [ppc64] @@ -17915,12 +17958,24 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-libvips-linux-ppc64@1.3.3': + resolution: {integrity: sha512-cdn1OvUBwsXhbC0zSzJnNzf5MZ/mTrobawDvNXBTxe8VtqKAm0sRuEY2Evzovb/w9JMk4TvRxqt1mekSuJz64w==} + cpu: [ppc64] + os: [linux] + libc: [glibc] + '@img/sharp-libvips-linux-riscv64@1.2.4': resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==} cpu: [riscv64] os: [linux] libc: [glibc] + '@img/sharp-libvips-linux-riscv64@1.3.3': + resolution: {integrity: sha512-HjPVx7yKz+0lqdhDlTw1tt90wamBoxhiXpvl1XZpJLiHH4RCJ5yDTqH+VlYPv2fwFs89JFw4c1IexYOcQUi4IQ==} + cpu: [riscv64] + os: [linux] + libc: [glibc] + '@img/sharp-libvips-linux-s390x@1.2.3': resolution: {integrity: sha512-RgWrs/gVU7f+K7P+KeHFaBAJlNkD1nIZuVXdQv6S+fNA6syCcoboNjsV2Pou7zNlVdNQoQUpQTk8SWDHUA3y/w==} cpu: [s390x] @@ -17933,6 +17988,12 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-libvips-linux-s390x@1.3.3': + resolution: {integrity: sha512-neWLh+3yCNThxnfy3c4BbVBeGgt9aftno+XbT56iK28RgeDs3UOFWviLWlUu0bArYVYJaFDK+RRohbicUNCm8Q==} + cpu: [s390x] + os: [linux] + libc: [glibc] + '@img/sharp-libvips-linux-x64@1.2.3': resolution: {integrity: sha512-3JU7LmR85K6bBiRzSUc/Ff9JBVIFVvq6bomKE0e63UXGeRw2HPVEjoJke1Yx+iU4rL7/7kUjES4dZ/81Qjhyxg==} cpu: [x64] @@ -17945,6 +18006,12 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-libvips-linux-x64@1.3.3': + resolution: {integrity: sha512-4vKmvAst9nrowcqquKFAyZJUDolUaIp8uRiN0mWFguJ1IplC9/pitXtlnnlU4aa/eJw3J7i67V+pwUL+wZGdsA==} + cpu: [x64] + os: [linux] + libc: [glibc] + '@img/sharp-libvips-linuxmusl-arm64@1.2.3': resolution: {integrity: sha512-F9q83RZ8yaCwENw1GieztSfj5msz7GGykG/BA+MOUefvER69K/ubgFHNeSyUu64amHIYKGDs4sRCMzXVj8sEyw==} cpu: [arm64] @@ -17957,6 +18024,12 @@ packages: os: [linux] libc: [musl] + '@img/sharp-libvips-linuxmusl-arm64@1.3.3': + resolution: {integrity: sha512-Y9kQaLMuNoB0bPYOOdcZMaseNrFpPodIWWMrx+CZyydf2xn68j9WYc6sWWRrDwNkzCQjKYfc68L7jKjGlHMibw==} + cpu: [arm64] + os: [linux] + libc: [musl] + '@img/sharp-libvips-linuxmusl-x64@1.2.3': resolution: {integrity: sha512-U5PUY5jbc45ANM6tSJpsgqmBF/VsL6LnxJmIf11kB7J5DctHgqm0SkuXzVWtIY90GnJxKnC/JT251TDnk1fu/g==} cpu: [x64] @@ -17969,6 +18042,12 @@ packages: os: [linux] libc: [musl] + '@img/sharp-libvips-linuxmusl-x64@1.3.3': + resolution: {integrity: sha512-fj8Mv0HHfD1Rr+4I68+3agJynxDWtBFgicTbSOb9Bke6pIwzGcJ+RX/yHjmiEGFMCavY/dxvem7MyNaJF+wDiw==} + cpu: [x64] + os: [linux] + libc: [musl] + '@img/sharp-linux-arm64@0.34.4': resolution: {integrity: sha512-YXU1F/mN/Wu786tl72CyJjP/Ngl8mGHN1hST4BGl+hiW5jhCnV2uRVTNOcaYPs73NeT/H8Upm3y9582JVuZHrQ==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -17983,6 +18062,13 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-linux-arm64@0.35.4': + resolution: {integrity: sha512-De4jpEnAU8Hd5oT0j1G3uL4ZvTuipVMn7YC6vPaJhy6/7EwEae0SVAoBrUMYQbkLGDm85taVWwuPc1a44LTzCQ==} + engines: {node: '>=20.9.0'} + cpu: [arm64] + os: [linux] + libc: [glibc] + '@img/sharp-linux-arm@0.34.4': resolution: {integrity: sha512-Xyam4mlqM0KkTHYVSuc6wXRmM7LGN0P12li03jAnZ3EJWZqj83+hi8Y9UxZUbxsgsK1qOEwg7O0Bc0LjqQVtxA==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -17997,6 +18083,13 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-linux-arm@0.35.4': + resolution: {integrity: sha512-7OAS8gI0EReKGVN2HssHlM6umJgxF5VI3xN0p9FA91p/YO+ou5hiNghLdZ5BEHztwaaK5+bLKRf8x/o2L2nk9A==} + engines: {node: '>=20.9.0'} + cpu: [arm] + os: [linux] + libc: [glibc] + '@img/sharp-linux-ppc64@0.34.4': resolution: {integrity: sha512-F4PDtF4Cy8L8hXA2p3TO6s4aDt93v+LKmpcYFLAVdkkD3hSxZzee0rh6/+94FpAynsuMpLX5h+LRsSG3rIciUQ==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18011,6 +18104,13 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-linux-ppc64@0.35.4': + resolution: {integrity: sha512-2oYZJeIl4kCcMGk4ouZVjnkCtFrpQFlNEtJ6GbxzhHQchwH0NH/qEb9ykmOl29dqwMq+JhFdZn+1ak2FKhI9fQ==} + engines: {node: '>=20.9.0'} + cpu: [ppc64] + os: [linux] + libc: [glibc] + '@img/sharp-linux-riscv64@0.34.5': resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18018,6 +18118,13 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-linux-riscv64@0.35.4': + resolution: {integrity: sha512-cPbNChoRURAWdebDIHSenxRpgEdy7JkPydSnUxRm9VvKD7m0/xVaR/8Fzlu81pk5nHEvHH87UZUA7cTtwnbJSA==} + engines: {node: '>=20.9.0'} + cpu: [riscv64] + os: [linux] + libc: [glibc] + '@img/sharp-linux-s390x@0.34.4': resolution: {integrity: sha512-qVrZKE9Bsnzy+myf7lFKvng6bQzhNUAYcVORq2P7bDlvmF6u2sCmK2KyEQEBdYk+u3T01pVsPrkj943T1aJAsw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18032,6 +18139,13 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-linux-s390x@0.35.4': + resolution: {integrity: sha512-RY0JFY8Fd6RonCBtHz+DvadaPkXDSI1AUn6yWL9TipqkZ1vY8w8evqdgyDFnkm4/K1ve1TvZiaePP5oSd4+WVQ==} + engines: {node: '>=20.9.0'} + cpu: [s390x] + os: [linux] + libc: [glibc] + '@img/sharp-linux-x64@0.34.4': resolution: {integrity: sha512-ZfGtcp2xS51iG79c6Vhw9CWqQC8l2Ot8dygxoDoIQPTat/Ov3qAa8qpxSrtAEAJW+UjTXc4yxCjNfxm4h6Xm2A==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18046,6 +18160,13 @@ packages: os: [linux] libc: [glibc] + '@img/sharp-linux-x64@0.35.4': + resolution: {integrity: sha512-9qvvEAuk8k89TfWUoX2htWjbAMX8p+NxCppjpcg5k6xMsjhBQPTsoIh36h9Qde4WRuGpJeYnOjdosDn/cnv+OA==} + engines: {node: '>=20.9.0'} + cpu: [x64] + os: [linux] + libc: [glibc] + '@img/sharp-linuxmusl-arm64@0.34.4': resolution: {integrity: sha512-8hDVvW9eu4yHWnjaOOR8kHVrew1iIX+MUgwxSuH2XyYeNRtLUe4VNioSqbNkB7ZYQJj9rUTT4PyRscyk2PXFKA==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18060,6 +18181,13 @@ packages: os: [linux] libc: [musl] + '@img/sharp-linuxmusl-arm64@0.35.4': + resolution: {integrity: sha512-KB5jxpfWQTr0nc3xdHtWChdbifHrBGsd2SM62Eyxrl8afikm+f5qGBU75SJIZBT/S1MC8XyacdlXBMSWq6OURA==} + engines: {node: '>=20.9.0'} + cpu: [arm64] + os: [linux] + libc: [musl] + '@img/sharp-linuxmusl-x64@0.34.4': resolution: {integrity: sha512-lU0aA5L8QTlfKjpDCEFOZsTYGn3AEiO6db8W5aQDxj0nQkVrZWmN3ZP9sYKWJdtq3PWPhUNlqehWyXpYDcI9Sg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18074,6 +18202,13 @@ packages: os: [linux] libc: [musl] + '@img/sharp-linuxmusl-x64@0.35.4': + resolution: {integrity: sha512-f+eZJZIQNEEd26RPSW+76chwOf1XtA2Y/O+5ocVyLliHkeih3e+jhLVBdNTd2rS3IbNXK8+ug93Vf5ZXtF5Lxg==} + engines: {node: '>=20.9.0'} + cpu: [x64] + os: [linux] + libc: [musl] + '@img/sharp-wasm32@0.34.4': resolution: {integrity: sha512-33QL6ZO/qpRyG7woB/HUALz28WnTMI2W1jgX3Nu2bypqLIKx/QKMILLJzJjI+SIbvXdG9fUnmrxR7vbi1sTBeA==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18084,6 +18219,15 @@ packages: engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [wasm32] + '@img/sharp-wasm32@0.35.4': + resolution: {integrity: sha512-zQnl4Kwp7Q6NHsENtU2T/00Zi+w3AQNwz3+UaTyVBy2FpXrzXzGjndpK61onhZjRtRpQXxCTeqw19bVyXOh7jA==} + engines: {node: '>=20.9.0'} + + '@img/sharp-webcontainers-wasm32@0.35.4': + resolution: {integrity: sha512-ESfNkywmCfPNyaZjxooddJQiQ+l/nTpGEOGthxiLnIHXC/CmcBixnfwUleX9mCz9ovrUUvKMap/pm8RYbzfwaA==} + engines: {node: '>=20.9.0'} + cpu: [wasm32] + '@img/sharp-win32-arm64@0.34.4': resolution: {integrity: sha512-2Q250do/5WXTwxW3zjsEuMSv5sUU4Tq9VThWKlU2EYLm4MB7ZeMwF+SFJutldYODXF6jzc6YEOC+VfX0SZQPqA==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18096,6 +18240,12 @@ packages: cpu: [arm64] os: [win32] + '@img/sharp-win32-arm64@0.35.4': + resolution: {integrity: sha512-iNdlBX9gLVvqe2I3uIJSIKTq6wckP/DYxZtcqxm09x5Gi24DnFBmPAWZmr60ZyYMG0xlzo6goG3670ar+RXvRw==} + engines: {node: '>=20.9.0'} + cpu: [arm64] + os: [win32] + '@img/sharp-win32-ia32@0.34.4': resolution: {integrity: sha512-3ZeLue5V82dT92CNL6rsal6I2weKw1cYu+rGKm8fOCCtJTR2gYeUfY3FqUnIJsMUPIH68oS5jmZ0NiJ508YpEw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18108,6 +18258,12 @@ packages: cpu: [ia32] os: [win32] + '@img/sharp-win32-ia32@0.35.4': + resolution: {integrity: sha512-kqRsbaa5CS6KHlpxnN7WhE6vAAugXyZButpRdvDWetlv6Qv4N9WTcrWzF7tXfB9T7MsoadqdI8hmwLq6UlLvtw==} + engines: {node: ^20.9.0} + cpu: [ia32] + os: [win32] + '@img/sharp-win32-x64@0.34.4': resolution: {integrity: sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18120,6 +18276,12 @@ packages: cpu: [x64] os: [win32] + '@img/sharp-win32-x64@0.35.4': + resolution: {integrity: sha512-XtmnYhBcrORsJ4XJngyzr/EWP0hRZLAZRFaApdKuviyqF78+ylxh2y06ZmtULAMOnObJ3ucpN0AcwSWnMowTRg==} + engines: {node: '>=20.9.0'} + cpu: [x64] + os: [win32] + '@import-maps/resolve@2.0.0': resolution: {integrity: sha512-RwzRTpmrrS6Q1ZhQExwuxJGK1Wqhv4stt+OF2JzS+uawewpwNyU7EJL1WpBex7aDiiGLs4FsXGkfUBdYuX7xiQ==} @@ -18623,6 +18785,61 @@ packages: engines: {node: '>=18.14.0'} hasBin: true + '@next/env@16.3.4': + resolution: {integrity: sha512-cjWZnUUa6jZq2kFaNe/ZyJdZonOZ/QoN0Zka2nz/FLOrfx14pQuM9c5RaSVkWMqgdt4ksgPAMWPyHSs/CyV48Q==} + + '@next/swc-darwin-arm64@16.3.4': + resolution: {integrity: sha512-iBr3I5LZNk5/bgl5//iTgD2tcym14MX0Xo7fD//u9dYAEgGzza1y9oywluPtf74YnOswVdH1908aK9xVz7zQTw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + + '@next/swc-darwin-x64@16.3.4': + resolution: {integrity: sha512-2dpiSyl2Jw/NrBPaU2MAKGSa+2MR82pJIn4Sm5Rjr+gxAeuh0z158Su3Z2O8zn7UNNq+ej4bToed6RcRN/Lydg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + + '@next/swc-linux-arm64-gnu@16.3.4': + resolution: {integrity: sha512-+t+U8HZT+fApePCS5h89CSH3datz29MkzyfCn+6fpsZBG/oiEOhINcb9rtkv6sdpToLGFn2e6146NzaKCXkqrA==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + libc: [glibc] + + '@next/swc-linux-arm64-musl@16.3.4': + resolution: {integrity: sha512-mx03GNs1ocQA5JQ4FxDMmIsNkdrZh8cuezKCrId28e5/gIPU/l7Kcy2+vmCCzdjnnmXJy+iOAu+7K0QppO6Urg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + libc: [musl] + + '@next/swc-linux-x64-gnu@16.3.4': + resolution: {integrity: sha512-YIhGY6fSMfha52bnVxnzc9zaVBzJg+cqQTOD8tXIBSx4fuv0pVMxQTE0PaS59YhnMOiYiG09IMwxJAf/CFm/Dw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + libc: [glibc] + + '@next/swc-linux-x64-musl@16.3.4': + resolution: {integrity: sha512-+eaaX6axpDb0yF1GCpiERe6njplvdC+nks/fKfcHu3XPGRrald8P3/X7yv7QLdjA51knnxwl9pxdIJsg+w1L+Q==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + libc: [musl] + + '@next/swc-win32-arm64-msvc@16.3.4': + resolution: {integrity: sha512-0jcXW7Xs/uzICrmgV3MhDYDeRy++1CqnpDIerlPIqYO4bhzB4WNbX/aRnQclustsAyTkFKB0z6rbcjmNg5tR8A==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + + '@next/swc-win32-x64-msvc@16.3.4': + resolution: {integrity: sha512-vvBzwu1pYQCp92maZCFCIw/XgOTMR5tur9GjakwIo2cmwRTMKajRZZDS9+e4KsUZWKu1E007WUeAFXRRjZeuzw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + '@noble/ciphers@2.2.0': resolution: {integrity: sha512-Z6pjIZ/8IJcCGzb2S/0Px5J81yij85xASuk1teLNeg75bfT07MV3a/O2Mtn1I2se43k3lkVEcFaR10N4cgQcZA==} engines: {node: '>= 20.19.0'} @@ -22932,8 +23149,9 @@ packages: base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - baseline-browser-mapping@2.9.8: - resolution: {integrity: sha512-Y1fOuNDowLfgKOypdc9SPABfoWXuZHBOyCS4cD52IeZBhr4Md6CLLs6atcxVrzRmQ06E7hSlm5bHHApPKR/byA==} + baseline-browser-mapping@2.11.22: + resolution: {integrity: sha512-pWc4w51fBFd7mav43/zKRC+RI6f4yfzQoVlfvE8dECePyfkn1bzLp01Fj0QACcyCZyFhiEMyD2qScfKRWgWibA==} + engines: {node: '>=6.0.0'} hasBin: true batch@0.6.1: @@ -23253,6 +23471,9 @@ packages: resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==} engines: {node: '>= 12'} + client-only@0.0.1: + resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} + clipboardy@4.0.0: resolution: {integrity: sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w==} engines: {node: '>=18'} @@ -23531,6 +23752,10 @@ packages: resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==} engines: {node: '>=18'} + cookie@2.0.1: + resolution: {integrity: sha512-yuToqVvRrj6pfDXREyQAAv8SkAEk/8GS3jQRTiUMm66TVtBYmqQeoEjL2Lmq8Rpo6271vH76InTChTitEAm65w==} + engines: {node: '>=22'} + copy-file@11.1.0: resolution: {integrity: sha512-X8XDzyvYaA6msMyAM575CUoygY5b44QzLcGRKsK3MFmXcOvQa518dNPLsKYwkYsn72g3EiW+LE0ytd/FlqWmyw==} engines: {node: '>=18'} @@ -25229,6 +25454,10 @@ packages: resolution: {integrity: sha512-7Xnt54Dco7uYkfdAw0r2vCly3z0rSaVhEXMzPvl3FndsTVm5p26j+PO+gyinkYmcsEUvX2Rh7OGK7KzYWRu6BA==} hasBin: true + iron-session@9.0.1: + resolution: {integrity: sha512-ELSZdcLvA0AMhxUCY+rwKCh42UV88SqEb1ia/bHLF9G+6kScikO6mShtlIq+OtF2UlkZP0dmI2dMdG9vh4rebA==} + engines: {node: '>=22.13.0'} + iron-webcrypto@1.2.1: resolution: {integrity: sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg==} @@ -26284,6 +26513,11 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true + nanoid@3.3.16: + resolution: {integrity: sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true + nanostores@1.3.0: resolution: {integrity: sha512-XPUa/jz+P1oJvN9VBxw4L9MtdFfaH3DAryqPssqhb2kXjmb9npz0dly6rCsgFWOPr4Yg9mTfM3MDZgZZ+7A3lA==} engines: {node: ^20.0.0 || >=22.0.0} @@ -26314,6 +26548,27 @@ packages: netlify-redirector@0.5.0: resolution: {integrity: sha512-4zdzIP+6muqPCuE8avnrgDJ6KW/2+UpHTRcTbMXCIRxiRmyrX+IZ4WSJGZdHPWF3WmQpXpy603XxecZ9iygN7w==} + next@16.3.4: + resolution: {integrity: sha512-/Ztf6CeRH+ejEXUrYtqI4gkS66eFIHuSwqi60RgcpWKodxFZx2/dqVCMKBwILfAHXQ+F1b1vAudgj3mnxqtoIA==} + engines: {node: '>=20.9.0'} + hasBin: true + peerDependencies: + '@opentelemetry/api': ^1.1.0 + '@playwright/test': ^1.61.0 + babel-plugin-react-compiler: '*' + react: ^19.2.3 + react-dom: ^19.2.3 + sass: ^1.3.0 + peerDependenciesMeta: + '@opentelemetry/api': + optional: true + '@playwright/test': + optional: true + babel-plugin-react-compiler: + optional: true + sass: + optional: true + nf3@0.3.11: resolution: {integrity: sha512-ObKp/SA3f1g1f/OMeDlRWaZmqGgk7A0NnDIbeO7c/MV4r/quMlpP/BsqMGuTi3lUlXbC1On8YH7ICM2u2bIAOw==} @@ -26915,6 +27170,10 @@ packages: resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==} engines: {node: ^10 || ^12 || >=14} + postcss@8.5.23: + resolution: {integrity: sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==} + engines: {node: ^10 || ^12 || >=14} + postcss@8.5.3: resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} engines: {node: ^10 || ^12 || >=14} @@ -27672,6 +27931,15 @@ packages: resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + sharp@0.35.4: + resolution: {integrity: sha512-n++8XWcj+jCOr2IOl7h8LbKnGBDY4aPbmprMONBNFdn0ImXqpGVv5zliDs0V9HbmbCQLpbuo2ej9rAoOQTvMDA==} + engines: {node: '>=20.9.0'} + peerDependencies: + '@types/node': '*' + peerDependenciesMeta: + '@types/node': + optional: true + shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} @@ -27993,6 +28261,19 @@ packages: style-to-object@1.0.8: resolution: {integrity: sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==} + styled-jsx@5.1.6: + resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==} + engines: {node: '>= 12.0.0'} + peerDependencies: + '@babel/core': '*' + babel-plugin-macros: '*' + react: ^19.2.3 + peerDependenciesMeta: + '@babel/core': + optional: true + babel-plugin-macros: + optional: true + stylis@4.2.0: resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==} @@ -29502,291 +29783,6 @@ packages: use-sync-external-store: optional: true - iron-session@9.0.1: - resolution: {integrity: sha512-ELSZdcLvA0AMhxUCY+rwKCh42UV88SqEb1ia/bHLF9G+6kScikO6mShtlIq+OtF2UlkZP0dmI2dMdG9vh4rebA==} - engines: {node: '>=22.13.0'} - - cookie@2.0.1: - resolution: {integrity: sha512-yuToqVvRrj6pfDXREyQAAv8SkAEk/8GS3jQRTiUMm66TVtBYmqQeoEjL2Lmq8Rpo6271vH76InTChTitEAm65w==} - engines: {node: '>=22'} - - next@16.3.4: - resolution: {integrity: sha512-/Ztf6CeRH+ejEXUrYtqI4gkS66eFIHuSwqi60RgcpWKodxFZx2/dqVCMKBwILfAHXQ+F1b1vAudgj3mnxqtoIA==} - engines: {node: '>=20.9.0'} - hasBin: true - peerDependencies: - '@opentelemetry/api': ^1.1.0 - '@playwright/test': ^1.61.0 - babel-plugin-react-compiler: '*' - react: ^19.2.3 - react-dom: ^19.2.3 - sass: ^1.3.0 - peerDependenciesMeta: - '@opentelemetry/api': - optional: true - '@playwright/test': - optional: true - babel-plugin-react-compiler: - optional: true - sass: - optional: true - - '@next/env@16.3.4': - resolution: {integrity: sha512-cjWZnUUa6jZq2kFaNe/ZyJdZonOZ/QoN0Zka2nz/FLOrfx14pQuM9c5RaSVkWMqgdt4ksgPAMWPyHSs/CyV48Q==} - - baseline-browser-mapping@2.11.22: - resolution: {integrity: sha512-pWc4w51fBFd7mav43/zKRC+RI6f4yfzQoVlfvE8dECePyfkn1bzLp01Fj0QACcyCZyFhiEMyD2qScfKRWgWibA==} - engines: {node: '>=6.0.0'} - hasBin: true - - postcss@8.5.23: - resolution: {integrity: sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==} - engines: {node: ^10 || ^12 || >=14} - - nanoid@3.3.16: - resolution: {integrity: sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==} - engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true - - styled-jsx@5.1.6: - resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==} - engines: {node: '>= 12.0.0'} - peerDependencies: - '@babel/core': '*' - babel-plugin-macros: '*' - react: ^19.2.3 - peerDependenciesMeta: - '@babel/core': - optional: true - babel-plugin-macros: - optional: true - - client-only@0.0.1: - resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} - - '@next/swc-darwin-arm64@16.3.4': - resolution: {integrity: sha512-iBr3I5LZNk5/bgl5//iTgD2tcym14MX0Xo7fD//u9dYAEgGzza1y9oywluPtf74YnOswVdH1908aK9xVz7zQTw==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [darwin] - - '@next/swc-darwin-x64@16.3.4': - resolution: {integrity: sha512-2dpiSyl2Jw/NrBPaU2MAKGSa+2MR82pJIn4Sm5Rjr+gxAeuh0z158Su3Z2O8zn7UNNq+ej4bToed6RcRN/Lydg==} - engines: {node: '>= 10'} - cpu: [x64] - os: [darwin] - - '@next/swc-linux-arm64-gnu@16.3.4': - resolution: {integrity: sha512-+t+U8HZT+fApePCS5h89CSH3datz29MkzyfCn+6fpsZBG/oiEOhINcb9rtkv6sdpToLGFn2e6146NzaKCXkqrA==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@next/swc-linux-arm64-musl@16.3.4': - resolution: {integrity: sha512-mx03GNs1ocQA5JQ4FxDMmIsNkdrZh8cuezKCrId28e5/gIPU/l7Kcy2+vmCCzdjnnmXJy+iOAu+7K0QppO6Urg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@next/swc-linux-x64-gnu@16.3.4': - resolution: {integrity: sha512-YIhGY6fSMfha52bnVxnzc9zaVBzJg+cqQTOD8tXIBSx4fuv0pVMxQTE0PaS59YhnMOiYiG09IMwxJAf/CFm/Dw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@next/swc-linux-x64-musl@16.3.4': - resolution: {integrity: sha512-+eaaX6axpDb0yF1GCpiERe6njplvdC+nks/fKfcHu3XPGRrald8P3/X7yv7QLdjA51knnxwl9pxdIJsg+w1L+Q==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - libc: [musl] - - '@next/swc-win32-arm64-msvc@16.3.4': - resolution: {integrity: sha512-0jcXW7Xs/uzICrmgV3MhDYDeRy++1CqnpDIerlPIqYO4bhzB4WNbX/aRnQclustsAyTkFKB0z6rbcjmNg5tR8A==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [win32] - - '@next/swc-win32-x64-msvc@16.3.4': - resolution: {integrity: sha512-vvBzwu1pYQCp92maZCFCIw/XgOTMR5tur9GjakwIo2cmwRTMKajRZZDS9+e4KsUZWKu1E007WUeAFXRRjZeuzw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [win32] - - sharp@0.35.4: - resolution: {integrity: sha512-n++8XWcj+jCOr2IOl7h8LbKnGBDY4aPbmprMONBNFdn0ImXqpGVv5zliDs0V9HbmbCQLpbuo2ej9rAoOQTvMDA==} - engines: {node: '>=20.9.0'} - peerDependencies: - '@types/node': '*' - peerDependenciesMeta: - '@types/node': - optional: true - - '@img/colour@1.1.0': - resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==} - engines: {node: '>=18'} - - '@img/sharp-darwin-arm64@0.35.4': - resolution: {integrity: sha512-Uhfl4V4lhP2nbUVF9+hyH1+luj86f1gUFeo8ALYxFoULoU+G87D43BfeMP8XHsk9boxAnCY/bf2EHwhA7MuGsA==} - engines: {node: '>=20.9.0'} - cpu: [arm64] - os: [darwin] - - '@img/sharp-libvips-darwin-arm64@1.3.3': - resolution: {integrity: sha512-suTBPTDGrI9WodccaDdwZItTSaBYASlBk1NSfElSHrUfzu3szG6lvIF58+WiFvnfzuK8ZBFS5zE00PxqxnRiPg==} - cpu: [arm64] - os: [darwin] - - '@img/sharp-darwin-x64@0.35.4': - resolution: {integrity: sha512-hWniXY3bG5qKpkKrAwPe4y+VTPmf086YQAnkxWh7uA1YrlRouWGa0M0Mxj3ZjnXFkv7/TD1bTy9lGUK26vRvWw==} - engines: {node: '>=20.9.0'} - cpu: [x64] - os: [darwin] - - '@img/sharp-libvips-darwin-x64@1.3.3': - resolution: {integrity: sha512-FVJZ5mITMobmXIz/hPDTw0EintTW5H3WfrxwLqEqjiIihlu+hVRyGrFQ60xl0Lxn7Bt3zdpevPaQi0HEzqz9fw==} - cpu: [x64] - os: [darwin] - - '@img/sharp-freebsd-wasm32@0.35.4': - resolution: {integrity: sha512-lIsKw/BU+kjB4eZjxrYrZmwOJYi3Ajrv66iAlBmUPyKc3HpnloevB1g3wxGD9P/5BbQ1brBGl65VRRrCvQDEqA==} - engines: {node: '>=20.9.0'} - os: [freebsd] - - '@img/sharp-wasm32@0.35.4': - resolution: {integrity: sha512-zQnl4Kwp7Q6NHsENtU2T/00Zi+w3AQNwz3+UaTyVBy2FpXrzXzGjndpK61onhZjRtRpQXxCTeqw19bVyXOh7jA==} - engines: {node: '>=20.9.0'} - - '@img/sharp-libvips-linux-arm@1.3.3': - resolution: {integrity: sha512-3rbU4vqXXc3hY/OiXdl52xZvT0F1yEngWfvqudtPJg/KkyiaQw2DRsFrNzpmLvfavbwOq3qXn36GP8obHRULQA==} - cpu: [arm] - os: [linux] - libc: [glibc] - - '@img/sharp-libvips-linux-arm64@1.3.3': - resolution: {integrity: sha512-0DaL0A6Xu6sQSQFwe4iVCrKWU2cCTItnRsYsCdxAMm9NF6twAA9BKnoqy4hqz4+azQ0JHuA26qiUKsf1XJ/v5A==} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@img/sharp-libvips-linux-ppc64@1.3.3': - resolution: {integrity: sha512-cdn1OvUBwsXhbC0zSzJnNzf5MZ/mTrobawDvNXBTxe8VtqKAm0sRuEY2Evzovb/w9JMk4TvRxqt1mekSuJz64w==} - cpu: [ppc64] - os: [linux] - libc: [glibc] - - '@img/sharp-libvips-linux-riscv64@1.3.3': - resolution: {integrity: sha512-HjPVx7yKz+0lqdhDlTw1tt90wamBoxhiXpvl1XZpJLiHH4RCJ5yDTqH+VlYPv2fwFs89JFw4c1IexYOcQUi4IQ==} - cpu: [riscv64] - os: [linux] - libc: [glibc] - - '@img/sharp-libvips-linux-s390x@1.3.3': - resolution: {integrity: sha512-neWLh+3yCNThxnfy3c4BbVBeGgt9aftno+XbT56iK28RgeDs3UOFWviLWlUu0bArYVYJaFDK+RRohbicUNCm8Q==} - cpu: [s390x] - os: [linux] - libc: [glibc] - - '@img/sharp-libvips-linux-x64@1.3.3': - resolution: {integrity: sha512-4vKmvAst9nrowcqquKFAyZJUDolUaIp8uRiN0mWFguJ1IplC9/pitXtlnnlU4aa/eJw3J7i67V+pwUL+wZGdsA==} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@img/sharp-libvips-linuxmusl-arm64@1.3.3': - resolution: {integrity: sha512-Y9kQaLMuNoB0bPYOOdcZMaseNrFpPodIWWMrx+CZyydf2xn68j9WYc6sWWRrDwNkzCQjKYfc68L7jKjGlHMibw==} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@img/sharp-libvips-linuxmusl-x64@1.3.3': - resolution: {integrity: sha512-fj8Mv0HHfD1Rr+4I68+3agJynxDWtBFgicTbSOb9Bke6pIwzGcJ+RX/yHjmiEGFMCavY/dxvem7MyNaJF+wDiw==} - cpu: [x64] - os: [linux] - libc: [musl] - - '@img/sharp-linux-arm@0.35.4': - resolution: {integrity: sha512-7OAS8gI0EReKGVN2HssHlM6umJgxF5VI3xN0p9FA91p/YO+ou5hiNghLdZ5BEHztwaaK5+bLKRf8x/o2L2nk9A==} - engines: {node: '>=20.9.0'} - cpu: [arm] - os: [linux] - libc: [glibc] - - '@img/sharp-linux-arm64@0.35.4': - resolution: {integrity: sha512-De4jpEnAU8Hd5oT0j1G3uL4ZvTuipVMn7YC6vPaJhy6/7EwEae0SVAoBrUMYQbkLGDm85taVWwuPc1a44LTzCQ==} - engines: {node: '>=20.9.0'} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@img/sharp-linux-ppc64@0.35.4': - resolution: {integrity: sha512-2oYZJeIl4kCcMGk4ouZVjnkCtFrpQFlNEtJ6GbxzhHQchwH0NH/qEb9ykmOl29dqwMq+JhFdZn+1ak2FKhI9fQ==} - engines: {node: '>=20.9.0'} - cpu: [ppc64] - os: [linux] - libc: [glibc] - - '@img/sharp-linux-riscv64@0.35.4': - resolution: {integrity: sha512-cPbNChoRURAWdebDIHSenxRpgEdy7JkPydSnUxRm9VvKD7m0/xVaR/8Fzlu81pk5nHEvHH87UZUA7cTtwnbJSA==} - engines: {node: '>=20.9.0'} - cpu: [riscv64] - os: [linux] - libc: [glibc] - - '@img/sharp-linux-s390x@0.35.4': - resolution: {integrity: sha512-RY0JFY8Fd6RonCBtHz+DvadaPkXDSI1AUn6yWL9TipqkZ1vY8w8evqdgyDFnkm4/K1ve1TvZiaePP5oSd4+WVQ==} - engines: {node: '>=20.9.0'} - cpu: [s390x] - os: [linux] - libc: [glibc] - - '@img/sharp-linux-x64@0.35.4': - resolution: {integrity: sha512-9qvvEAuk8k89TfWUoX2htWjbAMX8p+NxCppjpcg5k6xMsjhBQPTsoIh36h9Qde4WRuGpJeYnOjdosDn/cnv+OA==} - engines: {node: '>=20.9.0'} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@img/sharp-linuxmusl-arm64@0.35.4': - resolution: {integrity: sha512-KB5jxpfWQTr0nc3xdHtWChdbifHrBGsd2SM62Eyxrl8afikm+f5qGBU75SJIZBT/S1MC8XyacdlXBMSWq6OURA==} - engines: {node: '>=20.9.0'} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@img/sharp-linuxmusl-x64@0.35.4': - resolution: {integrity: sha512-f+eZJZIQNEEd26RPSW+76chwOf1XtA2Y/O+5ocVyLliHkeih3e+jhLVBdNTd2rS3IbNXK8+ug93Vf5ZXtF5Lxg==} - engines: {node: '>=20.9.0'} - cpu: [x64] - os: [linux] - libc: [musl] - - '@img/sharp-webcontainers-wasm32@0.35.4': - resolution: {integrity: sha512-ESfNkywmCfPNyaZjxooddJQiQ+l/nTpGEOGthxiLnIHXC/CmcBixnfwUleX9mCz9ovrUUvKMap/pm8RYbzfwaA==} - engines: {node: '>=20.9.0'} - cpu: [wasm32] - - '@img/sharp-win32-arm64@0.35.4': - resolution: {integrity: sha512-iNdlBX9gLVvqe2I3uIJSIKTq6wckP/DYxZtcqxm09x5Gi24DnFBmPAWZmr60ZyYMG0xlzo6goG3670ar+RXvRw==} - engines: {node: '>=20.9.0'} - cpu: [arm64] - os: [win32] - - '@img/sharp-win32-ia32@0.35.4': - resolution: {integrity: sha512-kqRsbaa5CS6KHlpxnN7WhE6vAAugXyZButpRdvDWetlv6Qv4N9WTcrWzF7tXfB9T7MsoadqdI8hmwLq6UlLvtw==} - engines: {node: ^20.9.0} - cpu: [ia32] - os: [win32] - - '@img/sharp-win32-x64@0.35.4': - resolution: {integrity: sha512-XtmnYhBcrORsJ4XJngyzr/EWP0hRZLAZRFaApdKuviyqF78+ylxh2y06ZmtULAMOnObJ3ucpN0AcwSWnMowTRg==} - engines: {node: '>=20.9.0'} - cpu: [x64] - os: [win32] - snapshots: '@adobe/css-tools@4.4.1': {} @@ -30912,9 +30908,9 @@ snapshots: '@colors/colors@1.6.0': {} - '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: - better-auth: 1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) + better-auth: 1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) common-tags: 1.8.2 convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) convex-helpers: 0.1.104(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react@19.2.3)(zod@3.25.76) @@ -32217,6 +32213,8 @@ snapshots: '@img/colour@1.0.0': {} + '@img/colour@1.1.0': {} + '@img/sharp-darwin-arm64@0.34.4': optionalDependencies: '@img/sharp-libvips-darwin-arm64': 1.2.3 @@ -32227,6 +32225,11 @@ snapshots: '@img/sharp-libvips-darwin-arm64': 1.2.4 optional: true + '@img/sharp-darwin-arm64@0.35.4': + optionalDependencies: + '@img/sharp-libvips-darwin-arm64': 1.3.3 + optional: true + '@img/sharp-darwin-x64@0.34.4': optionalDependencies: '@img/sharp-libvips-darwin-x64': 1.2.3 @@ -32237,63 +32240,103 @@ snapshots: '@img/sharp-libvips-darwin-x64': 1.2.4 optional: true + '@img/sharp-darwin-x64@0.35.4': + optionalDependencies: + '@img/sharp-libvips-darwin-x64': 1.3.3 + optional: true + + '@img/sharp-freebsd-wasm32@0.35.4': + dependencies: + '@img/sharp-wasm32': 0.35.4 + optional: true + '@img/sharp-libvips-darwin-arm64@1.2.3': optional: true '@img/sharp-libvips-darwin-arm64@1.2.4': optional: true + '@img/sharp-libvips-darwin-arm64@1.3.3': + optional: true + '@img/sharp-libvips-darwin-x64@1.2.3': optional: true '@img/sharp-libvips-darwin-x64@1.2.4': optional: true + '@img/sharp-libvips-darwin-x64@1.3.3': + optional: true + '@img/sharp-libvips-linux-arm64@1.2.3': optional: true '@img/sharp-libvips-linux-arm64@1.2.4': optional: true + '@img/sharp-libvips-linux-arm64@1.3.3': + optional: true + '@img/sharp-libvips-linux-arm@1.2.3': optional: true '@img/sharp-libvips-linux-arm@1.2.4': optional: true + '@img/sharp-libvips-linux-arm@1.3.3': + optional: true + '@img/sharp-libvips-linux-ppc64@1.2.3': optional: true '@img/sharp-libvips-linux-ppc64@1.2.4': optional: true + '@img/sharp-libvips-linux-ppc64@1.3.3': + optional: true + '@img/sharp-libvips-linux-riscv64@1.2.4': optional: true + '@img/sharp-libvips-linux-riscv64@1.3.3': + optional: true + '@img/sharp-libvips-linux-s390x@1.2.3': optional: true '@img/sharp-libvips-linux-s390x@1.2.4': optional: true + '@img/sharp-libvips-linux-s390x@1.3.3': + optional: true + '@img/sharp-libvips-linux-x64@1.2.3': optional: true '@img/sharp-libvips-linux-x64@1.2.4': optional: true + '@img/sharp-libvips-linux-x64@1.3.3': + optional: true + '@img/sharp-libvips-linuxmusl-arm64@1.2.3': optional: true '@img/sharp-libvips-linuxmusl-arm64@1.2.4': optional: true + '@img/sharp-libvips-linuxmusl-arm64@1.3.3': + optional: true + '@img/sharp-libvips-linuxmusl-x64@1.2.3': optional: true '@img/sharp-libvips-linuxmusl-x64@1.2.4': optional: true + '@img/sharp-libvips-linuxmusl-x64@1.3.3': + optional: true + '@img/sharp-linux-arm64@0.34.4': optionalDependencies: '@img/sharp-libvips-linux-arm64': 1.2.3 @@ -32304,6 +32347,11 @@ snapshots: '@img/sharp-libvips-linux-arm64': 1.2.4 optional: true + '@img/sharp-linux-arm64@0.35.4': + optionalDependencies: + '@img/sharp-libvips-linux-arm64': 1.3.3 + optional: true + '@img/sharp-linux-arm@0.34.4': optionalDependencies: '@img/sharp-libvips-linux-arm': 1.2.3 @@ -32314,6 +32362,11 @@ snapshots: '@img/sharp-libvips-linux-arm': 1.2.4 optional: true + '@img/sharp-linux-arm@0.35.4': + optionalDependencies: + '@img/sharp-libvips-linux-arm': 1.3.3 + optional: true + '@img/sharp-linux-ppc64@0.34.4': optionalDependencies: '@img/sharp-libvips-linux-ppc64': 1.2.3 @@ -32324,11 +32377,21 @@ snapshots: '@img/sharp-libvips-linux-ppc64': 1.2.4 optional: true + '@img/sharp-linux-ppc64@0.35.4': + optionalDependencies: + '@img/sharp-libvips-linux-ppc64': 1.3.3 + optional: true + '@img/sharp-linux-riscv64@0.34.5': optionalDependencies: '@img/sharp-libvips-linux-riscv64': 1.2.4 optional: true + '@img/sharp-linux-riscv64@0.35.4': + optionalDependencies: + '@img/sharp-libvips-linux-riscv64': 1.3.3 + optional: true + '@img/sharp-linux-s390x@0.34.4': optionalDependencies: '@img/sharp-libvips-linux-s390x': 1.2.3 @@ -32339,6 +32402,11 @@ snapshots: '@img/sharp-libvips-linux-s390x': 1.2.4 optional: true + '@img/sharp-linux-s390x@0.35.4': + optionalDependencies: + '@img/sharp-libvips-linux-s390x': 1.3.3 + optional: true + '@img/sharp-linux-x64@0.34.4': optionalDependencies: '@img/sharp-libvips-linux-x64': 1.2.3 @@ -32349,6 +32417,11 @@ snapshots: '@img/sharp-libvips-linux-x64': 1.2.4 optional: true + '@img/sharp-linux-x64@0.35.4': + optionalDependencies: + '@img/sharp-libvips-linux-x64': 1.3.3 + optional: true + '@img/sharp-linuxmusl-arm64@0.34.4': optionalDependencies: '@img/sharp-libvips-linuxmusl-arm64': 1.2.3 @@ -32359,6 +32432,11 @@ snapshots: '@img/sharp-libvips-linuxmusl-arm64': 1.2.4 optional: true + '@img/sharp-linuxmusl-arm64@0.35.4': + optionalDependencies: + '@img/sharp-libvips-linuxmusl-arm64': 1.3.3 + optional: true + '@img/sharp-linuxmusl-x64@0.34.4': optionalDependencies: '@img/sharp-libvips-linuxmusl-x64': 1.2.3 @@ -32369,6 +32447,11 @@ snapshots: '@img/sharp-libvips-linuxmusl-x64': 1.2.4 optional: true + '@img/sharp-linuxmusl-x64@0.35.4': + optionalDependencies: + '@img/sharp-libvips-linuxmusl-x64': 1.3.3 + optional: true + '@img/sharp-wasm32@0.34.4': dependencies: '@emnapi/runtime': 1.11.1 @@ -32379,24 +32462,43 @@ snapshots: '@emnapi/runtime': 1.11.3 optional: true + '@img/sharp-wasm32@0.35.4': + dependencies: + '@emnapi/runtime': 1.11.3 + optional: true + + '@img/sharp-webcontainers-wasm32@0.35.4': + dependencies: + '@img/sharp-wasm32': 0.35.4 + optional: true + '@img/sharp-win32-arm64@0.34.4': optional: true '@img/sharp-win32-arm64@0.34.5': optional: true + '@img/sharp-win32-arm64@0.35.4': + optional: true + '@img/sharp-win32-ia32@0.34.4': optional: true '@img/sharp-win32-ia32@0.34.5': optional: true + '@img/sharp-win32-ia32@0.35.4': + optional: true + '@img/sharp-win32-x64@0.34.4': optional: true '@img/sharp-win32-x64@0.34.5': optional: true + '@img/sharp-win32-x64@0.35.4': + optional: true + '@import-maps/resolve@2.0.0': {} '@inlang/paraglide-js@2.4.0(babel-plugin-macros@3.1.0)': @@ -33237,6 +33339,32 @@ snapshots: - rollup - supports-color + '@next/env@16.3.4': {} + + '@next/swc-darwin-arm64@16.3.4': + optional: true + + '@next/swc-darwin-x64@16.3.4': + optional: true + + '@next/swc-linux-arm64-gnu@16.3.4': + optional: true + + '@next/swc-linux-arm64-musl@16.3.4': + optional: true + + '@next/swc-linux-x64-gnu@16.3.4': + optional: true + + '@next/swc-linux-x64-musl@16.3.4': + optional: true + + '@next/swc-win32-arm64-msvc@16.3.4': + optional: true + + '@next/swc-win32-x64-msvc@16.3.4': + optional: true + '@noble/ciphers@2.2.0': {} '@noble/hashes@1.4.0': {} @@ -34678,6 +34806,15 @@ snapshots: vite: 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.9.0) optional: true + '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + dependencies: + '@babel/core': 7.29.7(supports-color@10.2.2) + picomatch: 4.0.7 + rolldown: 1.0.2 + optionalDependencies: + vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + optional: true + '@rolldown/pluginutils@1.0.0-beta.27': {} '@rolldown/pluginutils@1.0.0-rc.2': {} @@ -35718,7 +35855,7 @@ snapshots: tailwindcss: 4.3.1 optionalDependencies: '@rspack/core': 2.1.1(@swc/helpers@0.5.23) - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) '@tanstack/devtools-client@0.0.4': dependencies: @@ -37039,6 +37176,14 @@ snapshots: '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)) babel-plugin-react-compiler: 1.0.0 + '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + dependencies: + '@rolldown/pluginutils': 1.0.0-rc.7 + vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + optionalDependencies: + '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + babel-plugin-react-compiler: 1.0.0 + '@vitejs/plugin-rsc@0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@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.9.0))': dependencies: '@rolldown/pluginutils': 1.0.1 @@ -37404,7 +37549,7 @@ snapshots: '@vue/shared': 3.5.25 estree-walker: 2.0.2 magic-string: 0.30.21 - postcss: 8.5.15 + postcss: 8.5.23 source-map-js: 1.2.1 '@vue/compiler-ssr@3.5.25': @@ -37580,7 +37725,7 @@ snapshots: '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.110.3)': dependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.110.3) optional: true @@ -37591,7 +37736,7 @@ snapshots: '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.110.3)': dependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.110.3) optional: true @@ -37602,7 +37747,7 @@ snapshots: '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.2.4)(webpack@5.110.3)': dependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.110.3) optionalDependencies: webpack-dev-server: 5.2.4(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.110.3) @@ -38075,7 +38220,7 @@ snapshots: base64-js@1.5.1: {} - baseline-browser-mapping@2.9.8: {} + baseline-browser-mapping@2.11.22: {} batch@0.6.1: {} @@ -38088,7 +38233,7 @@ snapshots: jsonpointer: 5.0.1 leven: 3.1.0 - better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)): + better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)): dependencies: '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) '@better-auth/drizzle-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2) @@ -38111,6 +38256,7 @@ snapshots: '@prisma/client': 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) '@tanstack/solid-start': link:packages/solid-start mysql2: 3.15.3 + next: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) prisma: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) react: 19.2.3 react-dom: 19.2.3(react@19.2.3) @@ -38218,7 +38364,7 @@ snapshots: browserslist@4.28.1: dependencies: - baseline-browser-mapping: 2.9.8 + baseline-browser-mapping: 2.11.22 caniuse-lite: 1.0.30001760 electron-to-chromium: 1.5.267 node-releases: 2.0.27 @@ -38432,6 +38578,8 @@ snapshots: cli-width@4.1.0: {} + client-only@0.0.1: {} + clipboardy@4.0.0: dependencies: execa: 8.0.1 @@ -38677,6 +38825,8 @@ snapshots: cookie@1.0.2: {} + cookie@2.0.1: {} + copy-file@11.1.0: dependencies: graceful-fs: 4.2.11 @@ -40818,6 +40968,11 @@ snapshots: - ioredis - uploadthing + iron-session@9.0.1: + dependencies: + cookie: 2.0.1 + iron-webcrypto: 2.0.0 + iron-webcrypto@1.2.1: {} iron-webcrypto@2.0.0: @@ -41678,13 +41833,13 @@ snapshots: minimist@1.2.8: {} - minimizer-webpack-plugin@5.10.0(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack@5.110.3): + minimizer-webpack-plugin@5.10.0(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack@5.110.3): dependencies: '@jridgewell/trace-mapping': 0.3.31 jest-worker: 27.5.1 schema-utils: 4.3.3 terser: 5.51.2 - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) optionalDependencies: '@swc/core': 1.15.33(@swc/helpers@0.5.23) clean-css: 5.3.3 @@ -41692,8 +41847,8 @@ snapshots: esbuild: 0.28.2 html-minifier-terser: 6.1.0 lightningcss: 1.33.0 - postcss: 8.5.15 - sharp: 0.34.5 + postcss: 8.5.23 + sharp: 0.35.4(@types/node@25.0.9) svgo: 4.0.0 minipass@7.1.2: {} @@ -41824,6 +41979,8 @@ snapshots: nanoid@3.3.12: {} + nanoid@3.3.16: {} + nanostores@1.3.0: {} napi-postinstall@0.3.3: {} @@ -41840,6 +41997,34 @@ snapshots: netlify-redirector@0.5.0: {} + next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2): + dependencies: + '@next/env': 16.3.4 + '@swc/helpers': 0.5.23 + baseline-browser-mapping: 2.11.22 + caniuse-lite: 1.0.30001760 + postcss: 8.5.23 + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) + styled-jsx: 5.1.6(@babel/core@7.29.7(supports-color@10.2.2))(babel-plugin-macros@3.1.0)(react@19.2.3) + optionalDependencies: + '@next/swc-darwin-arm64': 16.3.4 + '@next/swc-darwin-x64': 16.3.4 + '@next/swc-linux-arm64-gnu': 16.3.4 + '@next/swc-linux-arm64-musl': 16.3.4 + '@next/swc-linux-x64-gnu': 16.3.4 + '@next/swc-linux-x64-musl': 16.3.4 + '@next/swc-win32-arm64-msvc': 16.3.4 + '@next/swc-win32-x64-msvc': 16.3.4 + '@playwright/test': 1.61.1 + babel-plugin-react-compiler: 1.0.0 + sass: 1.97.2 + sharp: 0.35.4(@types/node@25.0.9) + transitivePeerDependencies: + - '@babel/core' + - '@types/node' + - babel-plugin-macros + nf3@0.3.11: {} nf3@0.3.6: {} @@ -41949,6 +42134,60 @@ snapshots: - sqlite3 - uploadthing + nitro@3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + consola: 3.4.2 + crossws: 0.4.4(srvx@0.11.22) + db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) + env-runner: 0.1.6(miniflare@4.20260317.0) + h3: 2.0.1-rc.16(crossws@0.4.4(srvx@0.11.22)) + hookable: 6.1.0 + nf3: 0.3.11 + ocache: 0.1.2 + ofetch: 2.0.0-alpha.3 + ohash: 2.0.11 + rolldown: 1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) + srvx: 0.11.22 + unenv: 2.0.0-rc.24 + unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) + optionalDependencies: + dotenv: 17.4.2 + giget: 3.3.1 + jiti: 2.7.0 + rollup: 4.63.1 + vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + transitivePeerDependencies: + - '@azure/app-configuration' + - '@azure/cosmos' + - '@azure/data-tables' + - '@azure/identity' + - '@azure/keyvault-secrets' + - '@azure/storage-blob' + - '@capacitor/preferences' + - '@deno/kv' + - '@electric-sql/pglite' + - '@emnapi/core' + - '@emnapi/runtime' + - '@libsql/client' + - '@netlify/blobs' + - '@planetscale/database' + - '@upstash/redis' + - '@vercel/blob' + - '@vercel/functions' + - '@vercel/kv' + - aws4fetch + - better-sqlite3 + - chokidar + - drizzle-orm + - idb-keyval + - ioredis + - lru-cache + - miniflare + - mongodb + - mysql2 + - sqlite3 + - uploadthing + nitropack@2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.1.1(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@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.9.0))(webpack@5.110.3): dependencies: '@cloudflare/kv-asset-handler': 0.4.2 @@ -42776,6 +43015,12 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 + postcss@8.5.23: + dependencies: + nanoid: 3.3.16 + picocolors: 1.1.1 + source-map-js: 1.2.1 + postcss@8.5.3: dependencies: nanoid: 3.3.11 @@ -43690,7 +43935,7 @@ snapshots: sharp@0.34.5: dependencies: - '@img/colour': 1.0.0 + '@img/colour': 1.1.0 detect-libc: 2.1.2 semver: 7.8.5 optionalDependencies: @@ -43719,6 +43964,40 @@ snapshots: '@img/sharp-win32-ia32': 0.34.5 '@img/sharp-win32-x64': 0.34.5 + sharp@0.35.4(@types/node@25.0.9): + dependencies: + '@img/colour': 1.1.0 + detect-libc: 2.1.2 + semver: 7.8.5 + optionalDependencies: + '@img/sharp-darwin-arm64': 0.35.4 + '@img/sharp-darwin-x64': 0.35.4 + '@img/sharp-freebsd-wasm32': 0.35.4 + '@img/sharp-libvips-darwin-arm64': 1.3.3 + '@img/sharp-libvips-darwin-x64': 1.3.3 + '@img/sharp-libvips-linux-arm': 1.3.3 + '@img/sharp-libvips-linux-arm64': 1.3.3 + '@img/sharp-libvips-linux-ppc64': 1.3.3 + '@img/sharp-libvips-linux-riscv64': 1.3.3 + '@img/sharp-libvips-linux-s390x': 1.3.3 + '@img/sharp-libvips-linux-x64': 1.3.3 + '@img/sharp-libvips-linuxmusl-arm64': 1.3.3 + '@img/sharp-libvips-linuxmusl-x64': 1.3.3 + '@img/sharp-linux-arm': 0.35.4 + '@img/sharp-linux-arm64': 0.35.4 + '@img/sharp-linux-ppc64': 0.35.4 + '@img/sharp-linux-riscv64': 0.35.4 + '@img/sharp-linux-s390x': 0.35.4 + '@img/sharp-linux-x64': 0.35.4 + '@img/sharp-linuxmusl-arm64': 0.35.4 + '@img/sharp-linuxmusl-x64': 0.35.4 + '@img/sharp-webcontainers-wasm32': 0.35.4 + '@img/sharp-win32-arm64': 0.35.4 + '@img/sharp-win32-ia32': 0.35.4 + '@img/sharp-win32-x64': 0.35.4 + '@types/node': 25.0.9 + optional: true + shebang-command@2.0.0: dependencies: shebang-regex: 3.0.0 @@ -44035,6 +44314,14 @@ snapshots: dependencies: inline-style-parser: 0.2.4 + styled-jsx@5.1.6(@babel/core@7.29.7(supports-color@10.2.2))(babel-plugin-macros@3.1.0)(react@19.2.3): + dependencies: + client-only: 0.0.1 + react: 19.2.3 + optionalDependencies: + '@babel/core': 7.29.7(supports-color@10.2.2) + babel-plugin-macros: 3.1.0 + stylis@4.2.0: {} supports-color@10.2.2: {} @@ -44543,7 +44830,7 @@ snapshots: rolldown: 1.0.2 rollup: 4.63.1 vite: 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.9.0) - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) unrs-resolver@1.11.1: dependencies: @@ -45233,7 +45520,7 @@ snapshots: import-local: 3.2.0 interpret: 3.1.1 rechoir: 0.8.0 - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-merge: 5.10.0 optionalDependencies: webpack-dev-server: 5.2.4(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.110.3) @@ -45267,7 +45554,7 @@ snapshots: range-parser: 1.2.1 schema-utils: 4.3.3 optionalDependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) optional: true webpack-dev-middleware@7.4.2(webpack@5.97.1): @@ -45312,7 +45599,7 @@ snapshots: webpack-dev-middleware: 7.4.2(webpack@5.110.3) ws: 8.20.0 optionalDependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.110.3) transitivePeerDependencies: - bufferutil @@ -45376,7 +45663,7 @@ snapshots: webpack-virtual-modules@0.6.2: {} - webpack@5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4): + webpack@5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4): dependencies: '@types/estree': 1.0.9 '@types/json-schema': 7.0.15 @@ -45391,7 +45678,7 @@ snapshots: events: 3.3.0 graceful-fs: 4.2.11 mime-db: 1.54.0 - minimizer-webpack-plugin: 5.10.0(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack@5.110.3) + minimizer-webpack-plugin: 5.10.0(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack@5.110.3) neo-async: 2.6.2 schema-utils: 4.3.3 tapable: 2.3.3 @@ -45767,293 +46054,3 @@ snapshots: immer: 10.1.1 react: 19.2.3 use-sync-external-store: 1.6.0(react@19.2.3) - iron-session@9.0.1: - dependencies: - cookie: 2.0.1 - iron-webcrypto: 2.0.0 - - cookie@2.0.1: {} - - next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2): - dependencies: - '@next/env': 16.3.4 - '@swc/helpers': 0.5.23 - baseline-browser-mapping: 2.11.22 - caniuse-lite: 1.0.30001760 - postcss: 8.5.23 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - styled-jsx: 5.1.6(@babel/core@7.29.7(supports-color@10.2.2))(babel-plugin-macros@3.1.0)(react@19.2.3) - optionalDependencies: - '@next/swc-darwin-arm64': 16.3.4 - '@next/swc-darwin-x64': 16.3.4 - '@next/swc-linux-arm64-gnu': 16.3.4 - '@next/swc-linux-arm64-musl': 16.3.4 - '@next/swc-linux-x64-gnu': 16.3.4 - '@next/swc-linux-x64-musl': 16.3.4 - '@next/swc-win32-arm64-msvc': 16.3.4 - '@next/swc-win32-x64-msvc': 16.3.4 - '@playwright/test': 1.61.1 - babel-plugin-react-compiler: 1.0.0 - sass: 1.97.2 - sharp: 0.35.4(@types/node@25.0.9) - transitivePeerDependencies: - - '@babel/core' - - '@types/node' - - babel-plugin-macros - - '@next/env@16.3.4': {} - - baseline-browser-mapping@2.11.22: {} - - postcss@8.5.23: - dependencies: - nanoid: 3.3.16 - picocolors: 1.1.1 - source-map-js: 1.2.1 - - nanoid@3.3.16: {} - - styled-jsx@5.1.6(@babel/core@7.29.7(supports-color@10.2.2))(babel-plugin-macros@3.1.0)(react@19.2.3): - dependencies: - client-only: 0.0.1 - react: 19.2.3 - optionalDependencies: - '@babel/core': 7.29.7(supports-color@10.2.2) - babel-plugin-macros: 3.1.0 - - client-only@0.0.1: {} - - '@next/swc-darwin-arm64@16.3.4': - optional: true - - '@next/swc-darwin-x64@16.3.4': - optional: true - - '@next/swc-linux-arm64-gnu@16.3.4': - optional: true - - '@next/swc-linux-arm64-musl@16.3.4': - optional: true - - '@next/swc-linux-x64-gnu@16.3.4': - optional: true - - '@next/swc-linux-x64-musl@16.3.4': - optional: true - - '@next/swc-win32-arm64-msvc@16.3.4': - optional: true - - '@next/swc-win32-x64-msvc@16.3.4': - optional: true - - sharp@0.35.4(@types/node@25.0.9): - dependencies: - '@img/colour': 1.1.0 - detect-libc: 2.1.2 - semver: 7.8.5 - optionalDependencies: - '@img/sharp-darwin-arm64': 0.35.4 - '@img/sharp-darwin-x64': 0.35.4 - '@img/sharp-freebsd-wasm32': 0.35.4 - '@img/sharp-libvips-darwin-arm64': 1.3.3 - '@img/sharp-libvips-darwin-x64': 1.3.3 - '@img/sharp-libvips-linux-arm': 1.3.3 - '@img/sharp-libvips-linux-arm64': 1.3.3 - '@img/sharp-libvips-linux-ppc64': 1.3.3 - '@img/sharp-libvips-linux-riscv64': 1.3.3 - '@img/sharp-libvips-linux-s390x': 1.3.3 - '@img/sharp-libvips-linux-x64': 1.3.3 - '@img/sharp-libvips-linuxmusl-arm64': 1.3.3 - '@img/sharp-libvips-linuxmusl-x64': 1.3.3 - '@img/sharp-linux-arm': 0.35.4 - '@img/sharp-linux-arm64': 0.35.4 - '@img/sharp-linux-ppc64': 0.35.4 - '@img/sharp-linux-riscv64': 0.35.4 - '@img/sharp-linux-s390x': 0.35.4 - '@img/sharp-linux-x64': 0.35.4 - '@img/sharp-linuxmusl-arm64': 0.35.4 - '@img/sharp-linuxmusl-x64': 0.35.4 - '@img/sharp-webcontainers-wasm32': 0.35.4 - '@img/sharp-win32-arm64': 0.35.4 - '@img/sharp-win32-ia32': 0.35.4 - '@img/sharp-win32-x64': 0.35.4 - '@types/node': 25.0.9 - optional: true - - '@img/colour@1.1.0': - optional: true - - '@img/sharp-darwin-arm64@0.35.4': - optionalDependencies: - '@img/sharp-libvips-darwin-arm64': 1.3.3 - optional: true - - '@img/sharp-libvips-darwin-arm64@1.3.3': - optional: true - - '@img/sharp-darwin-x64@0.35.4': - optionalDependencies: - '@img/sharp-libvips-darwin-x64': 1.3.3 - optional: true - - '@img/sharp-libvips-darwin-x64@1.3.3': - optional: true - - '@img/sharp-freebsd-wasm32@0.35.4': - dependencies: - '@img/sharp-wasm32': 0.35.4 - optional: true - - '@img/sharp-wasm32@0.35.4': - dependencies: - '@emnapi/runtime': 1.11.3 - optional: true - - '@img/sharp-libvips-linux-arm@1.3.3': - optional: true - - '@img/sharp-libvips-linux-arm64@1.3.3': - optional: true - - '@img/sharp-libvips-linux-ppc64@1.3.3': - optional: true - - '@img/sharp-libvips-linux-riscv64@1.3.3': - optional: true - - '@img/sharp-libvips-linux-s390x@1.3.3': - optional: true - - '@img/sharp-libvips-linux-x64@1.3.3': - optional: true - - '@img/sharp-libvips-linuxmusl-arm64@1.3.3': - optional: true - - '@img/sharp-libvips-linuxmusl-x64@1.3.3': - optional: true - - '@img/sharp-linux-arm@0.35.4': - optionalDependencies: - '@img/sharp-libvips-linux-arm': 1.3.3 - optional: true - - '@img/sharp-linux-arm64@0.35.4': - optionalDependencies: - '@img/sharp-libvips-linux-arm64': 1.3.3 - optional: true - - '@img/sharp-linux-ppc64@0.35.4': - optionalDependencies: - '@img/sharp-libvips-linux-ppc64': 1.3.3 - optional: true - - '@img/sharp-linux-riscv64@0.35.4': - optionalDependencies: - '@img/sharp-libvips-linux-riscv64': 1.3.3 - optional: true - - '@img/sharp-linux-s390x@0.35.4': - optionalDependencies: - '@img/sharp-libvips-linux-s390x': 1.3.3 - optional: true - - '@img/sharp-linux-x64@0.35.4': - optionalDependencies: - '@img/sharp-libvips-linux-x64': 1.3.3 - optional: true - - '@img/sharp-linuxmusl-arm64@0.35.4': - optionalDependencies: - '@img/sharp-libvips-linuxmusl-arm64': 1.3.3 - optional: true - - '@img/sharp-linuxmusl-x64@0.35.4': - optionalDependencies: - '@img/sharp-libvips-linuxmusl-x64': 1.3.3 - optional: true - - '@img/sharp-webcontainers-wasm32@0.35.4': - dependencies: - '@img/sharp-wasm32': 0.35.4 - optional: true - - '@img/sharp-win32-arm64@0.35.4': - optional: true - - '@img/sharp-win32-ia32@0.35.4': - optional: true - - '@img/sharp-win32-x64@0.35.4': - optional: true - - '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': - dependencies: - '@rolldown/pluginutils': 1.0.0-rc.7 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - optionalDependencies: - '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - babel-plugin-react-compiler: 1.0.0 - - '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': - dependencies: - '@babel/core': 7.29.7(supports-color@10.2.2) - picomatch: 4.0.7 - rolldown: 1.0.2 - optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - optional: true - - nitro@3.0.260311-beta(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): - dependencies: - consola: 3.4.2 - crossws: 0.4.12(srvx@0.11.22) - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) - env-runner: 0.1.6(miniflare@4.20260317.0) - h3: 2.0.1-rc.20(crossws@0.4.12(srvx@0.11.22)) - hookable: 6.1.0 - nf3: 0.3.11 - ocache: 0.1.2 - ofetch: 2.0.0-alpha.3 - ohash: 2.0.11 - rolldown: 1.0.2 - srvx: 0.11.22 - unenv: 2.0.0-rc.24 - unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) - optionalDependencies: - dotenv: 17.4.2 - giget: 3.3.1 - jiti: 2.7.0 - rollup: 4.63.1 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@libsql/client' - - '@netlify/blobs' - - '@planetscale/database' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/functions' - - '@vercel/kv' - - aws4fetch - - better-sqlite3 - - chokidar - - drizzle-orm - - idb-keyval - - ioredis - - lru-cache - - miniflare - - mongodb - - mysql2 - - sqlite3 - - uploadthing From ab99818225835a1553a9f3513cd2093ff1b257be Mon Sep 17 00:00:00 2001 From: Flo Date: Mon, 14 Sep 2026 10:54:21 +0200 Subject: [PATCH 027/175] chore(deps): upgrade Rsbuild to 2.2.5 (#8397) * chore: upgrade Rsbuild to 2.2.5 * fix(rsbuild): preserve flags in watch exclusions * Merge branch 'main' into codex/rsbuild-upgrade [Self-Healing CI Rerun] --------- Co-authored-by: nx-cloud[bot] <71083854+nx-cloud[bot]@users.noreply.github.com> --- .changeset/rsbuild-watch-predicate.md | 6 + packages/solid-start/package.json | 1 + packages/solid-start/src/plugin/rsbuild.ts | 3 + packages/solid-start/tests/rsbuild.test.ts | 107 +++ .../start-plugin-core/src/rsbuild/plugin.ts | 28 +- .../src/rsbuild/watch-ignored.ts | 24 + .../tests/rsbuild/watch-ignored.test.ts | 48 ++ pnpm-lock.yaml | 661 ++++++++---------- pnpm-workspace.yaml | 2 +- 9 files changed, 498 insertions(+), 382 deletions(-) create mode 100644 .changeset/rsbuild-watch-predicate.md create mode 100644 packages/solid-start/tests/rsbuild.test.ts create mode 100644 packages/start-plugin-core/src/rsbuild/watch-ignored.ts create mode 100644 packages/start-plugin-core/tests/rsbuild/watch-ignored.test.ts diff --git a/.changeset/rsbuild-watch-predicate.md b/.changeset/rsbuild-watch-predicate.md new file mode 100644 index 0000000000..e04c675f46 --- /dev/null +++ b/.changeset/rsbuild-watch-predicate.md @@ -0,0 +1,6 @@ +--- +'@tanstack/start-plugin-core': patch +'@tanstack/solid-start': patch +--- + +Support Rsbuild 2.2: preserve function-based Rspack watch exclusions and regular-expression flags when adding monorepo build-output exclusions, and leave string-valued Babel loader options intact in the Solid Start plugin. diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index cc3a176270..88a09b5d45 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -26,6 +26,7 @@ "scripts": { "clean": "rimraf ./dist && rimraf ./coverage", "test": "pnpm test:build", + "test:unit": "vitest", "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", "build": "vite build && vite build -c vite.config.server-entry.ts" }, diff --git a/packages/solid-start/src/plugin/rsbuild.ts b/packages/solid-start/src/plugin/rsbuild.ts index b1f2532264..4df2f77d36 100644 --- a/packages/solid-start/src/plugin/rsbuild.ts +++ b/packages/solid-start/src/plugin/rsbuild.ts @@ -51,6 +51,9 @@ export function tanstackStart( } rule.use(CHAIN_ID.USE.BABEL).tap((babelOptions) => { + if (typeof babelOptions === 'string') { + return babelOptions + } babelOptions.presets = (babelOptions.presets ?? []).map( (preset: unknown) => { if ( diff --git a/packages/solid-start/tests/rsbuild.test.ts b/packages/solid-start/tests/rsbuild.test.ts new file mode 100644 index 0000000000..3ab029ad07 --- /dev/null +++ b/packages/solid-start/tests/rsbuild.test.ts @@ -0,0 +1,107 @@ +// @vitest-environment node +import { createRsbuild } from '@rsbuild/core' +import { describe, expect, test, vi } from 'vitest' +import { tanstackStart } from '../src/plugin/rsbuild' + +// Exercise the Solid-specific hook with Rsbuild's real chain, independently of +// route generation and the core Start plugin's filesystem setup. +vi.mock('@tanstack/start-plugin-core/rsbuild', () => ({ + RSBUILD_ENVIRONMENT_NAMES: { server: 'server' }, + tanStackStartRsbuild: () => ({ setup() {} }), +})) + +async function configureBabel( + target: 'web' | 'node', + options: string | { presets: Array }, +) { + const results: Array = [] + const rsbuild = await createRsbuild({ + rsbuildConfig: { + source: { entry: { index: './src/index.ts' } }, + output: { target }, + plugins: [ + { + name: 'test-babel-options', + setup(api) { + api.modifyBundlerChain((chain, { CHAIN_ID }) => { + for (const id of [ + CHAIN_ID.RULE.JS, + CHAIN_ID.RULE.JS_DATA_URI, + 'babel-js', + ]) { + chain.module + .rule(id) + .use(CHAIN_ID.USE.BABEL) + .loader('babel-loader') + .options(structuredClone(options)) + } + }) + }, + }, + tanstackStart(), + { + name: 'test-read-babel-options', + setup(api) { + api.modifyBundlerChain((chain, { CHAIN_ID }) => { + for (const id of [ + CHAIN_ID.RULE.JS, + CHAIN_ID.RULE.JS_DATA_URI, + 'babel-js', + ]) { + results.push( + chain.module.rule(id).use(CHAIN_ID.USE.BABEL).get('options'), + ) + } + }) + }, + }, + ], + }, + }) + await rsbuild.initConfigs() + return results +} + +describe('Solid Start Rsbuild Babel options', () => { + test.each(['web', 'node'] as const)( + 'preserves string loader options for %s', + async (target) => { + const options = 'babelrc=true&configFile=./babel.config.json' + expect(await configureBabel(target, options)).toEqual([ + options, + options, + options, + ]) + }, + ) + + test.each(['web', 'node'] as const)( + 'retains Solid hydration and target selection for %s', + async (target) => { + const options = { + presets: [ + ['babel-preset-solid', { custom: true, hydratable: false }], + ['another-preset', { untouched: true }], + ], + } + const expected = { + presets: [ + [ + 'babel-preset-solid', + { + custom: true, + hydratable: true, + generate: target === 'node' ? 'ssr' : 'dom', + }, + ], + ['another-preset', { untouched: true }], + ], + } + expect(await configureBabel(target, options)).toEqual([ + expected, + expected, + expected, + ]) + }, + ) +}) diff --git a/packages/start-plugin-core/src/rsbuild/plugin.ts b/packages/start-plugin-core/src/rsbuild/plugin.ts index 20196f91e8..54ac57e9b7 100644 --- a/packages/start-plugin-core/src/rsbuild/plugin.ts +++ b/packages/start-plugin-core/src/rsbuild/plugin.ts @@ -7,8 +7,9 @@ import { applyResolvedRouterBasepath, createStartConfigContext, } from '../config-context' -import { escapeRegExp, normalizePath } from '../utils' +import { normalizePath } from '../utils' import { createServerFnBasePath, normalizePublicBase } from '../planning' +import { addWorkspaceWatchIgnored } from './watch-ignored' import { parseStartConfig, rsbuildClientOutputSchema } from './schema' import { RSBUILD_CLIENT_ASSETS_DIR, @@ -444,27 +445,12 @@ export function tanStackStartRsbuild( const workspaceDistRealpaths = resolveWorkspacePackageDistRealpaths() if (workspaceDistRealpaths.length === 0) return - const workspaceDistIgnored = new RegExp( - workspaceDistRealpaths - .map((path) => `^${escapeRegExp(path)}(?:[\\\\/]|$)`) - .join('|'), - ) - const ignored = config.watchOptions?.ignored - config.watchOptions = { ...(config.watchOptions ?? {}), - ignored: - ignored == null - ? new RegExp( - `${defaultRspackWatchIgnored.source}|${workspaceDistIgnored.source}`, - ) - : typeof ignored === 'string' - ? [ignored, ...workspaceDistRealpaths] - : Array.isArray(ignored) - ? [...ignored, ...workspaceDistRealpaths] - : new RegExp( - `${ignored.source}|${workspaceDistIgnored.source}`, - ), + ignored: addWorkspaceWatchIgnored( + config.watchOptions?.ignored, + workspaceDistRealpaths, + ), } }) } @@ -790,8 +776,6 @@ export function tanStackStartRsbuild( } } -const defaultRspackWatchIgnored = /[\\/](?:\.git|node_modules)[\\/]/ - function seedResolveModules( config: RspackConfig, entries: Array, diff --git a/packages/start-plugin-core/src/rsbuild/watch-ignored.ts b/packages/start-plugin-core/src/rsbuild/watch-ignored.ts new file mode 100644 index 0000000000..e5b85f5e04 --- /dev/null +++ b/packages/start-plugin-core/src/rsbuild/watch-ignored.ts @@ -0,0 +1,24 @@ +import { escapeRegExp } from '../utils' +import type { Rspack } from '@rsbuild/core' + +type WatchIgnored = NonNullable['ignored'] + +export function addWorkspaceWatchIgnored( + ignored: WatchIgnored, + directories: Array, +): WatchIgnored { + const workspace = new RegExp( + directories.map((path) => `^${escapeRegExp(path)}(?:[\\\\/]|$)`).join('|'), + ) + if (typeof ignored === 'function') { + return (entry) => ignored(entry) || workspace.test(entry) + } + if (typeof ignored === 'string') { + return [ignored, ...directories] + } + if (Array.isArray(ignored)) { + return [...ignored, ...directories] + } + const original = ignored ?? /[\\/](?:\.git|node_modules)[\\/]/ + return new RegExp(`${original.source}|${workspace.source}`, original.flags) +} diff --git a/packages/start-plugin-core/tests/rsbuild/watch-ignored.test.ts b/packages/start-plugin-core/tests/rsbuild/watch-ignored.test.ts new file mode 100644 index 0000000000..f1adf018e7 --- /dev/null +++ b/packages/start-plugin-core/tests/rsbuild/watch-ignored.test.ts @@ -0,0 +1,48 @@ +import { describe, expect, test } from 'vitest' +import { addWorkspaceWatchIgnored } from '../../src/rsbuild/watch-ignored' + +describe('workspace watch exclusions', () => { + test('preserves flags on an existing regular expression', () => { + const ignored = addWorkspaceWatchIgnored(/generated/iu, ['/repo/dist']) + expect(ignored).toBeInstanceOf(RegExp) + if (!(ignored instanceof RegExp)) { + throw new Error('Expected a watch expression') + } + expect(ignored.flags).toBe('iu') + expect(ignored.test('/app/GENERATED/route.ts')).toBe(true) + expect(ignored.test('/repo/dist/index.js')).toBe(true) + expect(ignored.test('/repo/dist-other/index.js')).toBe(false) + expect(ignored.test('/app/route.ts')).toBe(false) + }) + + test('preserves an existing predicate and excludes only the workspace dist directory', () => { + const ignored = addWorkspaceWatchIgnored( + (entry) => entry.endsWith('.generated.ts'), + ['/repo/packages/router/dist'], + ) + expect(typeof ignored).toBe('function') + if (typeof ignored !== 'function') { + throw new Error('Expected a watch predicate') + } + expect(ignored('/app/route.generated.ts')).toBe(true) + expect(ignored('/repo/packages/router/dist/index.js')).toBe(true) + expect(ignored('/repo/packages/router/dist')).toBe(true) + expect(ignored('/repo/packages/router/dist-other/index.js')).toBe(false) + expect(ignored('/app/route.ts')).toBe(false) + }) + + test('retains default, regex, and glob exclusions', () => { + expect(addWorkspaceWatchIgnored(undefined, ['/repo/dist'])).toEqual( + /[\\/](?:\.git|node_modules)[\\/]|^\/repo\/dist(?:[\\/]|$)/, + ) + expect(addWorkspaceWatchIgnored(/generated/, ['/repo/dist'])).toEqual( + /generated|^\/repo\/dist(?:[\\/]|$)/, + ) + expect(addWorkspaceWatchIgnored('**/generated/**', ['/repo/dist'])).toEqual( + ['**/generated/**', '/repo/dist'], + ) + expect( + addWorkspaceWatchIgnored(['**/generated/**'], ['/repo/dist']), + ).toEqual(['**/generated/**', '/repo/dist']) + }) +}) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4dd7da41b9..5a381646a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,8 +19,8 @@ catalogs: specifier: ^1.26.2 version: 1.26.2 '@rsbuild/core': - specifier: ^2.1.0 - version: 2.1.1 + specifier: ^2.2.5 + version: 2.2.5 '@tanstack/vite-config': specifier: 0.5.2 version: 0.5.2 @@ -150,13 +150,13 @@ importers: version: 2.30.0(@types/node@25.0.9) '@nx/devkit': specifier: 23.2.0 - version: 23.2.0(nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23))) + version: 23.2.0(nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23))) '@playwright/test': specifier: ^1.61.0 version: 1.61.1 '@swc-node/register': specifier: ^1.11.1 - version: 1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0) + version: 1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0) '@tanstack/eslint-config': specifier: 0.4.0 version: 0.4.0(@typescript-eslint/utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) @@ -177,7 +177,7 @@ importers: version: 4.0.3 nx: specifier: 23.2.0 - version: 23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)) + version: 23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)) prettier: specifier: ^3.8.0 version: 3.8.1 @@ -247,7 +247,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../packages/router-plugin @@ -1471,7 +1471,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -1526,7 +1526,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -1755,7 +1755,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -2182,7 +2182,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2362,7 +2362,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -2420,7 +2420,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2625,7 +2625,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -2741,7 +2741,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2986,7 +2986,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3032,7 +3032,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tanstack/eslint-plugin-start': specifier: workspace:^ version: link:../../../packages/eslint-plugin-start @@ -3200,7 +3200,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3441,7 +3441,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -3822,7 +3822,7 @@ importers: version: link:../../../packages/start-static-server-functions nitro: specifier: ^3.0.1-alpha.2 - version: 3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0)) + version: 3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0)) react: specifier: ^19.2.3 version: 19.2.3 @@ -6484,7 +6484,7 @@ importers: version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) '@rsbuild/plugin-vue': specifier: ^1.2.7 - version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) '@rsbuild/plugin-vue-jsx': specifier: ^2.0.0 version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(supports-color@10.2.2) @@ -6542,7 +6542,7 @@ importers: version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) '@rsbuild/plugin-vue': specifier: ^1.2.7 - version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) '@rsbuild/plugin-vue-jsx': specifier: ^2.0.0 version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(supports-color@10.2.2) @@ -6768,7 +6768,7 @@ importers: version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) '@rsbuild/plugin-vue': specifier: ^1.2.7 - version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) '@rsbuild/plugin-vue-jsx': specifier: ^2.0.0 version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(supports-color@10.2.2) @@ -8967,7 +8967,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -10085,10 +10085,10 @@ importers: version: 2.0.14 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.0.14)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.0.14)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) '@rsbuild/plugin-tailwindcss': specifier: ^2.0.3 - version: 2.0.3(@rsbuild/core@2.0.14)(@rspack/core@2.1.1(@swc/helpers@0.5.23))(webpack@5.110.3) + version: 2.0.3(@rsbuild/core@2.0.14)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(webpack@5.110.3) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13706,7 +13706,7 @@ importers: dependencies: nitropack: specifier: ^2.13.4 - version: 2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.1.1(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@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.9.0))(webpack@5.110.3) + version: 2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@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.9.0))(webpack@5.110.3) pathe: specifier: 'catalog:' version: 2.0.3 @@ -13963,7 +13963,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@rsbuild/core': specifier: 'catalog:' - version: 2.1.1 + version: 2.2.5 '@tanstack/vite-config': specifier: 'catalog:' version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) @@ -14466,7 +14466,7 @@ importers: version: 5.0.0 unplugin: specifier: ^3.3.0 - version: 3.3.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) + version: 3.3.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) vite: 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.9.0) @@ -14482,7 +14482,7 @@ importers: version: 0.18.4 '@rsbuild/core': specifier: 'catalog:' - version: 2.1.1 + version: 2.2.5 '@tanstack/vite-config': specifier: 'catalog:' version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) @@ -14812,7 +14812,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@rsbuild/core': specifier: 'catalog:' - version: 2.1.1 + version: 2.2.5 '@tanstack/router-utils': specifier: workspace:* version: link:../router-utils @@ -15062,7 +15062,7 @@ importers: version: 0.18.4 '@rsbuild/core': specifier: 'catalog:' - version: 2.1.1 + version: 2.2.5 '@tanstack/vite-config': specifier: 'catalog:' version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) @@ -15462,7 +15462,7 @@ importers: version: 0.18.4 '@rsbuild/core': specifier: 'catalog:' - version: 2.1.1 + version: 2.2.5 '@tanstack/router-utils': specifier: workspace:* version: link:../router-utils @@ -17839,12 +17839,6 @@ packages: resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==} engines: {node: '>=18'} - '@img/sharp-darwin-arm64@0.34.4': - resolution: {integrity: sha512-sitdlPzDVyvmINUdJle3TNHl+AG9QcwiAMsXmccqsCOMZNIdW2/7S26w0LyU8euiLVzFBL3dXPwVCq/ODnf2vA==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [arm64] - os: [darwin] - '@img/sharp-darwin-arm64@0.34.5': resolution: {integrity: sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -17857,12 +17851,6 @@ packages: cpu: [arm64] os: [darwin] - '@img/sharp-darwin-x64@0.34.4': - resolution: {integrity: sha512-rZheupWIoa3+SOdF/IcUe1ah4ZDpKBGWcsPX6MT0lYniH9micvIU7HQkYTfrx5Xi8u+YqwLtxC/3vl8TQN6rMg==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [x64] - os: [darwin] - '@img/sharp-darwin-x64@0.34.5': resolution: {integrity: sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -17880,11 +17868,6 @@ packages: engines: {node: '>=20.9.0'} os: [freebsd] - '@img/sharp-libvips-darwin-arm64@1.2.3': - resolution: {integrity: sha512-QzWAKo7kpHxbuHqUC28DZ9pIKpSi2ts2OJnoIGI26+HMgq92ZZ4vk8iJd4XsxN+tYfNJxzH6W62X5eTcsBymHw==} - cpu: [arm64] - os: [darwin] - '@img/sharp-libvips-darwin-arm64@1.2.4': resolution: {integrity: sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==} cpu: [arm64] @@ -17895,11 +17878,6 @@ packages: cpu: [arm64] os: [darwin] - '@img/sharp-libvips-darwin-x64@1.2.3': - resolution: {integrity: sha512-Ju+g2xn1E2AKO6YBhxjj+ACcsPQRHT0bhpglxcEf+3uyPY+/gL8veniKoo96335ZaPo03bdDXMv0t+BBFAbmRA==} - cpu: [x64] - os: [darwin] - '@img/sharp-libvips-darwin-x64@1.2.4': resolution: {integrity: sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==} cpu: [x64] @@ -17910,12 +17888,6 @@ packages: cpu: [x64] os: [darwin] - '@img/sharp-libvips-linux-arm64@1.2.3': - resolution: {integrity: sha512-I4RxkXU90cpufazhGPyVujYwfIm9Nk1QDEmiIsaPwdnm013F7RIceaCc87kAH+oUB1ezqEvC6ga4m7MSlqsJvQ==} - cpu: [arm64] - os: [linux] - libc: [glibc] - '@img/sharp-libvips-linux-arm64@1.2.4': resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==} cpu: [arm64] @@ -17928,12 +17900,6 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-libvips-linux-arm@1.2.3': - resolution: {integrity: sha512-x1uE93lyP6wEwGvgAIV0gP6zmaL/a0tGzJs/BIDDG0zeBhMnuUPm7ptxGhUbcGs4okDJrk4nxgrmxpib9g6HpA==} - cpu: [arm] - os: [linux] - libc: [glibc] - '@img/sharp-libvips-linux-arm@1.2.4': resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==} cpu: [arm] @@ -17946,12 +17912,6 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-libvips-linux-ppc64@1.2.3': - resolution: {integrity: sha512-Y2T7IsQvJLMCBM+pmPbM3bKT/yYJvVtLJGfCs4Sp95SjvnFIjynbjzsa7dY1fRJX45FTSfDksbTp6AGWudiyCg==} - cpu: [ppc64] - os: [linux] - libc: [glibc] - '@img/sharp-libvips-linux-ppc64@1.2.4': resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==} cpu: [ppc64] @@ -17976,12 +17936,6 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-libvips-linux-s390x@1.2.3': - resolution: {integrity: sha512-RgWrs/gVU7f+K7P+KeHFaBAJlNkD1nIZuVXdQv6S+fNA6syCcoboNjsV2Pou7zNlVdNQoQUpQTk8SWDHUA3y/w==} - cpu: [s390x] - os: [linux] - libc: [glibc] - '@img/sharp-libvips-linux-s390x@1.2.4': resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==} cpu: [s390x] @@ -17994,12 +17948,6 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-libvips-linux-x64@1.2.3': - resolution: {integrity: sha512-3JU7LmR85K6bBiRzSUc/Ff9JBVIFVvq6bomKE0e63UXGeRw2HPVEjoJke1Yx+iU4rL7/7kUjES4dZ/81Qjhyxg==} - cpu: [x64] - os: [linux] - libc: [glibc] - '@img/sharp-libvips-linux-x64@1.2.4': resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==} cpu: [x64] @@ -18012,12 +17960,6 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-libvips-linuxmusl-arm64@1.2.3': - resolution: {integrity: sha512-F9q83RZ8yaCwENw1GieztSfj5msz7GGykG/BA+MOUefvER69K/ubgFHNeSyUu64amHIYKGDs4sRCMzXVj8sEyw==} - cpu: [arm64] - os: [linux] - libc: [musl] - '@img/sharp-libvips-linuxmusl-arm64@1.2.4': resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==} cpu: [arm64] @@ -18030,12 +17972,6 @@ packages: os: [linux] libc: [musl] - '@img/sharp-libvips-linuxmusl-x64@1.2.3': - resolution: {integrity: sha512-U5PUY5jbc45ANM6tSJpsgqmBF/VsL6LnxJmIf11kB7J5DctHgqm0SkuXzVWtIY90GnJxKnC/JT251TDnk1fu/g==} - cpu: [x64] - os: [linux] - libc: [musl] - '@img/sharp-libvips-linuxmusl-x64@1.2.4': resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==} cpu: [x64] @@ -18048,13 +17984,6 @@ packages: os: [linux] libc: [musl] - '@img/sharp-linux-arm64@0.34.4': - resolution: {integrity: sha512-YXU1F/mN/Wu786tl72CyJjP/Ngl8mGHN1hST4BGl+hiW5jhCnV2uRVTNOcaYPs73NeT/H8Upm3y9582JVuZHrQ==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [arm64] - os: [linux] - libc: [glibc] - '@img/sharp-linux-arm64@0.34.5': resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18069,13 +17998,6 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-linux-arm@0.34.4': - resolution: {integrity: sha512-Xyam4mlqM0KkTHYVSuc6wXRmM7LGN0P12li03jAnZ3EJWZqj83+hi8Y9UxZUbxsgsK1qOEwg7O0Bc0LjqQVtxA==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [arm] - os: [linux] - libc: [glibc] - '@img/sharp-linux-arm@0.34.5': resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18090,13 +18012,6 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-linux-ppc64@0.34.4': - resolution: {integrity: sha512-F4PDtF4Cy8L8hXA2p3TO6s4aDt93v+LKmpcYFLAVdkkD3hSxZzee0rh6/+94FpAynsuMpLX5h+LRsSG3rIciUQ==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [ppc64] - os: [linux] - libc: [glibc] - '@img/sharp-linux-ppc64@0.34.5': resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18125,13 +18040,6 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-linux-s390x@0.34.4': - resolution: {integrity: sha512-qVrZKE9Bsnzy+myf7lFKvng6bQzhNUAYcVORq2P7bDlvmF6u2sCmK2KyEQEBdYk+u3T01pVsPrkj943T1aJAsw==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [s390x] - os: [linux] - libc: [glibc] - '@img/sharp-linux-s390x@0.34.5': resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18146,13 +18054,6 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-linux-x64@0.34.4': - resolution: {integrity: sha512-ZfGtcp2xS51iG79c6Vhw9CWqQC8l2Ot8dygxoDoIQPTat/Ov3qAa8qpxSrtAEAJW+UjTXc4yxCjNfxm4h6Xm2A==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [x64] - os: [linux] - libc: [glibc] - '@img/sharp-linux-x64@0.34.5': resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18167,13 +18068,6 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-linuxmusl-arm64@0.34.4': - resolution: {integrity: sha512-8hDVvW9eu4yHWnjaOOR8kHVrew1iIX+MUgwxSuH2XyYeNRtLUe4VNioSqbNkB7ZYQJj9rUTT4PyRscyk2PXFKA==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [arm64] - os: [linux] - libc: [musl] - '@img/sharp-linuxmusl-arm64@0.34.5': resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18188,13 +18082,6 @@ packages: os: [linux] libc: [musl] - '@img/sharp-linuxmusl-x64@0.34.4': - resolution: {integrity: sha512-lU0aA5L8QTlfKjpDCEFOZsTYGn3AEiO6db8W5aQDxj0nQkVrZWmN3ZP9sYKWJdtq3PWPhUNlqehWyXpYDcI9Sg==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [x64] - os: [linux] - libc: [musl] - '@img/sharp-linuxmusl-x64@0.34.5': resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18209,11 +18096,6 @@ packages: os: [linux] libc: [musl] - '@img/sharp-wasm32@0.34.4': - resolution: {integrity: sha512-33QL6ZO/qpRyG7woB/HUALz28WnTMI2W1jgX3Nu2bypqLIKx/QKMILLJzJjI+SIbvXdG9fUnmrxR7vbi1sTBeA==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [wasm32] - '@img/sharp-wasm32@0.34.5': resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18228,12 +18110,6 @@ packages: engines: {node: '>=20.9.0'} cpu: [wasm32] - '@img/sharp-win32-arm64@0.34.4': - resolution: {integrity: sha512-2Q250do/5WXTwxW3zjsEuMSv5sUU4Tq9VThWKlU2EYLm4MB7ZeMwF+SFJutldYODXF6jzc6YEOC+VfX0SZQPqA==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [arm64] - os: [win32] - '@img/sharp-win32-arm64@0.34.5': resolution: {integrity: sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18246,12 +18122,6 @@ packages: cpu: [arm64] os: [win32] - '@img/sharp-win32-ia32@0.34.4': - resolution: {integrity: sha512-3ZeLue5V82dT92CNL6rsal6I2weKw1cYu+rGKm8fOCCtJTR2gYeUfY3FqUnIJsMUPIH68oS5jmZ0NiJ508YpEw==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [ia32] - os: [win32] - '@img/sharp-win32-ia32@0.34.5': resolution: {integrity: sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18264,12 +18134,6 @@ packages: cpu: [ia32] os: [win32] - '@img/sharp-win32-x64@0.34.4': - resolution: {integrity: sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - cpu: [x64] - os: [win32] - '@img/sharp-win32-x64@0.34.5': resolution: {integrity: sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -18663,6 +18527,12 @@ packages: '@emnapi/core': ^1.7.1 '@emnapi/runtime': ^1.7.1 + '@napi-rs/wasm-runtime@1.1.6': + resolution: {integrity: sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==} + peerDependencies: + '@emnapi/core': ^1.7.1 + '@emnapi/runtime': ^1.7.1 + '@neon-rs/load@0.0.4': resolution: {integrity: sha512-kTPhdZyTQxB+2wpiRcFWrDcejc4JI6tkPuS7UZCG4l6Zvc5kU/gGQ/ozvHTh1XR5tS+UlfAfGuPajjzQjCiHCw==} @@ -20712,6 +20582,16 @@ packages: core-js: optional: true + '@rsbuild/core@2.2.5': + resolution: {integrity: sha512-nf34ri1iZduYhHUr5Vc79L7Eml+IlN0nFIaF/g3OW4WR/gShxuf5wVXS69/H8FTHJYN4SdYlNcefSZQluEMKgA==} + engines: {node: ^20.19.0 || >=22.12.0} + hasBin: true + peerDependencies: + core-js: '>= 3.0.0' + peerDependenciesMeta: + core-js: + optional: true + '@rsbuild/plugin-babel@1.1.2': resolution: {integrity: sha512-qIZzosQlkj7VyFz8mmz1vAKDFlk79xrIvCRYzROqNwQHDXep+gd91nCnUPJdRPHrktzN8Yqa190CPTii3rON6w==} peerDependencies: @@ -20775,6 +20655,11 @@ packages: cpu: [arm64] os: [darwin] + '@rspack/binding-darwin-arm64@2.2.3': + resolution: {integrity: sha512-MGLx4lMTY6XEtJi55S+fk83+683GeUDuoqzjixbq6ehHdr/l6nGiHhgvMtV5DYt9sCytUDzyrCkcJ0AWqJxnTA==} + cpu: [arm64] + os: [darwin] + '@rspack/binding-darwin-x64@2.0.0': resolution: {integrity: sha512-YQ96LMmzIzhZt9cZWUDWXSxS9UWWHWoLxJyZ5f42DSaVPVelBg5ThbVORDwOP5QDA2xFXj60rVnmmcZLzg/aDA==} cpu: [x64] @@ -20790,6 +20675,11 @@ packages: cpu: [x64] os: [darwin] + '@rspack/binding-darwin-x64@2.2.3': + resolution: {integrity: sha512-5B/c1YTYEz9m7TyqtGQgTmXMr9PoPewyqsyHB4N0AB7nxDhtgmki0GniP2Lqtx3LJzOvQMjwet+I2lmWxvxwCg==} + cpu: [x64] + os: [darwin] + '@rspack/binding-linux-arm64-gnu@2.0.0': resolution: {integrity: sha512-Ufn33gzkIV7JY69k6vJQEdOzRvBqThIgH46pwXksHSMwRZp8IbJhXfyYIAVsRWCk8fXpr9t1nAvCDvJXT2EeyA==} cpu: [arm64] @@ -20808,6 +20698,12 @@ packages: os: [linux] libc: [glibc] + '@rspack/binding-linux-arm64-gnu@2.2.3': + resolution: {integrity: sha512-sU+jPGD2xz3BxFvsdBQVGce538YHqrSKMB4ZSfKhj6RSKjeGzpJ1BVl8+IndiQsfTgaUxi7N+r5cs/ezGy1TVQ==} + cpu: [arm64] + os: [linux] + libc: [glibc] + '@rspack/binding-linux-arm64-musl@2.0.0': resolution: {integrity: sha512-CZbvFKlNY9UC0C+Czz6i8JFCzGpuL9oX8gEqcJA1+84Y6eEEBH50UiTzeCewxKW3dOofkZdvT5vgNMXz6aMUmg==} cpu: [arm64] @@ -20826,18 +20722,48 @@ packages: os: [linux] libc: [musl] + '@rspack/binding-linux-arm64-musl@2.2.3': + resolution: {integrity: sha512-EQuADbqWbVgNAh5ep/u/B7Z/8UUkZjMLzHAOKZJklBpe4Y8mnhFNjieX0xc9NadR+drj9tqmEANxzTOkFtVPyQ==} + cpu: [arm64] + os: [linux] + libc: [musl] + + '@rspack/binding-linux-ppc64-gnu@2.2.3': + resolution: {integrity: sha512-kyXROzr519a5juBII9ysuc5ZD2apEZ0DJqL5PPCAOVHjzMfThEIBwnX3gicNCmp+kY0CCIOl2LagwbtFaOzoiA==} + cpu: [ppc64] + os: [linux] + libc: [glibc] + '@rspack/binding-linux-riscv64-gnu@2.1.1': resolution: {integrity: sha512-LGdYCAvblZp2qtHk9UseYftIRyaBzSWqEzd1toaS08sYESXERm+YBbrYKKiyq1yXiU1L7BkhMUxiWc3GCYmKcA==} cpu: [riscv64] os: [linux] libc: [glibc] + '@rspack/binding-linux-riscv64-gnu@2.2.3': + resolution: {integrity: sha512-F3x6Nu0RUSoLtiaMse3hYQ3Nf5A2de6vTWWDXj14Ll6BpGWXGn+U/eXT/nB199fFnDEYf+CJEa7d6fzcYdwdjA==} + cpu: [riscv64] + os: [linux] + libc: [glibc] + '@rspack/binding-linux-riscv64-musl@2.1.1': resolution: {integrity: sha512-87phiiPGFT1p4gy3Oz6YdNijCPXdjJy43LFdE8AFiZsV4ChFXQPqnVCF2aMRLybYa51A+9wGYlTvxt09yUQUww==} cpu: [riscv64] os: [linux] libc: [musl] + '@rspack/binding-linux-riscv64-musl@2.2.3': + resolution: {integrity: sha512-O3HK7OnPvoBxZu4MX2j+t3gk4qiUsFYqj/29L3WgU1iQsdUSIN6PInW2JvbiLqyuzt09VltIEXTKayY8EysCpQ==} + cpu: [riscv64] + os: [linux] + libc: [musl] + + '@rspack/binding-linux-s390x-gnu@2.2.3': + resolution: {integrity: sha512-SIxfGdwBdAjwJ8pDlPTb8MPIZIv/i2lKHn4/ywuDpFOxlUA4Bo/OKqQOenHx2MFD2mN8jigBZQTF0KVe5YP1uQ==} + cpu: [s390x] + os: [linux] + libc: [glibc] + '@rspack/binding-linux-x64-gnu@2.0.0': resolution: {integrity: sha512-dPjFGpoCvZfFpJBsWAUR+PR7mWYxpou6L026qIOpAVkz7WiTzErwKD3P1jVrpP4dM9yLb3fVE+PHHjTglhTJ4g==} cpu: [x64] @@ -20856,6 +20782,12 @@ packages: os: [linux] libc: [glibc] + '@rspack/binding-linux-x64-gnu@2.2.3': + resolution: {integrity: sha512-IzQGcw09WYn/IzwB1SQpg7FQ211MBr+fJB2/WoRrPS6CNdtlkDHZaI8z2oq+2Oc5Su21jgX75VlWFajirUx5Dw==} + cpu: [x64] + os: [linux] + libc: [glibc] + '@rspack/binding-linux-x64-musl@2.0.0': resolution: {integrity: sha512-4fgDTMWt0mJDiugdia2mdOjTbnm7yM1Drzl1JpPqlUlOr113byOhc+qgN57LURSGypz2yz/h/Zad7/UnVAxYJw==} cpu: [x64] @@ -20874,6 +20806,12 @@ packages: os: [linux] libc: [musl] + '@rspack/binding-linux-x64-musl@2.2.3': + resolution: {integrity: sha512-9OKSx2ickrR+PFal94XE6Hkj49AQ2HI3KuR9XeRkKOwSxjwrskV/Pn1wc2itDOHkm/QHP7k+MttsYb4FGuNIqw==} + cpu: [x64] + os: [linux] + libc: [musl] + '@rspack/binding-wasm32-wasi@2.0.0': resolution: {integrity: sha512-ANk73ZKtPrZf9gdtyRK2nQUfhi1uXoC5P2KF89pyVAE8+zcoLBnYtZGYpWa/cmNi5BcO5g4Z+v2l1UA3bUPLQQ==} cpu: [wasm32] @@ -20886,6 +20824,10 @@ packages: resolution: {integrity: sha512-OicgaB3Dcd+KXsH/I3DkJG7XQyREJScg/jLkCtycFn9BhT0IVJvgi37F8QNJKl8Bp9YZIGehsqK9HpQWav6SLw==} cpu: [wasm32] + '@rspack/binding-wasm32-wasi@2.2.3': + resolution: {integrity: sha512-gici3jWJi0GDy9kbYh57LoA57H8A2EAD9cV2jFKp1YoJ2aX2U9lANh4L+xoKPTvVQYpRvleoA5jkAvyfeLQ5bw==} + cpu: [wasm32] + '@rspack/binding-win32-arm64-msvc@2.0.0': resolution: {integrity: sha512-IHZFRtJ85ONbM+BCtF4TeYXS2Fu9X0IJS2phX1rPibYq9iEtHGfBt4cNlnsJPhbPAXVvi4Oli/yiLRJ1zxtCIg==} cpu: [arm64] @@ -20901,6 +20843,11 @@ packages: cpu: [arm64] os: [win32] + '@rspack/binding-win32-arm64-msvc@2.2.3': + resolution: {integrity: sha512-1MG66kcuqAGFs9ewiBc+/NJSTQr1jHrkZ2nCVMyhukl1o8embmFZa3BCibYgBYs5P7FRc6Sa+CDXcrfDZOLInQ==} + cpu: [arm64] + os: [win32] + '@rspack/binding-win32-ia32-msvc@2.0.0': resolution: {integrity: sha512-n4tbIqacq/FhNJflMlgZV50AeQFTLh5hnDS3v4W+rJWa3IW1VfgB0+XppdeW+Dqhw7QcMIsCmro01kwNdlXZDQ==} cpu: [ia32] @@ -20916,6 +20863,11 @@ packages: cpu: [ia32] os: [win32] + '@rspack/binding-win32-ia32-msvc@2.2.3': + resolution: {integrity: sha512-CAigxxh9DYJmEwH9f6FRkSsmt0GhKVqKaFRVFFrF9WDL7gXP3hyE/h/cCeMdmlTzRt8Mht87AvnDX7PG3neMrA==} + cpu: [ia32] + os: [win32] + '@rspack/binding-win32-x64-msvc@2.0.0': resolution: {integrity: sha512-cJOgikIW2t3S+42TQZsv+DJriJt2m6lnUk+pUFu/fO93rrMvNrx8gfMxR8W5zDTreBX0cfMx2pw6EVmyi/YzsQ==} cpu: [x64] @@ -20931,6 +20883,11 @@ packages: cpu: [x64] os: [win32] + '@rspack/binding-win32-x64-msvc@2.2.3': + resolution: {integrity: sha512-qa5Wc34a+Uux5foZ1Z+9fPQceVRbgTunaIulHezVF/ZxvqKO4DkAC7tFl53shB0YRVBAPg8R78MGd8cByfoxLQ==} + cpu: [x64] + os: [win32] + '@rspack/binding@2.0.0': resolution: {integrity: sha512-WA2f9eQpejkvf5Vrnf6wNCn1m8RT1p08NjgOZpKhsCzr0uBjWeRvGduawlrFFHZh/jPnWZTVaVdQ08FEAWbwGw==} @@ -20940,6 +20897,9 @@ packages: '@rspack/binding@2.1.1': resolution: {integrity: sha512-6062hZP33fn1w51ClpQnum19GGXl/3eS754xrRYbQ7wwBNZk94HVwfSyiqcNCtY/pB1lsFjnaTKiW/Q+jv0axQ==} + '@rspack/binding@2.2.3': + resolution: {integrity: sha512-532+T5N6yIdukChiL85H4NFN2vn9oi8wlLa1ByPNtpNYriE9s24fUhn0RiK7w/xACqnNpYmXCqLYCvjOzyCy+w==} + '@rspack/core@2.0.0': resolution: {integrity: sha512-WD1mJM9LbZ7Z399Rbv9dE3BNEV0+3sE5OzDdzV8hOxUb3mX++ynK5n9kil8w60B6nGdcKeV9ly5aN4PgqiwWUg==} engines: {node: ^20.19.0 || >=22.12.0} @@ -20976,6 +20936,18 @@ packages: '@swc/helpers': optional: true + '@rspack/core@2.2.3': + resolution: {integrity: sha512-VHejw+PDd5B5v6VduFyjLSTIFaHBMNGPMKw+Y0zjkMqjYhDD1hjLOBC5frRKjTWcfYdk+Q73auWPp9k/H9PfIQ==} + engines: {node: ^20.19.0 || >=22.12.0} + peerDependencies: + '@module-federation/runtime-tools': ^0.24.1 || ^2.0.0 + '@swc/helpers': ^0.5.23 + peerDependenciesMeta: + '@module-federation/runtime-tools': + optional: true + '@swc/helpers': + optional: true + '@rspack/lite-tapable@1.1.0': resolution: {integrity: sha512-E2B0JhYFmVAwdDiG14+DW0Di4Ze4Jg10Pc4/lILUrd5DRCaklduz2OvJ5HYQ6G+hd+WTzqQb3QnDNfK4yvAFYw==} @@ -23149,11 +23121,15 @@ packages: base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - baseline-browser-mapping@2.11.22: - resolution: {integrity: sha512-pWc4w51fBFd7mav43/zKRC+RI6f4yfzQoVlfvE8dECePyfkn1bzLp01Fj0QACcyCZyFhiEMyD2qScfKRWgWibA==} + baseline-browser-mapping@2.11.23: + resolution: {integrity: sha512-le521dGVfxM7yRX0EikCoSz+rOK+hHzdDt/E7mG1jOJB/6WAAUuwVroLwaB7ApaUsz5Q0kFlDXLSA9MheUIfRQ==} engines: {node: '>=6.0.0'} hasBin: true + baseline-browser-mapping@2.9.8: + resolution: {integrity: sha512-Y1fOuNDowLfgKOypdc9SPABfoWXuZHBOyCS4cD52IeZBhr4Md6CLLs6atcxVrzRmQ06E7hSlm5bHHApPKR/byA==} + hasBin: true + batch@0.6.1: resolution: {integrity: sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==} @@ -26513,8 +26489,8 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - nanoid@3.3.16: - resolution: {integrity: sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==} + nanoid@3.3.18: + resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -27923,10 +27899,6 @@ packages: resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==} engines: {node: '>=8'} - sharp@0.34.4: - resolution: {integrity: sha512-FUH39xp3SBPnxWvd5iib1X8XY7J0K0X7d93sie9CJg2PO8/7gmg89Nve6OjItK53/MlAushNNxteBYfM6DEuoA==} - engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - sharp@0.34.5: resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -32213,11 +32185,7 @@ snapshots: '@img/colour@1.0.0': {} - '@img/colour@1.1.0': {} - - '@img/sharp-darwin-arm64@0.34.4': - optionalDependencies: - '@img/sharp-libvips-darwin-arm64': 1.2.3 + '@img/colour@1.1.0': optional: true '@img/sharp-darwin-arm64@0.34.5': @@ -32230,11 +32198,6 @@ snapshots: '@img/sharp-libvips-darwin-arm64': 1.3.3 optional: true - '@img/sharp-darwin-x64@0.34.4': - optionalDependencies: - '@img/sharp-libvips-darwin-x64': 1.2.3 - optional: true - '@img/sharp-darwin-x64@0.34.5': optionalDependencies: '@img/sharp-libvips-darwin-x64': 1.2.4 @@ -32250,45 +32213,30 @@ snapshots: '@img/sharp-wasm32': 0.35.4 optional: true - '@img/sharp-libvips-darwin-arm64@1.2.3': - optional: true - '@img/sharp-libvips-darwin-arm64@1.2.4': optional: true '@img/sharp-libvips-darwin-arm64@1.3.3': optional: true - '@img/sharp-libvips-darwin-x64@1.2.3': - optional: true - '@img/sharp-libvips-darwin-x64@1.2.4': optional: true '@img/sharp-libvips-darwin-x64@1.3.3': optional: true - '@img/sharp-libvips-linux-arm64@1.2.3': - optional: true - '@img/sharp-libvips-linux-arm64@1.2.4': optional: true '@img/sharp-libvips-linux-arm64@1.3.3': optional: true - '@img/sharp-libvips-linux-arm@1.2.3': - optional: true - '@img/sharp-libvips-linux-arm@1.2.4': optional: true '@img/sharp-libvips-linux-arm@1.3.3': optional: true - '@img/sharp-libvips-linux-ppc64@1.2.3': - optional: true - '@img/sharp-libvips-linux-ppc64@1.2.4': optional: true @@ -32301,47 +32249,30 @@ snapshots: '@img/sharp-libvips-linux-riscv64@1.3.3': optional: true - '@img/sharp-libvips-linux-s390x@1.2.3': - optional: true - '@img/sharp-libvips-linux-s390x@1.2.4': optional: true '@img/sharp-libvips-linux-s390x@1.3.3': optional: true - '@img/sharp-libvips-linux-x64@1.2.3': - optional: true - '@img/sharp-libvips-linux-x64@1.2.4': optional: true '@img/sharp-libvips-linux-x64@1.3.3': optional: true - '@img/sharp-libvips-linuxmusl-arm64@1.2.3': - optional: true - '@img/sharp-libvips-linuxmusl-arm64@1.2.4': optional: true '@img/sharp-libvips-linuxmusl-arm64@1.3.3': optional: true - '@img/sharp-libvips-linuxmusl-x64@1.2.3': - optional: true - '@img/sharp-libvips-linuxmusl-x64@1.2.4': optional: true '@img/sharp-libvips-linuxmusl-x64@1.3.3': optional: true - '@img/sharp-linux-arm64@0.34.4': - optionalDependencies: - '@img/sharp-libvips-linux-arm64': 1.2.3 - optional: true - '@img/sharp-linux-arm64@0.34.5': optionalDependencies: '@img/sharp-libvips-linux-arm64': 1.2.4 @@ -32352,11 +32283,6 @@ snapshots: '@img/sharp-libvips-linux-arm64': 1.3.3 optional: true - '@img/sharp-linux-arm@0.34.4': - optionalDependencies: - '@img/sharp-libvips-linux-arm': 1.2.3 - optional: true - '@img/sharp-linux-arm@0.34.5': optionalDependencies: '@img/sharp-libvips-linux-arm': 1.2.4 @@ -32367,11 +32293,6 @@ snapshots: '@img/sharp-libvips-linux-arm': 1.3.3 optional: true - '@img/sharp-linux-ppc64@0.34.4': - optionalDependencies: - '@img/sharp-libvips-linux-ppc64': 1.2.3 - optional: true - '@img/sharp-linux-ppc64@0.34.5': optionalDependencies: '@img/sharp-libvips-linux-ppc64': 1.2.4 @@ -32392,11 +32313,6 @@ snapshots: '@img/sharp-libvips-linux-riscv64': 1.3.3 optional: true - '@img/sharp-linux-s390x@0.34.4': - optionalDependencies: - '@img/sharp-libvips-linux-s390x': 1.2.3 - optional: true - '@img/sharp-linux-s390x@0.34.5': optionalDependencies: '@img/sharp-libvips-linux-s390x': 1.2.4 @@ -32407,11 +32323,6 @@ snapshots: '@img/sharp-libvips-linux-s390x': 1.3.3 optional: true - '@img/sharp-linux-x64@0.34.4': - optionalDependencies: - '@img/sharp-libvips-linux-x64': 1.2.3 - optional: true - '@img/sharp-linux-x64@0.34.5': optionalDependencies: '@img/sharp-libvips-linux-x64': 1.2.4 @@ -32422,11 +32333,6 @@ snapshots: '@img/sharp-libvips-linux-x64': 1.3.3 optional: true - '@img/sharp-linuxmusl-arm64@0.34.4': - optionalDependencies: - '@img/sharp-libvips-linuxmusl-arm64': 1.2.3 - optional: true - '@img/sharp-linuxmusl-arm64@0.34.5': optionalDependencies: '@img/sharp-libvips-linuxmusl-arm64': 1.2.4 @@ -32437,11 +32343,6 @@ snapshots: '@img/sharp-libvips-linuxmusl-arm64': 1.3.3 optional: true - '@img/sharp-linuxmusl-x64@0.34.4': - optionalDependencies: - '@img/sharp-libvips-linuxmusl-x64': 1.2.3 - optional: true - '@img/sharp-linuxmusl-x64@0.34.5': optionalDependencies: '@img/sharp-libvips-linuxmusl-x64': 1.2.4 @@ -32452,11 +32353,6 @@ snapshots: '@img/sharp-libvips-linuxmusl-x64': 1.3.3 optional: true - '@img/sharp-wasm32@0.34.4': - dependencies: - '@emnapi/runtime': 1.11.1 - optional: true - '@img/sharp-wasm32@0.34.5': dependencies: '@emnapi/runtime': 1.11.3 @@ -32472,27 +32368,18 @@ snapshots: '@img/sharp-wasm32': 0.35.4 optional: true - '@img/sharp-win32-arm64@0.34.4': - optional: true - '@img/sharp-win32-arm64@0.34.5': optional: true '@img/sharp-win32-arm64@0.35.4': optional: true - '@img/sharp-win32-ia32@0.34.4': - optional: true - '@img/sharp-win32-ia32@0.34.5': optional: true '@img/sharp-win32-ia32@0.35.4': optional: true - '@img/sharp-win32-x64@0.34.4': - optional: true - '@img/sharp-win32-x64@0.34.5': optional: true @@ -32950,8 +32837,8 @@ snapshots: '@napi-rs/wasm-runtime@0.2.12': dependencies: - '@emnapi/core': 1.11.1 - '@emnapi/runtime': 1.11.1 + '@emnapi/core': 1.11.3 + '@emnapi/runtime': 1.11.3 '@tybys/wasm-util': 0.10.2 optional: true @@ -32968,10 +32855,10 @@ snapshots: '@tybys/wasm-util': 0.10.2 optional: true - '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)': + '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)': dependencies: '@emnapi/core': 1.11.1 - '@emnapi/runtime': 1.11.1 + '@emnapi/runtime': 1.11.3 '@tybys/wasm-util': 0.10.2 optional: true @@ -32996,6 +32883,13 @@ snapshots: '@tybys/wasm-util': 0.10.3 optional: true + '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': + dependencies: + '@emnapi/core': 1.11.3 + '@emnapi/runtime': 1.11.3 + '@tybys/wasm-util': 0.10.3 + optional: true + '@neon-rs/load@0.0.4': {} '@netlify/api@14.0.7': @@ -33116,7 +33010,7 @@ snapshots: p-wait-for: 5.0.2 parse-imports: 2.2.1 path-key: 4.0.0 - semver: 7.8.2 + semver: 7.8.5 tar: 7.4.3 tmp-promise: 3.0.3 urlpattern-polyfill: 8.0.2 @@ -33150,7 +33044,7 @@ snapshots: jwt-decode: 4.0.0 lambda-local: 2.2.0 read-package-up: 11.0.0 - semver: 7.8.2 + semver: 7.8.5 source-map-support: 0.5.21 transitivePeerDependencies: - bare-abort-controller @@ -33325,7 +33219,7 @@ snapshots: precinct: 12.2.0(supports-color@10.2.2) require-package-name: 2.0.1 resolve: 2.0.0-next.5 - semver: 7.8.2 + semver: 7.8.5 tmp-promise: 3.0.3 toml: 3.0.0 unixify: 1.0.0 @@ -33383,11 +33277,11 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.19.0 - '@nx/devkit@23.2.0(nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)))': + '@nx/devkit@23.2.0(nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)))': dependencies: ejs: 5.0.1 minimatch: 10.2.5 - nx: 23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)) + nx: 23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)) semver: 7.8.5 tslib: 2.8.1 yargs-parser: 21.1.1 @@ -33500,9 +33394,9 @@ snapshots: '@oxc-minify/binding-openharmony-arm64@0.110.0': optional: true - '@oxc-minify/binding-wasm32-wasi@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)': + '@oxc-minify/binding-wasm32-wasi@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)': dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) transitivePeerDependencies: - '@emnapi/core' - '@emnapi/runtime' @@ -33569,9 +33463,9 @@ snapshots: '@oxc-resolver/binding-openharmony-arm64@11.19.1': optional: true - '@oxc-resolver/binding-wasm32-wasi@11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)': + '@oxc-resolver/binding-wasm32-wasi@11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)': dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) transitivePeerDependencies: - '@emnapi/core' - '@emnapi/runtime' @@ -33634,9 +33528,9 @@ snapshots: '@oxc-transform/binding-openharmony-arm64@0.110.0': optional: true - '@oxc-transform/binding-wasm32-wasi@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)': + '@oxc-transform/binding-wasm32-wasi@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)': dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) transitivePeerDependencies: - '@emnapi/core' - '@emnapi/runtime' @@ -34977,6 +34871,13 @@ snapshots: transitivePeerDependencies: - '@module-federation/runtime-tools' + '@rsbuild/core@2.2.5': + dependencies: + '@rspack/core': 2.2.3(@swc/helpers@0.5.23) + '@swc/helpers': 0.5.23 + transitivePeerDependencies: + - '@module-federation/runtime-tools' + '@rsbuild/plugin-babel@1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2)': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) @@ -34990,18 +34891,18 @@ snapshots: transitivePeerDependencies: - supports-color - '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.0.14)(@rspack/core@2.1.1(@swc/helpers@0.5.23))': + '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.0.14)(@rspack/core@2.2.3(@swc/helpers@0.5.23))': dependencies: - '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(react-refresh@0.18.0) + '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(react-refresh@0.18.0) react-refresh: 0.18.0 optionalDependencies: '@rsbuild/core': 2.0.14 transitivePeerDependencies: - '@rspack/core' - '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23))': + '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))': dependencies: - '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(react-refresh@0.18.0) + '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(react-refresh@0.18.0) react-refresh: 0.18.0 optionalDependencies: '@rsbuild/core': 2.1.1 @@ -35020,9 +34921,9 @@ snapshots: - solid-js - supports-color - '@rsbuild/plugin-tailwindcss@2.0.3(@rsbuild/core@2.0.14)(@rspack/core@2.1.1(@swc/helpers@0.5.23))(webpack@5.110.3)': + '@rsbuild/plugin-tailwindcss@2.0.3(@rsbuild/core@2.0.14)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(webpack@5.110.3)': dependencies: - '@tailwindcss/webpack': 4.3.1(@rspack/core@2.1.1(@swc/helpers@0.5.23))(webpack@5.110.3) + '@tailwindcss/webpack': 4.3.1(@rspack/core@2.2.3(@swc/helpers@0.5.23))(webpack@5.110.3) optionalDependencies: '@rsbuild/core': 2.0.14 transitivePeerDependencies: @@ -35040,9 +34941,9 @@ snapshots: - '@babel/core' - supports-color - '@rsbuild/plugin-vue@1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@rsbuild/plugin-vue@1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: - rspack-vue-loader: 17.5.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) + rspack-vue-loader: 17.5.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) optionalDependencies: '@rsbuild/core': 2.1.1 transitivePeerDependencies: @@ -35059,6 +34960,9 @@ snapshots: '@rspack/binding-darwin-arm64@2.1.1': optional: true + '@rspack/binding-darwin-arm64@2.2.3': + optional: true + '@rspack/binding-darwin-x64@2.0.0': optional: true @@ -35068,6 +34972,9 @@ snapshots: '@rspack/binding-darwin-x64@2.1.1': optional: true + '@rspack/binding-darwin-x64@2.2.3': + optional: true + '@rspack/binding-linux-arm64-gnu@2.0.0': optional: true @@ -35077,6 +34984,9 @@ snapshots: '@rspack/binding-linux-arm64-gnu@2.1.1': optional: true + '@rspack/binding-linux-arm64-gnu@2.2.3': + optional: true + '@rspack/binding-linux-arm64-musl@2.0.0': optional: true @@ -35086,12 +34996,27 @@ snapshots: '@rspack/binding-linux-arm64-musl@2.1.1': optional: true + '@rspack/binding-linux-arm64-musl@2.2.3': + optional: true + + '@rspack/binding-linux-ppc64-gnu@2.2.3': + optional: true + '@rspack/binding-linux-riscv64-gnu@2.1.1': optional: true + '@rspack/binding-linux-riscv64-gnu@2.2.3': + optional: true + '@rspack/binding-linux-riscv64-musl@2.1.1': optional: true + '@rspack/binding-linux-riscv64-musl@2.2.3': + optional: true + + '@rspack/binding-linux-s390x-gnu@2.2.3': + optional: true + '@rspack/binding-linux-x64-gnu@2.0.0': optional: true @@ -35101,6 +35026,9 @@ snapshots: '@rspack/binding-linux-x64-gnu@2.1.1': optional: true + '@rspack/binding-linux-x64-gnu@2.2.3': + optional: true + '@rspack/binding-linux-x64-musl@2.0.0': optional: true @@ -35110,6 +35038,9 @@ snapshots: '@rspack/binding-linux-x64-musl@2.1.1': optional: true + '@rspack/binding-linux-x64-musl@2.2.3': + optional: true + '@rspack/binding-wasm32-wasi@2.0.0': dependencies: '@emnapi/core': 1.10.0 @@ -35131,6 +35062,13 @@ snapshots: '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) optional: true + '@rspack/binding-wasm32-wasi@2.2.3': + dependencies: + '@emnapi/core': 1.11.3 + '@emnapi/runtime': 1.11.3 + '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) + optional: true + '@rspack/binding-win32-arm64-msvc@2.0.0': optional: true @@ -35140,6 +35078,9 @@ snapshots: '@rspack/binding-win32-arm64-msvc@2.1.1': optional: true + '@rspack/binding-win32-arm64-msvc@2.2.3': + optional: true + '@rspack/binding-win32-ia32-msvc@2.0.0': optional: true @@ -35149,6 +35090,9 @@ snapshots: '@rspack/binding-win32-ia32-msvc@2.1.1': optional: true + '@rspack/binding-win32-ia32-msvc@2.2.3': + optional: true + '@rspack/binding-win32-x64-msvc@2.0.0': optional: true @@ -35158,6 +35102,9 @@ snapshots: '@rspack/binding-win32-x64-msvc@2.1.1': optional: true + '@rspack/binding-win32-x64-msvc@2.2.3': + optional: true + '@rspack/binding@2.0.0': optionalDependencies: '@rspack/binding-darwin-arm64': 2.0.0 @@ -35199,6 +35146,23 @@ snapshots: '@rspack/binding-win32-ia32-msvc': 2.1.1 '@rspack/binding-win32-x64-msvc': 2.1.1 + '@rspack/binding@2.2.3': + optionalDependencies: + '@rspack/binding-darwin-arm64': 2.2.3 + '@rspack/binding-darwin-x64': 2.2.3 + '@rspack/binding-linux-arm64-gnu': 2.2.3 + '@rspack/binding-linux-arm64-musl': 2.2.3 + '@rspack/binding-linux-ppc64-gnu': 2.2.3 + '@rspack/binding-linux-riscv64-gnu': 2.2.3 + '@rspack/binding-linux-riscv64-musl': 2.2.3 + '@rspack/binding-linux-s390x-gnu': 2.2.3 + '@rspack/binding-linux-x64-gnu': 2.2.3 + '@rspack/binding-linux-x64-musl': 2.2.3 + '@rspack/binding-wasm32-wasi': 2.2.3 + '@rspack/binding-win32-arm64-msvc': 2.2.3 + '@rspack/binding-win32-ia32-msvc': 2.2.3 + '@rspack/binding-win32-x64-msvc': 2.2.3 + '@rspack/core@2.0.0(@swc/helpers@0.5.23)': dependencies: '@rspack/binding': 2.0.0 @@ -35217,13 +35181,19 @@ snapshots: optionalDependencies: '@swc/helpers': 0.5.23 + '@rspack/core@2.2.3(@swc/helpers@0.5.23)': + dependencies: + '@rspack/binding': 2.2.3 + optionalDependencies: + '@swc/helpers': 0.5.23 + '@rspack/lite-tapable@1.1.0': {} - '@rspack/plugin-react-refresh@2.0.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(react-refresh@0.18.0)': + '@rspack/plugin-react-refresh@2.0.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(react-refresh@0.18.0)': dependencies: react-refresh: 0.18.0 optionalDependencies: - '@rspack/core': 2.1.1(@swc/helpers@0.5.23) + '@rspack/core': 2.2.3(@swc/helpers@0.5.23) '@rushstack/node-core-library@5.7.0(@types/node@25.0.9)': dependencies: @@ -35619,14 +35589,14 @@ snapshots: '@swc/core': 1.15.33(@swc/helpers@0.5.23) '@swc/types': 0.1.26 - '@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0)': + '@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0)': dependencies: '@swc-node/core': 1.14.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26) '@swc-node/sourcemap-support': 0.6.1 '@swc/core': 1.15.33(@swc/helpers@0.5.23) colorette: 2.0.20 debug: 4.4.3(supports-color@7.2.0) - oxc-resolver: 11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + oxc-resolver: 11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) pirates: 4.0.7 tslib: 2.8.1 typescript: '@typescript/typescript6@6.0.2' @@ -35847,14 +35817,14 @@ snapshots: tailwindcss: 4.2.2 vite: 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.9.0) - '@tailwindcss/webpack@4.3.1(@rspack/core@2.1.1(@swc/helpers@0.5.23))(webpack@5.110.3)': + '@tailwindcss/webpack@4.3.1(@rspack/core@2.2.3(@swc/helpers@0.5.23))(webpack@5.110.3)': dependencies: '@alloc/quick-lru': 5.2.0 '@tailwindcss/node': 4.3.1 '@tailwindcss/oxide': 4.3.1 tailwindcss: 4.3.1 optionalDependencies: - '@rspack/core': 2.1.1(@swc/helpers@0.5.23) + '@rspack/core': 2.2.3(@swc/helpers@0.5.23) webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) '@tanstack/devtools-client@0.0.4': @@ -37549,7 +37519,7 @@ snapshots: '@vue/shared': 3.5.25 estree-walker: 2.0.2 magic-string: 0.30.21 - postcss: 8.5.23 + postcss: 8.5.15 source-map-js: 1.2.1 '@vue/compiler-ssr@3.5.25': @@ -38220,7 +38190,9 @@ snapshots: base64-js@1.5.1: {} - baseline-browser-mapping@2.11.22: {} + baseline-browser-mapping@2.11.23: {} + + baseline-browser-mapping@2.9.8: {} batch@0.6.1: {} @@ -38364,7 +38336,7 @@ snapshots: browserslist@4.28.1: dependencies: - baseline-browser-mapping: 2.11.22 + baseline-browser-mapping: 2.9.8 caniuse-lite: 1.0.30001760 electron-to-chromium: 1.5.267 node-releases: 2.0.27 @@ -39135,11 +39107,11 @@ snapshots: dependencies: node-source-walk: 7.0.1 - detective-postcss@7.0.1(postcss@8.5.8): + detective-postcss@7.0.1(postcss@8.5.15): dependencies: is-url: 1.2.4 - postcss: 8.5.8 - postcss-values-parser: 6.0.2(postcss@8.5.8) + postcss: 8.5.15 + postcss-values-parser: 6.0.2(postcss@8.5.15) detective-sass@6.0.1: dependencies: @@ -39282,7 +39254,7 @@ snapshots: '@one-ini/wasm': 0.1.1 commander: 10.0.1 minimatch: 9.0.1 - semver: 7.8.2 + semver: 7.8.5 ee-first@1.1.1: {} @@ -39624,12 +39596,12 @@ snapshots: eslint-compat-utils@0.5.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)): dependencies: eslint: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) - semver: 7.8.2 + semver: 7.8.5 eslint-compat-utils@0.5.1(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0)): dependencies: eslint: 9.22.0(jiti@2.7.0)(supports-color@7.2.0) - semver: 7.8.2 + semver: 7.8.5 eslint-import-context@0.1.9(unrs-resolver@1.11.1): dependencies: @@ -40942,7 +40914,7 @@ snapshots: listhen: 1.9.0 ofetch: 1.5.1 pathe: 2.0.3 - sharp: 0.34.4 + sharp: 0.34.5 svgo: 4.0.0 ufo: 1.6.4 unstorage: 1.17.4(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) @@ -41341,7 +41313,7 @@ snapshots: lodash.isstring: 4.0.1 lodash.once: 4.1.1 ms: 2.1.3 - semver: 7.8.2 + semver: 7.8.5 junk@4.0.1: {} @@ -41979,7 +41951,7 @@ snapshots: nanoid@3.3.12: {} - nanoid@3.3.16: {} + nanoid@3.3.18: {} nanostores@1.3.0: {} @@ -42001,7 +41973,7 @@ snapshots: dependencies: '@next/env': 16.3.4 '@swc/helpers': 0.5.23 - baseline-browser-mapping: 2.11.22 + baseline-browser-mapping: 2.11.23 caniuse-lite: 1.0.30001760 postcss: 8.5.23 react: 19.2.3 @@ -42029,7 +42001,7 @@ snapshots: nf3@0.3.6: {} - nitro@3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0)): + nitro@3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0)): dependencies: consola: 3.4.2 crossws: 0.4.3(srvx@0.10.1) @@ -42039,8 +42011,8 @@ snapshots: nf3: 0.3.6 ofetch: 2.0.0-alpha.3 ohash: 2.0.11 - oxc-minify: 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) - oxc-transform: 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + oxc-minify: 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) + oxc-transform: 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) srvx: 0.10.1 undici: 7.24.4 unenv: 2.0.0-rc.24 @@ -42188,7 +42160,7 @@ snapshots: - sqlite3 - uploadthing - nitropack@2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.1.1(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@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.9.0))(webpack@5.110.3): + nitropack@2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@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.9.0))(webpack@5.110.3): dependencies: '@cloudflare/kv-asset-handler': 0.4.2 '@rollup/plugin-alias': 6.0.0(rollup@4.63.1) @@ -42253,7 +42225,7 @@ snapshots: uncrypto: 0.1.3 unctx: 2.5.0 unenv: 2.0.0-rc.24 - unimport: 6.4.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) + unimport: 6.4.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) unplugin-utils: 0.3.1 unstorage: 1.17.5(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) untyped: 2.0.0 @@ -42358,7 +42330,7 @@ snapshots: normalize-package-data@6.0.2: dependencies: hosted-git-info: 7.0.2 - semver: 7.8.2 + semver: 7.8.5 validate-npm-package-license: 3.0.4 normalize-path@2.1.1: @@ -42381,7 +42353,7 @@ snapshots: nwsapi@2.2.16: {} - nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)): + nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)): dependencies: '@clack/core': 1.4.3 '@clack/prompts': 1.7.0 @@ -42518,7 +42490,7 @@ snapshots: '@nx/nx-linux-x64-musl': 23.2.0 '@nx/nx-win32-arm64-msvc': 23.2.0 '@nx/nx-win32-x64-msvc': 23.2.0 - '@swc-node/register': 1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0) + '@swc-node/register': 1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0) '@swc/core': 1.15.33(@swc/helpers@0.5.23) nypm@0.6.0: @@ -42640,7 +42612,7 @@ snapshots: outvariant@1.4.3: {} - oxc-minify@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1): + oxc-minify@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3): optionalDependencies: '@oxc-minify/binding-android-arm-eabi': 0.110.0 '@oxc-minify/binding-android-arm64': 0.110.0 @@ -42658,7 +42630,7 @@ snapshots: '@oxc-minify/binding-linux-x64-gnu': 0.110.0 '@oxc-minify/binding-linux-x64-musl': 0.110.0 '@oxc-minify/binding-openharmony-arm64': 0.110.0 - '@oxc-minify/binding-wasm32-wasi': 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + '@oxc-minify/binding-wasm32-wasi': 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) '@oxc-minify/binding-win32-arm64-msvc': 0.110.0 '@oxc-minify/binding-win32-ia32-msvc': 0.110.0 '@oxc-minify/binding-win32-x64-msvc': 0.110.0 @@ -42666,7 +42638,7 @@ snapshots: - '@emnapi/core' - '@emnapi/runtime' - oxc-resolver@11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1): + oxc-resolver@11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3): optionalDependencies: '@oxc-resolver/binding-android-arm-eabi': 11.19.1 '@oxc-resolver/binding-android-arm64': 11.19.1 @@ -42684,7 +42656,7 @@ snapshots: '@oxc-resolver/binding-linux-x64-gnu': 11.19.1 '@oxc-resolver/binding-linux-x64-musl': 11.19.1 '@oxc-resolver/binding-openharmony-arm64': 11.19.1 - '@oxc-resolver/binding-wasm32-wasi': 11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + '@oxc-resolver/binding-wasm32-wasi': 11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) '@oxc-resolver/binding-win32-arm64-msvc': 11.19.1 '@oxc-resolver/binding-win32-ia32-msvc': 11.19.1 '@oxc-resolver/binding-win32-x64-msvc': 11.19.1 @@ -42692,7 +42664,7 @@ snapshots: - '@emnapi/core' - '@emnapi/runtime' - oxc-transform@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1): + oxc-transform@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3): optionalDependencies: '@oxc-transform/binding-android-arm-eabi': 0.110.0 '@oxc-transform/binding-android-arm64': 0.110.0 @@ -42710,7 +42682,7 @@ snapshots: '@oxc-transform/binding-linux-x64-gnu': 0.110.0 '@oxc-transform/binding-linux-x64-musl': 0.110.0 '@oxc-transform/binding-openharmony-arm64': 0.110.0 - '@oxc-transform/binding-wasm32-wasi': 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + '@oxc-transform/binding-wasm32-wasi': 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) '@oxc-transform/binding-win32-arm64-msvc': 0.110.0 '@oxc-transform/binding-win32-ia32-msvc': 0.110.0 '@oxc-transform/binding-win32-x64-msvc': 0.110.0 @@ -43002,11 +42974,11 @@ snapshots: postcss-value-parser@4.2.0: {} - postcss-values-parser@6.0.2(postcss@8.5.8): + postcss-values-parser@6.0.2(postcss@8.5.15): dependencies: color-name: 1.1.4 is-url-superb: 4.0.0 - postcss: 8.5.8 + postcss: 8.5.15 quote-unquote: 1.0.0 postcss@8.5.15: @@ -43017,7 +42989,7 @@ snapshots: postcss@8.5.23: dependencies: - nanoid: 3.3.16 + nanoid: 3.3.18 picocolors: 1.1.1 source-map-js: 1.2.1 @@ -43066,7 +43038,7 @@ snapshots: detective-amd: 6.0.1 detective-cjs: 6.0.1 detective-es6: 5.0.1 - detective-postcss: 7.0.1(postcss@8.5.8) + detective-postcss: 7.0.1(postcss@8.5.15) detective-sass: 6.0.1 detective-scss: 5.0.1 detective-stylus: 5.0.1 @@ -43074,7 +43046,7 @@ snapshots: detective-vue2: 2.2.0(supports-color@10.2.2)(typescript@5.9.3) module-definition: 6.0.1 node-source-walk: 7.0.1 - postcss: 8.5.8 + postcss: 8.5.15 typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -43685,12 +43657,12 @@ snapshots: rrweb-cssom@0.8.0: {} - rspack-vue-loader@17.5.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)): + rspack-vue-loader@17.5.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)): dependencies: '@rspack/lite-tapable': 1.1.0 chalk: 4.1.2 optionalDependencies: - '@rspack/core': 2.1.1(@swc/helpers@0.5.23) + '@rspack/core': 2.2.3(@swc/helpers@0.5.23) '@vue/compiler-sfc': 3.5.25 vue: 3.5.25(@typescript/typescript6@6.0.2) @@ -43904,38 +43876,9 @@ snapshots: dependencies: kind-of: 6.0.3 - sharp@0.34.4: - dependencies: - '@img/colour': 1.0.0 - detect-libc: 2.1.2 - semver: 7.8.2 - optionalDependencies: - '@img/sharp-darwin-arm64': 0.34.4 - '@img/sharp-darwin-x64': 0.34.4 - '@img/sharp-libvips-darwin-arm64': 1.2.3 - '@img/sharp-libvips-darwin-x64': 1.2.3 - '@img/sharp-libvips-linux-arm': 1.2.3 - '@img/sharp-libvips-linux-arm64': 1.2.3 - '@img/sharp-libvips-linux-ppc64': 1.2.3 - '@img/sharp-libvips-linux-s390x': 1.2.3 - '@img/sharp-libvips-linux-x64': 1.2.3 - '@img/sharp-libvips-linuxmusl-arm64': 1.2.3 - '@img/sharp-libvips-linuxmusl-x64': 1.2.3 - '@img/sharp-linux-arm': 0.34.4 - '@img/sharp-linux-arm64': 0.34.4 - '@img/sharp-linux-ppc64': 0.34.4 - '@img/sharp-linux-s390x': 0.34.4 - '@img/sharp-linux-x64': 0.34.4 - '@img/sharp-linuxmusl-arm64': 0.34.4 - '@img/sharp-linuxmusl-x64': 0.34.4 - '@img/sharp-wasm32': 0.34.4 - '@img/sharp-win32-arm64': 0.34.4 - '@img/sharp-win32-ia32': 0.34.4 - '@img/sharp-win32-x64': 0.34.4 - sharp@0.34.5: dependencies: - '@img/colour': 1.1.0 + '@img/colour': 1.0.0 detect-libc: 2.1.2 semver: 7.8.5 optionalDependencies: @@ -44757,7 +44700,7 @@ snapshots: unicorn-magic@0.4.0: {} - unimport@6.4.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3): + unimport@6.4.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3): dependencies: acorn: 8.18.0 escape-string-regexp: 5.0.0 @@ -44771,7 +44714,7 @@ snapshots: scule: 1.3.0 strip-literal: 4.0.0 tinyglobby: 0.2.17 - unplugin: 3.3.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) + unplugin: 3.3.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) unplugin-utils: 0.3.2 optionalDependencies: rolldown: 1.0.2 @@ -44819,13 +44762,13 @@ snapshots: picomatch: 4.0.7 webpack-virtual-modules: 0.6.2 - unplugin@3.3.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3): + unplugin@3.3.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3): dependencies: '@jridgewell/remapping': 2.3.5 picomatch: 4.0.7 webpack-virtual-modules: 0.6.2 optionalDependencies: - '@rspack/core': 2.1.1(@swc/helpers@0.5.23) + '@rspack/core': 2.2.3(@swc/helpers@0.5.23) esbuild: 0.28.2 rolldown: 1.0.2 rollup: 4.63.1 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 3cff53a1b8..aad1e76489 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -38,7 +38,7 @@ catalog: '@babel/types': ^7.29.8 '@arethetypeswrong/cli': ^0.18.4 '@eslint-react/eslint-plugin': ^1.26.2 - '@rsbuild/core': ^2.1.0 + '@rsbuild/core': ^2.2.5 '@tanstack/vite-config': 0.5.2 '@testing-library/jest-dom': ^6.6.3 '@testing-library/react': ^16.2.0 From 702d9efe8b1c9e4c6f10b0f4190e204c60ec28fb Mon Sep 17 00:00:00 2001 From: Flo Date: Mon, 14 Sep 2026 10:54:22 +0200 Subject: [PATCH 028/175] fix(e2e): serialize Playwright runners per Nx agent (#8356) fix(e2e): adopt upstream Playwright cache validation --- nx.json | 15 +- pnpm-lock.yaml | 560 ++++++++++++++++---------------- pnpm-workspace.yaml | 2 +- scripts/nx/playwright-plugin.ts | 3 + 4 files changed, 290 insertions(+), 290 deletions(-) diff --git a/nx.json b/nx.json index dc9073417a..26bc04d6ee 100644 --- a/nx.json +++ b/nx.json @@ -67,22 +67,26 @@ "{projectRoot}/dist", "{projectRoot}/port-*.txt", "{projectRoot}/test-results" - ] + ], + "parallelism": false }, "test:e2e:nitro": { "cache": true, "dependsOn": ["^build"], - "inputs": ["default", "^production"] + "inputs": ["default", "^production"], + "parallelism": false }, "test:e2e:basepath": { "cache": true, "dependsOn": ["^build"], - "inputs": ["default", "^production"] + "inputs": ["default", "^production"], + "parallelism": false }, "test:e2e:preview": { "cache": true, "dependsOn": ["^build"], - "inputs": ["default", "^production"] + "inputs": ["default", "^production"], + "parallelism": false }, "test:types": { "cache": true, @@ -136,6 +140,9 @@ "cache": true, "dependsOn": ["build"], "inputs": ["buildProduction", "dependentTaskOutputs"] + }, + "test:e2e*": { + "parallelism": false } }, "plugins": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5a381646a1..1f7b082882 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -93,7 +93,7 @@ overrides: eslint: ^9.22.0 vite: ^8.0.14 '@types/node': 25.0.9 - '@playwright/test': ^1.61.0 + '@playwright/test': ^1.63.0 '@tanstack/query-core': ^5.102.0 '@tanstack/react-query': ^5.102.0 '@tanstack/solid-query': ^5.102.0 @@ -152,8 +152,8 @@ importers: specifier: 23.2.0 version: 23.2.0(nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23))) '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@swc-node/register': specifier: ^1.11.1 version: 1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0) @@ -638,8 +638,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -681,8 +681,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -724,8 +724,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -770,8 +770,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -822,8 +822,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -871,8 +871,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -926,8 +926,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -972,8 +972,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1027,8 +1027,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1079,8 +1079,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1113,8 +1113,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1159,8 +1159,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1199,8 +1199,8 @@ importers: specifier: ^2.4.0 version: 2.4.0(babel-plugin-macros@3.1.0) '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1242,8 +1242,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1276,8 +1276,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1313,8 +1313,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1356,8 +1356,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1390,8 +1390,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1421,8 +1421,8 @@ importers: specifier: ^7.29.0 version: 7.29.0(supports-color@10.2.2) '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rolldown/plugin-babel': specifier: ^0.2.0 version: 0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)) @@ -1464,8 +1464,8 @@ importers: version: 0.5.1 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -1519,8 +1519,8 @@ importers: version: 0.5.1 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -1589,8 +1589,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1641,8 +1641,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1690,8 +1690,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1748,8 +1748,8 @@ importers: version: 3.6.0 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -1836,8 +1836,8 @@ importers: version: 3.6.0 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -1897,8 +1897,8 @@ importers: specifier: ^1.29.0 version: 1.29.1(vite@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.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -1970,8 +1970,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -2077,8 +2077,8 @@ importers: version: 3.6.0 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -2126,8 +2126,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2175,8 +2175,8 @@ importers: version: 0.11.15 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -2227,8 +2227,8 @@ importers: specifier: ^1.29.0 version: 1.29.1(vite@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.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:* version: link:../../e2e-utils @@ -2291,8 +2291,8 @@ importers: version: 0.5.1 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -2355,8 +2355,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -2465,8 +2465,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-core': specifier: workspace:* version: link:../../../packages/router-core @@ -2520,8 +2520,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2618,8 +2618,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -2682,8 +2682,8 @@ importers: specifier: ^2.4.0 version: 2.4.0(babel-plugin-macros@3.1.0) '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -2734,8 +2734,8 @@ importers: version: 3.3.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -2786,8 +2786,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2832,8 +2832,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2884,8 +2884,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -2933,8 +2933,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:* version: link:../../e2e-utils @@ -2979,8 +2979,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -3025,8 +3025,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -3086,8 +3086,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3147,8 +3147,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3193,8 +3193,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -3248,8 +3248,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -3434,8 +3434,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -3501,8 +3501,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -3574,8 +3574,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -3632,8 +3632,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -3733,8 +3733,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3779,8 +3779,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3831,8 +3831,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:* version: link:../../e2e-utils @@ -3880,8 +3880,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3926,8 +3926,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3987,8 +3987,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -4054,8 +4054,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -4106,8 +4106,8 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4140,8 +4140,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4174,8 +4174,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4214,8 +4214,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4257,8 +4257,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4294,8 +4294,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4337,8 +4337,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4383,8 +4383,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4426,8 +4426,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4469,8 +4469,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4506,8 +4506,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4540,8 +4540,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4571,8 +4571,8 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -4620,8 +4620,8 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -4684,8 +4684,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4727,8 +4727,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4767,8 +4767,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4819,8 +4819,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -4898,8 +4898,8 @@ importers: version: 3.6.0 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -4953,8 +4953,8 @@ importers: specifier: ^1.29.0 version: 1.29.1(vite@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.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -5017,8 +5017,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -5100,8 +5100,8 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5137,8 +5137,8 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:* version: link:../../e2e-utils @@ -5186,8 +5186,8 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -5299,8 +5299,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -5351,8 +5351,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -5504,8 +5504,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -5574,8 +5574,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -5626,8 +5626,8 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5700,8 +5700,8 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5752,8 +5752,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -5810,8 +5810,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -5871,8 +5871,8 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5914,8 +5914,8 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5960,8 +5960,8 @@ importers: specifier: ^9.36.0 version: 9.36.0 '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6024,8 +6024,8 @@ importers: specifier: ^9.36.0 version: 9.36.0 '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6085,8 +6085,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6131,8 +6131,8 @@ importers: version: 3.5.25(typescript@5.9.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6186,8 +6186,8 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6241,8 +6241,8 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6290,8 +6290,8 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6345,8 +6345,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6391,8 +6391,8 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6443,8 +6443,8 @@ importers: version: 3.5.25(typescript@7.0.2) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6474,8 +6474,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -6532,8 +6532,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -6602,8 +6602,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6654,8 +6654,8 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6703,8 +6703,8 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6758,8 +6758,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@rsbuild/core': specifier: ^2.1.0 version: 2.1.1 @@ -6843,8 +6843,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -6901,8 +6901,8 @@ importers: specifier: ^1.29.0 version: 1.29.1(vite@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.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -7011,8 +7011,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -7057,8 +7057,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:* version: link:../../e2e-utils @@ -7106,8 +7106,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -7179,8 +7179,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -7234,8 +7234,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -7399,8 +7399,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -7472,8 +7472,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -7567,8 +7567,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7619,8 +7619,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -7680,8 +7680,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -10026,8 +10026,8 @@ importers: version: 3.6.0 devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -10606,7 +10606,7 @@ importers: version: 9.0.1 next: specifier: 16.3.4 - version: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) + version: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) react: specifier: ^19.2.3 version: 19.2.3 @@ -10615,8 +10615,8 @@ importers: version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.61.0 - version: 1.61.1 + specifier: ^1.63.0 + version: 1.63.0 '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12974,7 +12974,7 @@ importers: dependencies: '@convex-dev/better-auth': specifier: ^0.9.7 - version: 0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -12989,7 +12989,7 @@ importers: version: link:../../../packages/solid-start better-auth: specifier: ^1.6.19 - version: 1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) clsx: specifier: ^2.1.1 version: 2.1.1 @@ -19350,9 +19350,9 @@ packages: engines: {node: '>=22.6.0'} hasBin: true - '@playwright/test@1.61.1': - resolution: {integrity: sha512-8nKv6+0RJSL9FE4jYOEGXnPeM/Hg12qZpmqzZjRh3qM0Y7c3z1mrOTfFLids72RDQYVh9WpLEfR5WdpNX4fkig==} - engines: {node: '>=18'} + '@playwright/test@1.63.0': + resolution: {integrity: sha512-oxMK4vllB9RK5NQ2l1pq1IfOf2AvnEuj/vYGDj0H2nMtmtZpKtCwt/l00GEO6xjGfpBNAvjovvYdCm50dRQkpQ==} + engines: {node: '>=20'} hasBin: true '@polka/url@1.0.0-next.28': @@ -24929,11 +24929,6 @@ packages: resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} engines: {node: '>=6 <7 || >=8'} - fsevents@2.3.2: - resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} - engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} - os: [darwin] - fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -26530,7 +26525,7 @@ packages: hasBin: true peerDependencies: '@opentelemetry/api': ^1.1.0 - '@playwright/test': ^1.61.0 + '@playwright/test': ^1.63.0 babel-plugin-react-compiler: '*' react: ^19.2.3 react-dom: ^19.2.3 @@ -27074,14 +27069,14 @@ packages: resolution: {integrity: sha512-emEcLuomt2j03vxD54giVB4SxTjnsqkU692xZOZXHDVoYyypEm+b3jpiTcc+Cf+myooc+/Ly0z01jqeNHVgJGw==} engines: {node: '>=16.0.0'} - playwright-core@1.61.1: - resolution: {integrity: sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==} - engines: {node: '>=18'} + playwright-core@1.63.0: + resolution: {integrity: sha512-rYCsBF/M5HjUch52bbtVONEFjv6Xu8sm8h72dNlR5bzIE1fvC/bxgspzkjSfU+MweEMmPM8KJebG6nnyxo5mCg==} + engines: {node: '>=20'} hasBin: true - playwright@1.61.1: - resolution: {integrity: sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==} - engines: {node: '>=18'} + playwright@1.63.0: + resolution: {integrity: sha512-+7ziBLidS4NaNCdt57SUDT+wYmmd5fmiQejUic/kb+YsYSCPyOOE9sebzMjNmQrsnNpDJqd4WHvV/8lfKfUDUg==} + engines: {node: '>=20'} hasBin: true possible-typed-array-names@1.1.0: @@ -30880,9 +30875,9 @@ snapshots: '@colors/colors@1.6.0': {} - '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: - better-auth: 1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) + better-auth: 1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) common-tags: 1.8.2 convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) convex-helpers: 0.1.104(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react@19.2.3)(zod@3.25.76) @@ -33732,9 +33727,9 @@ snapshots: pprof-to-md: 0.2.0 react-pprof: 1.4.0 - '@playwright/test@1.61.1': + '@playwright/test@1.63.0': dependencies: - playwright: 1.61.1 + playwright: 1.63.0 '@polka/url@1.0.0-next.28': {} @@ -38205,7 +38200,7 @@ snapshots: jsonpointer: 5.0.1 leven: 3.1.0 - better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)): + better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)): dependencies: '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) '@better-auth/drizzle-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2) @@ -38228,7 +38223,7 @@ snapshots: '@prisma/client': 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) '@tanstack/solid-start': link:packages/solid-start mysql2: 3.15.3 - next: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) + next: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) prisma: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) react: 19.2.3 react-dom: 19.2.3(react@19.2.3) @@ -40383,9 +40378,6 @@ snapshots: jsonfile: 4.0.0 universalify: 0.1.2 - fsevents@2.3.2: - optional: true - fsevents@2.3.3: optional: true @@ -41969,7 +41961,7 @@ snapshots: netlify-redirector@0.5.0: {} - next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.61.1)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2): + next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2): dependencies: '@next/env': 16.3.4 '@swc/helpers': 0.5.23 @@ -41988,7 +41980,7 @@ snapshots: '@next/swc-linux-x64-musl': 16.3.4 '@next/swc-win32-arm64-msvc': 16.3.4 '@next/swc-win32-x64-msvc': 16.3.4 - '@playwright/test': 1.61.1 + '@playwright/test': 1.63.0 babel-plugin-react-compiler: 1.0.0 sass: 1.97.2 sharp: 0.35.4(@types/node@25.0.9) @@ -42920,13 +42912,11 @@ snapshots: pvutils: 1.1.3 tslib: 2.8.1 - playwright-core@1.61.1: {} + playwright-core@1.63.0: {} - playwright@1.61.1: + playwright@1.63.0: dependencies: - playwright-core: 1.61.1 - optionalDependencies: - fsevents: 2.3.2 + playwright-core: 1.63.0 possible-typed-array-names@1.1.0: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index aad1e76489..4757e4c795 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -67,7 +67,7 @@ catalog: vue: ^3.5.25 zod: ^4.5.4 '@types/node': 25.0.9 - '@playwright/test': ^1.61.0 + '@playwright/test': ^1.63.0 '@tanstack/query-core': ^5.102.0 '@tanstack/react-query': ^5.102.0 '@tanstack/solid-query': ^5.102.0 diff --git a/scripts/nx/playwright-plugin.ts b/scripts/nx/playwright-plugin.ts index 1e68348aa2..cf1219571d 100644 --- a/scripts/nx/playwright-plugin.ts +++ b/scripts/nx/playwright-plugin.ts @@ -313,6 +313,7 @@ function buildModeTargets( E2E_PORT_KEY: modePortKey, }, }, + parallelism: false, cache: true, inputs: TEST_INPUTS, outputs: getTestOutputs(modeKey, modePortKey), @@ -338,6 +339,7 @@ function buildModeTargets( E2E_PORT_KEY: shardPortKey, }, }, + parallelism: false, cache: true, inputs: TEST_INPUTS, outputs: getTestOutputs(modeKey, shardPortKey), @@ -424,6 +426,7 @@ function buildShardedTargets( E2E_PORT_KEY: e2ePortKey, }, }, + parallelism: false, cache: true, inputs: TEST_INPUTS, dependsOn: [`^build`, 'build'], From e8b0701420a83c3975a8ea805aaa8caeb223212a Mon Sep 17 00:00:00 2001 From: Flo Date: Mon, 14 Sep 2026 10:54:22 +0200 Subject: [PATCH 029/175] test(e2e): replace dummy APIs with MSW fixtures (#8402) * test(e2e): replace dummy APIs with MSW fixtures * test(e2e): require Node with native type stripping * Merge branch 'codex/e2e-playwright-cache' into codex/e2e-runtime-fixtures [Self-Healing CI Rerun] --------- Co-authored-by: nx-cloud[bot] <71083854+nx-cloud[bot]@users.noreply.github.com> --- e2e/e2e-utils/mock-api.mjs | 4 + e2e/e2e-utils/package.json | 15 +- e2e/e2e-utils/src/api-fixture.ts | 17 ++ e2e/e2e-utils/src/api-handlers.ts | 32 +++ e2e/e2e-utils/src/derivePort.ts | 4 - e2e/e2e-utils/src/e2eSetupTeardown.ts | 16 -- e2e/e2e-utils/src/index.ts | 5 +- e2e/e2e-utils/src/localDummyServer.ts | 128 ---------- e2e/e2e-utils/tests/mock-api.test.ts | 53 ++++ e2e/e2e-utils/tsconfig.json | 5 +- .../basepath-file-based/playwright.config.ts | 11 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../basic-esbuild-file-based/src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/preload.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../tests/shared-bindings.spec.ts | 3 +- .../basic-file-based/playwright.config.ts | 12 +- .../basic-file-based/public/external.html | 9 + .../basic-file-based/src/main.tsx | 4 +- .../basic-file-based/src/posts.tsx | 6 +- .../src/routes/document-navigation.tsx | 2 +- .../basic-file-based/tests/app.spec.ts | 3 +- .../tests/document-navigation.spec.ts | 12 +- .../tests/fullpath-types.spec.ts | 3 +- .../tests/history-blocking.spec.ts | 3 +- .../tests/hover-preload-hash.spec.ts | 3 +- .../basic-file-based/tests/mask.spec.ts | 3 +- .../tests/non-nested-paths.spec.ts | 3 +- .../tests/open-redirect-prevention.spec.ts | 3 +- .../basic-file-based/tests/params.spec.ts | 3 +- .../basic-file-based/tests/redirect.spec.ts | 27 +-- .../basic-file-based/tests/relative.spec.ts | 8 +- .../tests/scroll-into-view.spec.ts | 3 +- .../tests/search-params.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 10 +- .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 29 ++- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-react-query/playwright.config.ts | 11 +- .../basic-react-query/src/posts.ts | 6 +- .../basic-react-query/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../basic-virtual-file-based/src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - e2e/react-router/basic/playwright.config.ts | 11 +- e2e/react-router/basic/src/posts.ts | 6 +- e2e/react-router/basic/tests/app.spec.ts | 8 +- e2e/react-router/basic/tests/params.spec.ts | 3 +- .../basic/tests/setup/global.setup.ts | 6 - .../basic/tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 10 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../generator-cli-only/playwright.config.ts | 11 +- .../generator-cli-only/src/posts.ts | 6 +- .../generator-cli-only/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../js-only-file-based/playwright.config.ts | 11 +- .../js-only-file-based/src/posts.js | 6 +- .../js-only-file-based/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../rspack-basic-file-based/src/posts.tsx | 6 +- .../rspack-basic-file-based/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.browser.config.ts | 7 +- .../playwright.hash.config.ts | 7 +- .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/issue-7040.repro.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../view-transitions/playwright.config.ts | 11 +- .../view-transitions/tests/app.spec.ts | 2 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-cloudflare/playwright.config.ts | 3 - .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-react-query/playwright.config.ts | 14 +- .../basic-react-query/src/routes/api.users.ts | 6 +- .../src/routes/api/users.$id.ts | 6 +- .../basic-react-query/src/utils/posts.tsx | 6 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - e2e/react-start/basic/package.json | 12 +- e2e/react-start/basic/playwright.config.ts | 20 +- e2e/react-start/basic/src/routes/api.users.ts | 10 +- .../basic/src/routes/api/users.$id.ts | 10 +- e2e/react-start/basic/src/utils/posts.tsx | 10 +- e2e/react-start/basic/src/utils/users.tsx | 4 - .../basic/tests/fixture-api.spec.ts | 11 + e2e/react-start/basic/tests/redirect.spec.ts | 36 ++- .../basic/tests/setup/global.setup.ts | 6 - .../basic/tests/setup/global.teardown.ts | 8 - .../basic/tests/setup/waitForDummyServer.ts | 24 -- .../css-modules/playwright.config.ts | 3 - .../css-modules/tests/setup/global.setup.ts | 58 ----- .../tests/setup/global.teardown.ts | 6 - .../custom-basepath/playwright.config.ts | 14 +- .../custom-basepath/src/routes/api.users.ts | 6 +- .../src/routes/api/users.$id.ts | 6 +- .../custom-basepath/src/utils/posts.tsx | 6 +- .../custom-basepath/src/utils/users.tsx | 4 - .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../deferred-hydration/playwright.config.ts | 2 - .../tests/setup/global.setup.ts | 38 --- .../tests/setup/global.teardown.ts | 13 - .../dev-ssr-styles/playwright.config.ts | 3 - .../tests/setup/global.setup.ts | 39 --- .../tests/setup/global.teardown.ts | 21 -- e2e/react-start/hmr/playwright.config.ts | 3 - .../hmr/tests/setup/global.setup.ts | 27 --- .../hmr/tests/setup/global.teardown.ts | 11 - .../playwright.config.ts | 2 - .../tests/setup/global.setup.ts | 28 --- .../tests/setup/global.teardown.ts | 6 - .../rsc-query/playwright.config.ts | 3 - .../rsc-query/tests/setup/global.setup.ts | 6 - .../rsc-query/tests/setup/global.teardown.ts | 6 - .../rsc-rsbuild/playwright.config.ts | 15 +- .../rsc-rsbuild/tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - e2e/react-start/rsc/playwright.config.ts | 16 +- .../rsc/src/routes/rsc-external.tsx | 6 +- .../rsc/tests/rsc-external.spec.ts | 10 +- .../rsc/tests/setup/global.setup.ts | 6 - .../rsc/tests/setup/global.teardown.ts | 6 - .../scroll-restoration/playwright.config.ts | 14 +- .../scroll-restoration/src/utils/posts.tsx | 6 +- .../scroll-restoration/src/utils/users.tsx | 5 - .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 3 - .../tests/setup/global.setup.ts | 33 --- .../tests/setup/global.teardown.ts | 6 - .../virtual-routes/playwright.config.ts | 14 +- e2e/react-start/virtual-routes/src/posts.tsx | 6 +- .../virtual-routes/src/utils/posts.tsx | 6 +- .../virtual-routes/src/utils/users.tsx | 4 - .../virtual-routes/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basepath-file-based/playwright.config.ts | 11 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/preload.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-file-based/playwright.config.ts | 12 +- .../basic-file-based/src/posts.tsx | 6 +- .../basic-file-based/tests/app.spec.ts | 3 +- .../tests/hover-preload-hash.spec.ts | 3 +- .../basic-file-based/tests/mask.spec.ts | 3 +- .../tests/non-nested-paths.spec.ts | 3 +- .../basic-file-based/tests/params.spec.ts | 3 +- .../basic-file-based/tests/redirect.spec.ts | 23 +- .../basic-file-based/tests/relative.spec.ts | 8 +- .../tests/scroll-into-view.spec.ts | 3 +- .../tests/search-params.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-file-based/tests/transition.spec.ts | 3 +- .../playwright.config.ts | 11 +- .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-solid-query/playwright.config.ts | 11 +- .../basic-solid-query/src/posts.ts | 6 +- .../basic-solid-query/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../basic-virtual-file-based/src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - e2e/solid-router/basic/playwright.config.ts | 11 +- e2e/solid-router/basic/src/posts.ts | 6 +- e2e/solid-router/basic/tests/app.spec.ts | 8 +- e2e/solid-router/basic/tests/params.spec.ts | 3 +- .../basic/tests/setup/global.setup.ts | 6 - .../basic/tests/setup/global.teardown.ts | 6 - .../generator-cli-only/playwright.config.ts | 11 +- .../generator-cli-only/src/posts.ts | 6 +- .../generator-cli-only/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../js-only-file-based/playwright.config.ts | 11 +- .../js-only-file-based/src/posts.js | 6 +- .../js-only-file-based/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../rspack-basic-file-based/src/posts.tsx | 6 +- .../rspack-basic-file-based/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.browser.config.ts | 7 +- .../playwright.hash.config.ts | 7 +- .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../view-transitions/playwright.config.ts | 11 +- .../view-transitions/tests/app.spec.ts | 2 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-cloudflare/playwright.config.ts | 3 - .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-solid-query/playwright.config.ts | 14 +- .../basic-solid-query/src/routes/api.users.ts | 6 +- .../src/routes/api/users.$id.ts | 6 +- .../basic-solid-query/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../tests/transition.spec.ts | 3 +- e2e/solid-start/basic/package.json | 13 +- e2e/solid-start/basic/playwright.config.ts | 15 +- .../basic/src/routes/api/users.$userId.ts | 10 +- e2e/solid-start/basic/src/routes/api/users.ts | 8 +- e2e/solid-start/basic/src/utils/posts.tsx | 10 +- e2e/solid-start/basic/src/utils/users.tsx | 4 - .../basic/tests/fixture-api.spec.ts | 11 + e2e/solid-start/basic/tests/redirect.spec.ts | 36 ++- .../basic/tests/setup/global.setup.ts | 6 - .../basic/tests/setup/global.teardown.ts | 8 - .../basic/tests/setup/waitForDummyServer.ts | 24 -- .../css-modules/playwright.config.ts | 3 - .../css-modules/tests/setup/global.setup.ts | 47 ---- .../tests/setup/global.teardown.ts | 6 - .../custom-basepath/playwright.config.ts | 14 +- .../src/routes/api/users.$userId.ts | 6 +- .../custom-basepath/src/routes/api/users.ts | 6 +- .../custom-basepath/src/utils/posts.tsx | 6 +- .../custom-basepath/src/utils/users.tsx | 4 - .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../query-integration/playwright.config.ts | 8 +- .../scroll-restoration/playwright.config.ts | 14 +- .../scroll-restoration/src/utils/posts.tsx | 6 +- .../scroll-restoration/src/utils/users.tsx | 4 - .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../virtual-routes/playwright.config.ts | 14 +- e2e/solid-start/virtual-routes/src/posts.tsx | 6 +- .../virtual-routes/src/utils/posts.tsx | 6 +- .../virtual-routes/src/utils/users.tsx | 4 - .../virtual-routes/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basepath-file-based/playwright.config.ts | 11 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-file-based-jsx/playwright.config.ts | 11 +- .../basic-file-based-jsx/src/posts.tsx | 6 +- .../basic-file-based-jsx/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-file-based-sfc/playwright.config.ts | 11 +- .../basic-file-based-sfc/src/posts.ts | 6 +- .../basic-file-based-sfc/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../basic-virtual-file-based/src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 10 +- .../basic-vue-query-file-based/src/posts.tsx | 6 +- .../tests/app.spec.ts | 29 ++- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-vue-query/playwright.config.ts | 11 +- e2e/vue-router/basic-vue-query/src/posts.ts | 6 +- .../basic-vue-query/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - e2e/vue-router/basic/playwright.config.ts | 11 +- e2e/vue-router/basic/src/posts.ts | 6 +- e2e/vue-router/basic/tests/app.spec.ts | 8 +- e2e/vue-router/basic/tests/params.spec.ts | 3 +- .../basic/tests/setup/global.setup.ts | 6 - .../basic/tests/setup/global.teardown.ts | 6 - .../generator-cli-only/playwright.config.ts | 11 +- .../generator-cli-only/src/posts.ts | 6 +- .../generator-cli-only/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../js-only-file-based/playwright.config.ts | 11 +- .../js-only-file-based/src/posts.js | 6 +- .../js-only-file-based/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../rspack-basic-file-based/rsbuild.config.ts | 13 - .../rspack-basic-file-based/src/posts.tsx | 6 +- .../rspack-basic-file-based/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.config.ts | 11 +- .../rsbuild.config.ts | 13 - .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../playwright.browser.config.ts | 7 +- .../playwright.hash.config.ts | 7 +- .../src/posts.tsx | 6 +- .../tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../view-transitions/playwright.config.ts | 11 +- .../view-transitions/tests/app.spec.ts | 2 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../tests/view-transitions.spec.ts | 3 +- .../basic-cloudflare/playwright.config.ts | 3 - .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-vue-query/playwright.config.ts | 14 +- .../basic-vue-query/src/routes/api.users.ts | 6 +- .../src/routes/api/users.$id.ts | 6 +- .../basic-vue-query/src/utils/posts.tsx | 6 +- .../basic-vue-query/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../basic-vue-query/tests/transition.spec.ts | 3 +- e2e/vue-start/basic/package.json | 13 +- e2e/vue-start/basic/playwright.config.ts | 15 +- .../basic/src/routes/api/users.$userId.ts | 10 +- e2e/vue-start/basic/src/routes/api/users.ts | 8 +- e2e/vue-start/basic/src/utils/posts.tsx | 10 +- e2e/vue-start/basic/src/utils/users.tsx | 4 - e2e/vue-start/basic/src/vite-env.d.ts | 1 - e2e/vue-start/basic/tests/fixture-api.spec.ts | 11 + e2e/vue-start/basic/tests/redirect.spec.ts | 36 ++- .../basic/tests/setup/global.setup.ts | 6 - .../basic/tests/setup/global.teardown.ts | 8 - .../basic/tests/setup/waitForDummyServer.ts | 24 -- .../css-modules/playwright.config.ts | 3 - .../css-modules/tests/setup/global.setup.ts | 47 ---- .../tests/setup/global.teardown.ts | 6 - .../custom-basepath/playwright.config.ts | 14 +- .../src/routes/api/users.$userId.ts | 6 +- .../custom-basepath/src/routes/api/users.ts | 6 +- .../custom-basepath/src/utils/posts.tsx | 6 +- .../custom-basepath/src/utils/users.tsx | 4 - .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../scroll-restoration/playwright.config.ts | 14 +- .../scroll-restoration/src/utils/posts.tsx | 6 +- .../scroll-restoration/src/utils/users.tsx | 4 - .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../virtual-routes/playwright.config.ts | 14 +- e2e/vue-start/virtual-routes/src/posts.tsx | 6 +- .../virtual-routes/src/utils/posts.tsx | 6 +- .../virtual-routes/src/utils/users.tsx | 4 - .../virtual-routes/tests/app.spec.ts | 3 +- .../tests/setup/global.setup.ts | 6 - .../tests/setup/global.teardown.ts | 6 - .../vue/basic-file-based-jsx/src/posts.tsx | 6 +- .../vue/basic-file-based-sfc/src/posts.ts | 6 +- pnpm-lock.yaml | 229 ++++++++++++++++++ scripts/nx/playwright-plugin.md | 24 +- 421 files changed, 952 insertions(+), 2756 deletions(-) create mode 100644 e2e/e2e-utils/mock-api.mjs create mode 100644 e2e/e2e-utils/src/api-fixture.ts create mode 100644 e2e/e2e-utils/src/api-handlers.ts delete mode 100644 e2e/e2e-utils/src/e2eSetupTeardown.ts delete mode 100644 e2e/e2e-utils/src/localDummyServer.ts create mode 100644 e2e/e2e-utils/tests/mock-api.test.ts delete mode 100644 e2e/react-router/basepath-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/basepath-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/basic-esbuild-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/basic-esbuild-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/basic-file-based-code-splitting/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/basic-file-based-code-splitting/tests/setup/global.teardown.ts create mode 100644 e2e/react-router/basic-file-based/public/external.html delete mode 100644 e2e/react-router/basic-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/basic-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/basic-react-query-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/basic-react-query-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/basic-react-query/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/basic-react-query/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/basic-virtual-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/basic-virtual-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/basic/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/basic/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/escaped-special-strings/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/escaped-special-strings/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/generator-cli-only/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/generator-cli-only/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/js-only-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/js-only-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/rspack-basic-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/rspack-basic-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts delete mode 100644 e2e/react-router/view-transitions/tests/setup/global.setup.ts delete mode 100644 e2e/react-router/view-transitions/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/basic-cloudflare/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/basic-cloudflare/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/basic-react-query/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/basic-react-query/tests/setup/global.teardown.ts create mode 100644 e2e/react-start/basic/tests/fixture-api.spec.ts delete mode 100644 e2e/react-start/basic/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/basic/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/basic/tests/setup/waitForDummyServer.ts delete mode 100644 e2e/react-start/css-modules/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/css-modules/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/custom-basepath/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/custom-basepath/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/deferred-hydration/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/deferred-hydration/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/dev-ssr-styles/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/dev-ssr-styles/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/hmr/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/hmr/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/rsc-deferred-hydration/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/rsc-query/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/rsc-query/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/rsc-rsbuild/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/rsc-rsbuild/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/rsc/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/rsc/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/scroll-restoration/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/scroll-restoration/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/split-base-and-basepath/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/split-base-and-basepath/tests/setup/global.teardown.ts delete mode 100644 e2e/react-start/virtual-routes/tests/setup/global.setup.ts delete mode 100644 e2e/react-start/virtual-routes/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/basepath-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/basepath-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/basic-file-based-code-splitting/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/basic-file-based-code-splitting/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/basic-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/basic-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/basic-solid-query-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/basic-solid-query-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/basic-solid-query/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/basic-solid-query/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/basic-virtual-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/basic-virtual-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/basic/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/basic/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/generator-cli-only/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/generator-cli-only/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/js-only-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/js-only-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/rspack-basic-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/rspack-basic-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-router/view-transitions/tests/setup/global.setup.ts delete mode 100644 e2e/solid-router/view-transitions/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-start/basic-cloudflare/tests/setup/global.setup.ts delete mode 100644 e2e/solid-start/basic-cloudflare/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-start/basic-solid-query/tests/setup/global.setup.ts delete mode 100644 e2e/solid-start/basic-solid-query/tests/setup/global.teardown.ts create mode 100644 e2e/solid-start/basic/tests/fixture-api.spec.ts delete mode 100644 e2e/solid-start/basic/tests/setup/global.setup.ts delete mode 100644 e2e/solid-start/basic/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-start/basic/tests/setup/waitForDummyServer.ts delete mode 100644 e2e/solid-start/css-modules/tests/setup/global.setup.ts delete mode 100644 e2e/solid-start/css-modules/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-start/custom-basepath/tests/setup/global.setup.ts delete mode 100644 e2e/solid-start/custom-basepath/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-start/scroll-restoration/tests/setup/global.setup.ts delete mode 100644 e2e/solid-start/scroll-restoration/tests/setup/global.teardown.ts delete mode 100644 e2e/solid-start/virtual-routes/tests/setup/global.setup.ts delete mode 100644 e2e/solid-start/virtual-routes/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/basepath-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/basepath-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/basic-esbuild-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/basic-esbuild-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/basic-file-based-jsx/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/basic-file-based-jsx/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/basic-file-based-sfc/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/basic-file-based-sfc/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/basic-virtual-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/basic-virtual-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/basic-vue-query-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/basic-vue-query-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/basic-vue-query/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/basic-vue-query/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/basic/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/basic/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/generator-cli-only/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/generator-cli-only/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/js-only-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/js-only-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/rspack-basic-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/rspack-basic-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-router/view-transitions/tests/setup/global.setup.ts delete mode 100644 e2e/vue-router/view-transitions/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-start/basic-cloudflare/tests/setup/global.setup.ts delete mode 100644 e2e/vue-start/basic-cloudflare/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-start/basic-vue-query/tests/setup/global.setup.ts delete mode 100644 e2e/vue-start/basic-vue-query/tests/setup/global.teardown.ts create mode 100644 e2e/vue-start/basic/tests/fixture-api.spec.ts delete mode 100644 e2e/vue-start/basic/tests/setup/global.setup.ts delete mode 100644 e2e/vue-start/basic/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-start/basic/tests/setup/waitForDummyServer.ts delete mode 100644 e2e/vue-start/css-modules/tests/setup/global.setup.ts delete mode 100644 e2e/vue-start/css-modules/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-start/custom-basepath/tests/setup/global.setup.ts delete mode 100644 e2e/vue-start/custom-basepath/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-start/scroll-restoration/tests/setup/global.setup.ts delete mode 100644 e2e/vue-start/scroll-restoration/tests/setup/global.teardown.ts delete mode 100644 e2e/vue-start/virtual-routes/tests/setup/global.setup.ts delete mode 100644 e2e/vue-start/virtual-routes/tests/setup/global.teardown.ts diff --git a/e2e/e2e-utils/mock-api.mjs b/e2e/e2e-utils/mock-api.mjs new file mode 100644 index 0000000000..f92ec840e5 --- /dev/null +++ b/e2e/e2e-utils/mock-api.mjs @@ -0,0 +1,4 @@ +import { setupServer } from 'msw/node' +import { apiHandlers } from './src/api-handlers.ts' + +setupServer(...apiHandlers).listen({ onUnhandledRequest: 'bypass' }) diff --git a/e2e/e2e-utils/package.json b/e2e/e2e-utils/package.json index 127f9a01f2..b2fad2161b 100644 --- a/e2e/e2e-utils/package.json +++ b/e2e/e2e-utils/package.json @@ -5,7 +5,7 @@ "clean": "rimraf ./dist && rimraf ./coverage", "build": "vite build", "test:eslint": "eslint ./src", - "test:unit": "exit 0; vitest --typecheck" + "test:unit": "vitest run" }, "type": "module", "types": "dist/types/index.d.ts", @@ -22,7 +22,8 @@ "default": "./dist/cjs/index.cjs" } }, - "./package.json": "./package.json" + "./package.json": "./package.json", + "./mock-api": "./mock-api.mjs" }, "sideEffects": false, "files": [ @@ -30,13 +31,15 @@ "src" ], "engines": { - "node": ">=20.19" + "node": "^22.18.0 || >=24.0.0" }, - "dependencies": {}, "devDependencies": { - "get-port-please": "^3.2.0", + "@msw/playwright": "0.6.7", + "msw": "2.15.0", + "rimraf": "catalog:", "vite": "^8.0.14", "vite-plugin-dts": "^4.5.4", - "rimraf": "catalog:" + "vitest": "catalog:", + "get-port-please": "^3.2.0" } } diff --git a/e2e/e2e-utils/src/api-fixture.ts b/e2e/e2e-utils/src/api-fixture.ts new file mode 100644 index 0000000000..90ca1912a3 --- /dev/null +++ b/e2e/e2e-utils/src/api-fixture.ts @@ -0,0 +1,17 @@ +import { test as base } from '@playwright/test' +import { defineNetworkFixture } from '@msw/playwright' +import { apiHandlers } from './api-handlers' + +// Opt in only for suites that consume the canned API. Playwright routing +// disables HTTP caching; other suites keep their normal browser behavior. +export const apiTest = base.extend<{ mockApi: void }>({ + mockApi: [ + async ({ context }, use) => { + const network = defineNetworkFixture({ context, handlers: apiHandlers }) + await network.enable() + await use() + await network.disable() + }, + { auto: true }, + ], +}) diff --git a/e2e/e2e-utils/src/api-handlers.ts b/e2e/e2e-utils/src/api-handlers.ts new file mode 100644 index 0000000000..4e2c0498f4 --- /dev/null +++ b/e2e/e2e-utils/src/api-handlers.ts @@ -0,0 +1,32 @@ +import { HttpResponse, http } from 'msw' +import { posts } from './posts.ts' +import { users } from './users.ts' + +export const apiHandlers = [ + ...Object.entries({ posts, users }).flatMap(([resource, data]) => [ + http.get(`https://jsonplaceholder.typicode.com/${resource}`, () => + HttpResponse.json(data), + ), + http.get( + `https://jsonplaceholder.typicode.com/${resource}/:id`, + ({ params }) => { + const id = parseInt(String(params.id)) + if (Number.isNaN(id)) { + return HttpResponse.json( + { error: `invalid ${resource.slice(0, -1)} id` }, + { status: 404 }, + ) + } + const item = data.find((entry) => entry.id === id) + return item + ? HttpResponse.json(item) + : new HttpResponse(null, { + headers: { 'content-type': 'application/json' }, + }) + }, + ), + ]), + http.all('https://jsonplaceholder.typicode.com/*', () => + HttpResponse.error(), + ), +] diff --git a/e2e/e2e-utils/src/derivePort.ts b/e2e/e2e-utils/src/derivePort.ts index 3ecb86cb53..ffbdf0ad9e 100644 --- a/e2e/e2e-utils/src/derivePort.ts +++ b/e2e/e2e-utils/src/derivePort.ts @@ -18,10 +18,6 @@ export async function derivePort(input: string): Promise { return portNumber } -export async function getDummyServerPort(input: string): Promise { - return await derivePort(`${input}-external`) -} - export async function getTestServerPort(input: string): Promise { return await derivePort(input) } diff --git a/e2e/e2e-utils/src/e2eSetupTeardown.ts b/e2e/e2e-utils/src/e2eSetupTeardown.ts deleted file mode 100644 index d1acf4740e..0000000000 --- a/e2e/e2e-utils/src/e2eSetupTeardown.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { localDummyServer } from './localDummyServer' -import { getDummyServerPort } from './derivePort' - -export async function e2eStartDummyServer(input: string) { - const port = await getDummyServerPort(input) - - return await localDummyServer(port) -} - -export async function e2eStopDummyServer(input: string) { - const port = await getDummyServerPort(input) - - await fetch(`http://localhost:${port}/stop`, { - method: 'POST', - }) -} diff --git a/e2e/e2e-utils/src/index.ts b/e2e/e2e-utils/src/index.ts index 17e58f82e5..c6aad7c63c 100644 --- a/e2e/e2e-utils/src/index.ts +++ b/e2e/e2e-utils/src/index.ts @@ -1,8 +1,7 @@ -export { derivePort, getDummyServerPort, getTestServerPort } from './derivePort' -export { localDummyServer } from './localDummyServer' +export { apiTest } from './api-fixture' +export { derivePort, getTestServerPort } from './derivePort' export { toRuntimePath } from './to-runtime-path' export { resolveRuntimeSuffix } from './resolve-runtime-suffix' -export { e2eStartDummyServer, e2eStopDummyServer } from './e2eSetupTeardown' export { preOptimizeDevServer, waitForServer } from './devServerWarmup' export { createHmrFileEditor, replaceAll } from './hmrFileEditor' export type { HmrFileEditorOptions } from './hmrFileEditor' diff --git a/e2e/e2e-utils/src/localDummyServer.ts b/e2e/e2e-utils/src/localDummyServer.ts deleted file mode 100644 index d452f54c59..0000000000 --- a/e2e/e2e-utils/src/localDummyServer.ts +++ /dev/null @@ -1,128 +0,0 @@ -import http from 'node:http' -import { posts } from './posts' -import { users } from './users' - -// some tests redirect to an external host -// however, in CI this is unstable due to network conditions -// so here we spawn a local server to simulate the external host - -export async function localDummyServer(port: number) { - const server = http.createServer((req, res) => { - // Set CORS headers - res.setHeader('Access-Control-Allow-Origin', '*') - res.setHeader('Access-Control-Request-Method', '*') - res.setHeader('Access-Control-Allow-Methods', 'OPTIONS, GET, POST') - res.setHeader('Access-Control-Allow-Headers', '*') - - if (req.method === 'OPTIONS') { - res.writeHead(200) - res.end() - return - } - }) - - server.on('request', (req, res) => { - const url = new URL(req.url!, 'http://localhost') - - if (res.req.method === 'GET' && url.pathname === '/') { - res.writeHead(200, { 'Content-Type': 'text/html' }) - res.end('Hello World') - } - }) - - server.on('request', (req, res) => { - const url = new URL(req.url!, `http://localhost`) - - if (res.req.method === 'POST' && url.pathname === '/stop') { - server.close() - console.info( - `stopped local dummy server running at http://localhost:${port}`, - ) - - res.writeHead(200) - res.end() - } - }) - - server.on('request', (req, res) => { - const url = new URL(req.url ?? '/', `http://localhost`) - - if (req.method === 'GET' && url.pathname.startsWith('/posts')) { - const parts = url.pathname.split('/') - - if (parts.length === 2) { - res.writeHead(200, { 'content-type': 'application/json' }) - res.end(JSON.stringify(posts)) - return - } - - if (parts[2]) { - const postId = parseInt(parts[2]) - - if (isNaN(postId)) { - res.writeHead(404) - res.end(JSON.stringify({ error: 'invalid post id' })) - return - } - - const post = posts.find((post) => post.id === postId) - - res.writeHead(200, { 'content-type': 'application/json' }) - res.end(JSON.stringify(post)) - return - } - - res.writeHead(404) - res.end(JSON.stringify({ error: 'invalid posts path' })) - return - } - }) - - server.on('request', (req, res) => { - const url = new URL(req.url ?? '/', `http://localhost`) - - if (req.method === 'GET' && url.pathname.startsWith('/users')) { - const parts = url.pathname.split('/') - - if (parts.length === 2) { - res.writeHead(200, { 'content-type': 'application/json' }) - res.end(JSON.stringify(users)) - return - } - - if (parts[2]) { - const userId = parseInt(parts[2]) - - if (isNaN(userId)) { - res.writeHead(404) - res.end(JSON.stringify({ error: 'invalid user id' })) - return - } - - const user = users.find((user) => user.id === userId) - - res.writeHead(200, { 'content-type': 'application/json' }) - res.end(JSON.stringify(user)) - return - } - - res.writeHead(404) - res.end(JSON.stringify({ error: 'invalid users path' })) - return - } - }) - - const startServer = new Promise((resolve) => { - server.listen(port, 'localhost', () => { - console.info( - `started local dummy server running at http://localhost:${port}`, - ) - resolve() - }) - }) - - await startServer - - await new Promise((r) => setTimeout(r, 500)) - return server -} diff --git a/e2e/e2e-utils/tests/mock-api.test.ts b/e2e/e2e-utils/tests/mock-api.test.ts new file mode 100644 index 0000000000..ba25c1254d --- /dev/null +++ b/e2e/e2e-utils/tests/mock-api.test.ts @@ -0,0 +1,53 @@ +import { execFile } from 'node:child_process' +import { promisify } from 'node:util' +import { fileURLToPath } from 'node:url' +import { expect, test } from 'vitest' + +const execFileAsync = promisify(execFile) +const preload = fileURLToPath(new URL('../mock-api.mjs', import.meta.url)) + +test('independent Node processes mock the API with networking disabled', async () => { + const script = ` + const { Socket } = await import('node:net') + Socket.prototype.connect = () => { throw new Error('Network disabled') } + const posts = await fetch('https://jsonplaceholder.typicode.com/posts').then(r => r.json()) + const user = await fetch('https://jsonplaceholder.typicode.com/users/1').then(r => r.json()) + const invalid = await fetch('https://jsonplaceholder.typicode.com/posts/invalid') + const missing = await fetch('https://jsonplaceholder.typicode.com/posts/999') + console.log(JSON.stringify({ post: posts[0].id, user: user.id, invalid: invalid.status, missing: await missing.text() })) + ` + const results = await Promise.all( + [0, 1].map(() => + execFileAsync(process.execPath, ['--import', preload, '--eval', script]), + ), + ) + for (const result of results) { + expect(JSON.parse(result.stdout)).toEqual({ + post: 1, + user: 1, + invalid: 404, + missing: '', + }) + } +}) + +test('unhandled API requests fail without reaching the network', async () => { + const script = ` + const { Socket } = await import('node:net') + let connections = 0 + Socket.prototype.connect = () => { connections++; throw new Error('Network disabled') } + try { + await fetch('https://jsonplaceholder.typicode.com/unhandled') + process.exitCode = 1 + } catch { + console.log(JSON.stringify({ connections })) + } + ` + const result = await execFileAsync(process.execPath, [ + '--import', + preload, + '--eval', + script, + ]) + expect(JSON.parse(result.stdout)).toEqual({ connections: 0 }) +}) diff --git a/e2e/e2e-utils/tsconfig.json b/e2e/e2e-utils/tsconfig.json index 9b21ee123b..5561f5d28f 100644 --- a/e2e/e2e-utils/tsconfig.json +++ b/e2e/e2e-utils/tsconfig.json @@ -1,4 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src", "vite.config.ts", "tests"] + "include": ["src", "vite.config.ts", "tests"], + "compilerOptions": { + "rewriteRelativeImportExtensions": true + } } diff --git a/e2e/react-router/basepath-file-based/playwright.config.ts b/e2e/react-router/basepath-file-based/playwright.config.ts index 6069bbe59f..be44f419e9 100644 --- a/e2e/react-router/basepath-file-based/playwright.config.ts +++ b/e2e/react-router/basepath-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/basepath-file-based/tests/setup/global.setup.ts b/e2e/react-router/basepath-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/basepath-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/basepath-file-based/tests/setup/global.teardown.ts b/e2e/react-router/basepath-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/basepath-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/basic-esbuild-file-based/playwright.config.ts b/e2e/react-router/basic-esbuild-file-based/playwright.config.ts index ca0fb7a1da..ca68d5f708 100644 --- a/e2e/react-router/basic-esbuild-file-based/playwright.config.ts +++ b/e2e/react-router/basic-esbuild-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm run build && pnpm run serve --serve=${PORT} --define:process.env.NODE_ENV=\\"test\\" --define:process.env.EXTERNAL_PORT="${EXTERNAL_PORT}"`, + command: `pnpm run build && pnpm run serve --serve=${PORT} --define:process.env.NODE_ENV=\\"test\\"`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/basic-esbuild-file-based/src/posts.tsx b/e2e/react-router/basic-esbuild-file-based/src/posts.tsx index 8f74b8c9aa..97c96d77eb 100644 --- a/e2e/react-router/basic-esbuild-file-based/src/posts.tsx +++ b/e2e/react-router/basic-esbuild-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (process.env.NODE_ENV === 'test') { - queryURL = `http://localhost:${process.env.EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/basic-esbuild-file-based/tests/app.spec.ts b/e2e/react-router/basic-esbuild-file-based/tests/app.spec.ts index 7b322a8b1d..c52191a7d4 100644 --- a/e2e/react-router/basic-esbuild-file-based/tests/app.spec.ts +++ b/e2e/react-router/basic-esbuild-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-esbuild-file-based/tests/setup/global.setup.ts b/e2e/react-router/basic-esbuild-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/basic-esbuild-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/basic-esbuild-file-based/tests/setup/global.teardown.ts b/e2e/react-router/basic-esbuild-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/basic-esbuild-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/basic-file-based-code-splitting/playwright.config.ts b/e2e/react-router/basic-file-based-code-splitting/playwright.config.ts index 22c9bdcd7e..e7e4795203 100644 --- a/e2e/react-router/basic-file-based-code-splitting/playwright.config.ts +++ b/e2e/react-router/basic-file-based-code-splitting/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/basic-file-based-code-splitting/src/posts.tsx b/e2e/react-router/basic-file-based-code-splitting/src/posts.tsx index ae7142c5b6..97c96d77eb 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/posts.tsx +++ b/e2e/react-router/basic-file-based-code-splitting/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/basic-file-based-code-splitting/tests/app.spec.ts b/e2e/react-router/basic-file-based-code-splitting/tests/app.spec.ts index 3e5a69ccaa..fbf093cd51 100644 --- a/e2e/react-router/basic-file-based-code-splitting/tests/app.spec.ts +++ b/e2e/react-router/basic-file-based-code-splitting/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-file-based-code-splitting/tests/preload.spec.ts b/e2e/react-router/basic-file-based-code-splitting/tests/preload.spec.ts index 0bc3265760..fd17fcc47b 100644 --- a/e2e/react-router/basic-file-based-code-splitting/tests/preload.spec.ts +++ b/e2e/react-router/basic-file-based-code-splitting/tests/preload.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-file-based-code-splitting/tests/setup/global.setup.ts b/e2e/react-router/basic-file-based-code-splitting/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/basic-file-based-code-splitting/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(packageJson.name) -} diff --git a/e2e/react-router/basic-file-based-code-splitting/tests/setup/global.teardown.ts b/e2e/react-router/basic-file-based-code-splitting/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/basic-file-based-code-splitting/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(packageJson.name) -} diff --git a/e2e/react-router/basic-file-based-code-splitting/tests/shared-bindings.spec.ts b/e2e/react-router/basic-file-based-code-splitting/tests/shared-bindings.spec.ts index 512943c10d..2ad4ec3e78 100644 --- a/e2e/react-router/basic-file-based-code-splitting/tests/shared-bindings.spec.ts +++ b/e2e/react-router/basic-file-based-code-splitting/tests/shared-bindings.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-file-based/playwright.config.ts b/e2e/react-router/basic-file-based/playwright.config.ts index 6e4e1d7703..fe3edefe3a 100644 --- a/e2e/react-router/basic-file-based/playwright.config.ts +++ b/e2e/react-router/basic-file-based/playwright.config.ts @@ -1,14 +1,10 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` -const command = `pnpm build && pnpm preview --port ${PORT}` +const command = `pnpm build && pnpm preview --host 0.0.0.0 --port ${PORT}` console.info('Running with mode: ', process.env.MODE || 'default') @@ -21,9 +17,6 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, @@ -38,7 +31,6 @@ export default defineConfig({ MODE: process.env.MODE || '', VITE_MODE: process.env.MODE || '', VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), VITE_SERVER_PORT: String(PORT), PORT: String(PORT), }, diff --git a/e2e/react-router/basic-file-based/public/external.html b/e2e/react-router/basic-file-based/public/external.html new file mode 100644 index 0000000000..3b4062b778 --- /dev/null +++ b/e2e/react-router/basic-file-based/public/external.html @@ -0,0 +1,9 @@ + + + + External destination + + + Hello World + + diff --git a/e2e/react-router/basic-file-based/src/main.tsx b/e2e/react-router/basic-file-based/src/main.tsx index f16505bf21..d6a5aef382 100644 --- a/e2e/react-router/basic-file-based/src/main.tsx +++ b/e2e/react-router/basic-file-based/src/main.tsx @@ -27,9 +27,7 @@ const router = createRouter({ rewrite: { output: ({ url }) => { if (url.pathname === '/document-navigation-target') { - return new URL( - `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}/`, - ) + return new URL(`http://127.0.0.1:${window.location.port}/external.html`) } return url }, diff --git a/e2e/react-router/basic-file-based/src/posts.tsx b/e2e/react-router/basic-file-based/src/posts.tsx index ae7142c5b6..97c96d77eb 100644 --- a/e2e/react-router/basic-file-based/src/posts.tsx +++ b/e2e/react-router/basic-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/basic-file-based/src/routes/document-navigation.tsx b/e2e/react-router/basic-file-based/src/routes/document-navigation.tsx index 65c43d8809..66c2b704d1 100644 --- a/e2e/react-router/basic-file-based/src/routes/document-navigation.tsx +++ b/e2e/react-router/basic-file-based/src/routes/document-navigation.tsx @@ -5,7 +5,7 @@ export const Route = createFileRoute('/document-navigation')({ component: DocumentNavigation, }) -const adminHref = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}/` +const adminHref = `http://127.0.0.1:${window.location.port}/external.html` function DocumentNavigation() { const navigate = Route.useNavigate() diff --git a/e2e/react-router/basic-file-based/tests/app.spec.ts b/e2e/react-router/basic-file-based/tests/app.spec.ts index ae87d350ce..bd9c365484 100644 --- a/e2e/react-router/basic-file-based/tests/app.spec.ts +++ b/e2e/react-router/basic-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' test.beforeEach(async ({ page }) => { diff --git a/e2e/react-router/basic-file-based/tests/document-navigation.spec.ts b/e2e/react-router/basic-file-based/tests/document-navigation.spec.ts index 80cb110e8a..c07d23bff3 100644 --- a/e2e/react-router/basic-file-based/tests/document-navigation.spec.ts +++ b/e2e/react-router/basic-file-based/tests/document-navigation.spec.ts @@ -1,9 +1,11 @@ -import { expect, test } from '@playwright/test' -import { getDummyServerPort } from '@tanstack/router-e2e-utils' +import { expect } from '@playwright/test' +import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from '../package.json' with { type: 'json' } -const externalPort = await getDummyServerPort(packageJson.name) -const adminHref = `http://localhost:${externalPort}/` +const appPort = await getTestServerPort( + process.env.E2E_PORT_KEY ?? packageJson.name, +) +const adminHref = `http://127.0.0.1:${appPort}/external.html` for (const role of ['button', 'link'] as const) { for (const { name, href, replace } of [ @@ -24,7 +26,7 @@ for (const role of ['button', 'link'] as const) { await page.goto('/') await page.goto('/document-navigation') const historyLength = await page.evaluate(() => window.history.length) - const response = page.waitForResponse(href.split('#')[0]!) + const response = page.waitForResponse(href.split('#')[0]) const control = page.getByRole(role, { name, exact: true }) if (role === 'link') { diff --git a/e2e/react-router/basic-file-based/tests/fullpath-types.spec.ts b/e2e/react-router/basic-file-based/tests/fullpath-types.spec.ts index d1bd9c1c41..8f4df9f966 100644 --- a/e2e/react-router/basic-file-based/tests/fullpath-types.spec.ts +++ b/e2e/react-router/basic-file-based/tests/fullpath-types.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.describe('FullPath type/runtime match (Issues #4892, #2675, #6403)', () => { test.describe('Pathless layout routes should have parent fullPath, not empty string', () => { diff --git a/e2e/react-router/basic-file-based/tests/history-blocking.spec.ts b/e2e/react-router/basic-file-based/tests/history-blocking.spec.ts index 244456a2ab..df1f863a03 100644 --- a/e2e/react-router/basic-file-based/tests/history-blocking.spec.ts +++ b/e2e/react-router/basic-file-based/tests/history-blocking.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' async function prepareDocumentTraversal(page: Page, delta: number) { diff --git a/e2e/react-router/basic-file-based/tests/hover-preload-hash.spec.ts b/e2e/react-router/basic-file-based/tests/hover-preload-hash.spec.ts index b090c2a6b7..1263faf391 100644 --- a/e2e/react-router/basic-file-based/tests/hover-preload-hash.spec.ts +++ b/e2e/react-router/basic-file-based/tests/hover-preload-hash.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import { toRuntimePath } from '@tanstack/router-e2e-utils' test('clicking hash link then hovering another link does not scroll back to hash', async ({ diff --git a/e2e/react-router/basic-file-based/tests/mask.spec.ts b/e2e/react-router/basic-file-based/tests/mask.spec.ts index 1b77760de6..d5076a5854 100644 --- a/e2e/react-router/basic-file-based/tests/mask.spec.ts +++ b/e2e/react-router/basic-file-based/tests/mask.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test('route masks transform params and expose masked pathname in the browser (react)', async ({ page, diff --git a/e2e/react-router/basic-file-based/tests/non-nested-paths.spec.ts b/e2e/react-router/basic-file-based/tests/non-nested-paths.spec.ts index dccdfd4acf..ea0e585c75 100644 --- a/e2e/react-router/basic-file-based/tests/non-nested-paths.spec.ts +++ b/e2e/react-router/basic-file-based/tests/non-nested-paths.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' const testCases: Array<{ name: string diff --git a/e2e/react-router/basic-file-based/tests/open-redirect-prevention.spec.ts b/e2e/react-router/basic-file-based/tests/open-redirect-prevention.spec.ts index 2f0fe256cd..bbb2dac7a1 100644 --- a/e2e/react-router/basic-file-based/tests/open-redirect-prevention.spec.ts +++ b/e2e/react-router/basic-file-based/tests/open-redirect-prevention.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.describe('Open redirect prevention', () => { test.describe('CRLF injection attacks', () => { diff --git a/e2e/react-router/basic-file-based/tests/params.spec.ts b/e2e/react-router/basic-file-based/tests/params.spec.ts index a867696ff8..fa0377f3ca 100644 --- a/e2e/react-router/basic-file-based/tests/params.spec.ts +++ b/e2e/react-router/basic-file-based/tests/params.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' test.beforeEach(async ({ page }) => { diff --git a/e2e/react-router/basic-file-based/tests/redirect.spec.ts b/e2e/react-router/basic-file-based/tests/redirect.spec.ts index 1845cc16a4..69c7ee6c12 100644 --- a/e2e/react-router/basic-file-based/tests/redirect.spec.ts +++ b/e2e/react-router/basic-file-based/tests/redirect.spec.ts @@ -1,17 +1,16 @@ import queryString from 'node:querystring' -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_HOST_PORT = await getDummyServerPort(packageJson.name) +const PORT = await getTestServerPort( + process.env.E2E_PORT_KEY ?? packageJson.name, +) +const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` test.describe('redirects', () => { const internalNavigationTestMatrix = combinate({ @@ -39,7 +38,7 @@ test.describe('redirects', () => { const requestPromise = new Promise((resolve) => { page.on('request', (request) => { if ( - request.url() === `http://localhost:${EXTERNAL_HOST_PORT}/posts` + request.url() === 'https://jsonplaceholder.typicode.com/posts' ) { requestHappened = true resolve() @@ -108,7 +107,7 @@ test.describe('redirects', () => { await page.waitForLoadState('networkidle') const q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + externalHost: `${EXTERNAL_ORIGIN}/`, }) if (scenario === 'navigate') { @@ -118,7 +117,7 @@ test.describe('redirects', () => { await page.goto(`/redirect/external/via-${thrower}?${q}`) } - const url = `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) expect(page.url()).toBe(url) @@ -184,7 +183,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + externalHost: `${EXTERNAL_ORIGIN}/`, }) if (scenario === 'navigate') { @@ -197,7 +196,7 @@ test.describe('redirects', () => { ) } - const url = `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) expect(page.url()).toBe(url) }) @@ -254,7 +253,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + externalHost: `${EXTERNAL_ORIGIN}/`, }) if (scenario === 'navigate') { @@ -267,7 +266,7 @@ test.describe('redirects', () => { ) } - const url = `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) expect(page.url()).toBe(url) }) diff --git a/e2e/react-router/basic-file-based/tests/relative.spec.ts b/e2e/react-router/basic-file-based/tests/relative.spec.ts index 4850d3630d..7aa5f0b84b 100644 --- a/e2e/react-router/basic-file-based/tests/relative.spec.ts +++ b/e2e/react-router/basic-file-based/tests/relative.spec.ts @@ -1,12 +1,14 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' -import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = await getTestServerPort(packageJson.name) +const PORT = await getTestServerPort( + process.env.E2E_PORT_KEY ?? packageJson.name, +) test.describe('relative_routing', () => { const internalNavigationTestMatrix = combinate({ diff --git a/e2e/react-router/basic-file-based/tests/scroll-into-view.spec.ts b/e2e/react-router/basic-file-based/tests/scroll-into-view.spec.ts index d14c2d156b..68dfededc2 100644 --- a/e2e/react-router/basic-file-based/tests/scroll-into-view.spec.ts +++ b/e2e/react-router/basic-file-based/tests/scroll-into-view.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' const anchors = { diff --git a/e2e/react-router/basic-file-based/tests/search-params.spec.ts b/e2e/react-router/basic-file-based/tests/search-params.spec.ts index d6307cbcf8..a99488a47a 100644 --- a/e2e/react-router/basic-file-based/tests/search-params.spec.ts +++ b/e2e/react-router/basic-file-based/tests/search-params.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.describe('/search-params/default', () => { test('Directly visiting the route without search param set', async ({ diff --git a/e2e/react-router/basic-file-based/tests/setup/global.setup.ts b/e2e/react-router/basic-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/basic-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/basic-file-based/tests/setup/global.teardown.ts b/e2e/react-router/basic-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/basic-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/basic-react-query-file-based/playwright.config.ts b/e2e/react-router/basic-react-query-file-based/playwright.config.ts index f3083ff8b6..d88e7ee048 100644 --- a/e2e/react-router/basic-react-query-file-based/playwright.config.ts +++ b/e2e/react-router/basic-react-query-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -17,15 +13,13 @@ export default defineConfig({ workers: 1, reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/basic-react-query-file-based/src/posts.tsx b/e2e/react-router/basic-react-query-file-based/src/posts.tsx index 1becc2c242..1f6cb8e308 100644 --- a/e2e/react-router/basic-react-query-file-based/src/posts.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/posts.tsx @@ -8,11 +8,7 @@ export type PostType = { export class PostNotFoundError extends Error {} -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/basic-react-query-file-based/tests/app.spec.ts b/e2e/react-router/basic-react-query-file-based/tests/app.spec.ts index d80e8dada5..2b42d6d589 100644 --- a/e2e/react-router/basic-react-query-file-based/tests/app.spec.ts +++ b/e2e/react-router/basic-react-query-file-based/tests/app.spec.ts @@ -1,24 +1,23 @@ -import { expect, test } from '@playwright/test' -import { getDummyServerPort } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') }) -test('GetPosts', async () => { - const port = await getDummyServerPort(packageJson.name) - const res = await fetch(`http://localhost:${port}/posts`) - - expect(res.status).toBe(200) - - const posts = await res.json() - +test('GetPosts with networking disabled', async ({ page, context }) => { + await page.goto('about:blank') + await context.setOffline(true) + const { status, posts, post } = await page.evaluate(async () => { + const response = await fetch('https://jsonplaceholder.typicode.com/posts') + const posts = await response.json() + const post = await fetch( + 'https://jsonplaceholder.typicode.com/posts/1', + ).then((r) => r.json()) + return { status: response.status, posts, post } + }) + expect(status).toBe(200) expect(posts.length).toBeGreaterThan(0) - - const postRes = await fetch(`http://localhost:${port}/posts/1`) - expect(postRes.status).toBe(200) - const post = await postRes.json() expect(post).toEqual(posts[0]) }) diff --git a/e2e/react-router/basic-react-query-file-based/tests/setup/global.setup.ts b/e2e/react-router/basic-react-query-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/basic-react-query-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/basic-react-query-file-based/tests/setup/global.teardown.ts b/e2e/react-router/basic-react-query-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/basic-react-query-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/basic-react-query/playwright.config.ts b/e2e/react-router/basic-react-query/playwright.config.ts index ab42c7c607..e7e4795203 100644 --- a/e2e/react-router/basic-react-query/playwright.config.ts +++ b/e2e/react-router/basic-react-query/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/basic-react-query/src/posts.ts b/e2e/react-router/basic-react-query/src/posts.ts index 5e2a2d3aa3..ffc5a274b7 100644 --- a/e2e/react-router/basic-react-query/src/posts.ts +++ b/e2e/react-router/basic-react-query/src/posts.ts @@ -9,11 +9,7 @@ type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/react-router/basic-react-query/tests/app.spec.ts b/e2e/react-router/basic-react-query/tests/app.spec.ts index 3e5a69ccaa..fbf093cd51 100644 --- a/e2e/react-router/basic-react-query/tests/app.spec.ts +++ b/e2e/react-router/basic-react-query/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-react-query/tests/setup/global.setup.ts b/e2e/react-router/basic-react-query/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/basic-react-query/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(packageJson.name) -} diff --git a/e2e/react-router/basic-react-query/tests/setup/global.teardown.ts b/e2e/react-router/basic-react-query/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/basic-react-query/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(packageJson.name) -} diff --git a/e2e/react-router/basic-virtual-file-based/playwright.config.ts b/e2e/react-router/basic-virtual-file-based/playwright.config.ts index c5de6b5611..e7e4795203 100644 --- a/e2e/react-router/basic-virtual-file-based/playwright.config.ts +++ b/e2e/react-router/basic-virtual-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -22,11 +18,8 @@ export default defineConfig({ baseURL, }, - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/basic-virtual-file-based/src/posts.tsx b/e2e/react-router/basic-virtual-file-based/src/posts.tsx index 01831e335c..cc3cb0f9c8 100644 --- a/e2e/react-router/basic-virtual-file-based/src/posts.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/basic-virtual-file-based/tests/app.spec.ts b/e2e/react-router/basic-virtual-file-based/tests/app.spec.ts index 3e5a69ccaa..fbf093cd51 100644 --- a/e2e/react-router/basic-virtual-file-based/tests/app.spec.ts +++ b/e2e/react-router/basic-virtual-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-virtual-file-based/tests/setup/global.setup.ts b/e2e/react-router/basic-virtual-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/basic-virtual-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/basic-virtual-file-based/tests/setup/global.teardown.ts b/e2e/react-router/basic-virtual-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/basic-virtual-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/react-router/basic-virtual-named-export-config-file-based/playwright.config.ts index ab42c7c607..e7e4795203 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/posts.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/posts.tsx index ae7142c5b6..97c96d77eb 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/posts.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts b/e2e/react-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts index 0aedada786..7d2074182f 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts b/e2e/react-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts b/e2e/react-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/basic/playwright.config.ts b/e2e/react-router/basic/playwright.config.ts index 22c9bdcd7e..e7e4795203 100644 --- a/e2e/react-router/basic/playwright.config.ts +++ b/e2e/react-router/basic/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/basic/src/posts.ts b/e2e/react-router/basic/src/posts.ts index e859645746..f72d16fee3 100644 --- a/e2e/react-router/basic/src/posts.ts +++ b/e2e/react-router/basic/src/posts.ts @@ -8,11 +8,7 @@ type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/react-router/basic/tests/app.spec.ts b/e2e/react-router/basic/tests/app.spec.ts index ec0e24d8a4..5038f79098 100644 --- a/e2e/react-router/basic/tests/app.spec.ts +++ b/e2e/react-router/basic/tests/app.spec.ts @@ -1,8 +1,10 @@ -import { expect, test } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' +import { expect } from '@playwright/test' +import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from '../package.json' with { type: 'json' } -const PORT = await getTestServerPort(packageJson.name) +const PORT = await getTestServerPort( + process.env.E2E_PORT_KEY ?? packageJson.name, +) test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic/tests/params.spec.ts b/e2e/react-router/basic/tests/params.spec.ts index ac18f39864..f673138047 100644 --- a/e2e/react-router/basic/tests/params.spec.ts +++ b/e2e/react-router/basic/tests/params.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.describe('params operations + prefix/suffix', () => { test.beforeEach(async ({ page }) => { diff --git a/e2e/react-router/basic/tests/setup/global.setup.ts b/e2e/react-router/basic/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/basic/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(packageJson.name) -} diff --git a/e2e/react-router/basic/tests/setup/global.teardown.ts b/e2e/react-router/basic/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/basic/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(packageJson.name) -} diff --git a/e2e/react-router/escaped-special-strings/playwright.config.ts b/e2e/react-router/escaped-special-strings/playwright.config.ts index 6e4e1d7703..0637880451 100644 --- a/e2e/react-router/escaped-special-strings/playwright.config.ts +++ b/e2e/react-router/escaped-special-strings/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` const command = `pnpm build && pnpm preview --port ${PORT}` @@ -21,9 +17,6 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, @@ -38,7 +31,6 @@ export default defineConfig({ MODE: process.env.MODE || '', VITE_MODE: process.env.MODE || '', VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), VITE_SERVER_PORT: String(PORT), PORT: String(PORT), }, diff --git a/e2e/react-router/escaped-special-strings/tests/setup/global.setup.ts b/e2e/react-router/escaped-special-strings/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/escaped-special-strings/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(packageJson.name) -} diff --git a/e2e/react-router/escaped-special-strings/tests/setup/global.teardown.ts b/e2e/react-router/escaped-special-strings/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/escaped-special-strings/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(packageJson.name) -} diff --git a/e2e/react-router/generator-cli-only/playwright.config.ts b/e2e/react-router/generator-cli-only/playwright.config.ts index c9d9a76ae7..be44f419e9 100644 --- a/e2e/react-router/generator-cli-only/playwright.config.ts +++ b/e2e/react-router/generator-cli-only/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/generator-cli-only/src/posts.ts b/e2e/react-router/generator-cli-only/src/posts.ts index e859645746..f72d16fee3 100644 --- a/e2e/react-router/generator-cli-only/src/posts.ts +++ b/e2e/react-router/generator-cli-only/src/posts.ts @@ -8,11 +8,7 @@ type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/react-router/generator-cli-only/tests/app.spec.ts b/e2e/react-router/generator-cli-only/tests/app.spec.ts index 5a83a314f2..ced5ac9310 100644 --- a/e2e/react-router/generator-cli-only/tests/app.spec.ts +++ b/e2e/react-router/generator-cli-only/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/generator-cli-only/tests/setup/global.setup.ts b/e2e/react-router/generator-cli-only/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/generator-cli-only/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(packageJson.name) -} diff --git a/e2e/react-router/generator-cli-only/tests/setup/global.teardown.ts b/e2e/react-router/generator-cli-only/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/generator-cli-only/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(packageJson.name) -} diff --git a/e2e/react-router/js-only-file-based/playwright.config.ts b/e2e/react-router/js-only-file-based/playwright.config.ts index 4f93bc1413..ccf3853685 100644 --- a/e2e/react-router/js-only-file-based/playwright.config.ts +++ b/e2e/react-router/js-only-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -18,16 +14,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/js-only-file-based/src/posts.js b/e2e/react-router/js-only-file-based/src/posts.js index 979e5e381c..36c1c281f6 100644 --- a/e2e/react-router/js-only-file-based/src/posts.js +++ b/e2e/react-router/js-only-file-based/src/posts.js @@ -2,11 +2,7 @@ import axios from 'redaxios' export class NotFoundError extends Error {} -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/react-router/js-only-file-based/tests/app.spec.ts b/e2e/react-router/js-only-file-based/tests/app.spec.ts index 5a83a314f2..ced5ac9310 100644 --- a/e2e/react-router/js-only-file-based/tests/app.spec.ts +++ b/e2e/react-router/js-only-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/js-only-file-based/tests/setup/global.setup.ts b/e2e/react-router/js-only-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/js-only-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/js-only-file-based/tests/setup/global.teardown.ts b/e2e/react-router/js-only-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/js-only-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/rspack-basic-file-based/playwright.config.ts b/e2e/react-router/rspack-basic-file-based/playwright.config.ts index decceaef2f..a3644d1a62 100644 --- a/e2e/react-router/rspack-basic-file-based/playwright.config.ts +++ b/e2e/react-router/rspack-basic-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/rspack-basic-file-based/src/posts.tsx b/e2e/react-router/rspack-basic-file-based/src/posts.tsx index a1225b7fe7..97c96d77eb 100644 --- a/e2e/react-router/rspack-basic-file-based/src/posts.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.PUBLIC_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.PUBLIC_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/rspack-basic-file-based/tests/app.spec.ts b/e2e/react-router/rspack-basic-file-based/tests/app.spec.ts index 10beff655f..d230263bfe 100644 --- a/e2e/react-router/rspack-basic-file-based/tests/app.spec.ts +++ b/e2e/react-router/rspack-basic-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/rspack-basic-file-based/tests/setup/global.setup.ts b/e2e/react-router/rspack-basic-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/rspack-basic-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/rspack-basic-file-based/tests/setup/global.teardown.ts b/e2e/react-router/rspack-basic-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/rspack-basic-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts index bf3adc082c..e66d2ff339 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx index b196982420..cc3cb0f9c8 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.PUBLIC_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.PUBLIC_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts index a689f459e3..8b808782f6 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/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(packageJson.name) -} diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts b/e2e/react-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts index 972124647c..b7e0b2525f 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts @@ -1,6 +1,5 @@ import { defineConfig, devices } from '@playwright/test' import { - getDummyServerPort, getTestServerPort, resolveRuntimeSuffix, } from '@tanstack/router-e2e-utils' @@ -9,7 +8,6 @@ import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort( packageJson.name + `-${resolveRuntimeSuffix('browser')}`, ) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -21,16 +19,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm build && VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm build && VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts b/e2e/react-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts index a6fa77afbf..8ec5160a3c 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts @@ -1,6 +1,5 @@ import { defineConfig, devices } from '@playwright/test' import { - getDummyServerPort, getTestServerPort, resolveRuntimeSuffix, } from '@tanstack/router-e2e-utils' @@ -9,7 +8,6 @@ import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort( packageJson.name + `-${resolveRuntimeSuffix('hash')}`, ) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -21,16 +19,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/posts.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/posts.tsx index e45ef52969..c4a2d0dcca 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/posts.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/posts.tsx @@ -10,11 +10,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export class PostNotFoundError extends Error {} diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/tests/app.spec.ts b/e2e/react-router/scroll-restoration-sandbox-vite/tests/app.spec.ts index 9c2d944dd5..e396c28686 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/tests/app.spec.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import { linkOptions } from '@tanstack/react-router' import { toRuntimePath } from '@tanstack/router-e2e-utils' diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/tests/issue-7040.repro.spec.ts b/e2e/react-router/scroll-restoration-sandbox-vite/tests/issue-7040.repro.spec.ts index db335f8e2e..9fb0742292 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/tests/issue-7040.repro.spec.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/tests/issue-7040.repro.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' import { toRuntimePath } from '@tanstack/router-e2e-utils' diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts b/e2e/react-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/scroll-restoration-sandbox-vite/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(packageJson.name) -} diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts b/e2e/react-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/scroll-restoration-sandbox-vite/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(packageJson.name) -} diff --git a/e2e/react-router/view-transitions/playwright.config.ts b/e2e/react-router/view-transitions/playwright.config.ts index c5de6b5611..e7e4795203 100644 --- a/e2e/react-router/view-transitions/playwright.config.ts +++ b/e2e/react-router/view-transitions/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -22,11 +18,8 @@ export default defineConfig({ baseURL, }, - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-router/view-transitions/tests/app.spec.ts b/e2e/react-router/view-transitions/tests/app.spec.ts index 472bd6ed0b..6c1ccf1a6e 100644 --- a/e2e/react-router/view-transitions/tests/app.spec.ts +++ b/e2e/react-router/view-transitions/tests/app.spec.ts @@ -1,4 +1,4 @@ -import { test } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/view-transitions/tests/setup/global.setup.ts b/e2e/react-router/view-transitions/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-router/view-transitions/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(packageJson.name) -} diff --git a/e2e/react-router/view-transitions/tests/setup/global.teardown.ts b/e2e/react-router/view-transitions/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-router/view-transitions/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(packageJson.name) -} diff --git a/e2e/react-start/basic-cloudflare/playwright.config.ts b/e2e/react-start/basic-cloudflare/playwright.config.ts index a545dff891..99b9f3460a 100644 --- a/e2e/react-start/basic-cloudflare/playwright.config.ts +++ b/e2e/react-start/basic-cloudflare/playwright.config.ts @@ -14,9 +14,6 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, diff --git a/e2e/react-start/basic-cloudflare/tests/setup/global.setup.ts b/e2e/react-start/basic-cloudflare/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-start/basic-cloudflare/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(packageJson.name) -} diff --git a/e2e/react-start/basic-cloudflare/tests/setup/global.teardown.ts b/e2e/react-start/basic-cloudflare/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-start/basic-cloudflare/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(packageJson.name) -} diff --git a/e2e/react-start/basic-react-query/playwright.config.ts b/e2e/react-start/basic-react-query/playwright.config.ts index fd2150e435..6fc8d3cc63 100644 --- a/e2e/react-start/basic-react-query/playwright.config.ts +++ b/e2e/react-start/basic-react-query/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -18,19 +14,19 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, + }, }, projects: [ diff --git a/e2e/react-start/basic-react-query/src/routes/api.users.ts b/e2e/react-start/basic-react-query/src/routes/api.users.ts index bb37c6e68d..924c5b6860 100644 --- a/e2e/react-start/basic-react-query/src/routes/api.users.ts +++ b/e2e/react-start/basic-react-query/src/routes/api.users.ts @@ -2,11 +2,7 @@ import { createFileRoute } from '@tanstack/react-router' import axios from 'redaxios' import type { User } from '../utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/api/users')({ server: { diff --git a/e2e/react-start/basic-react-query/src/routes/api/users.$id.ts b/e2e/react-start/basic-react-query/src/routes/api/users.$id.ts index e11e039652..febea309ea 100644 --- a/e2e/react-start/basic-react-query/src/routes/api/users.$id.ts +++ b/e2e/react-start/basic-react-query/src/routes/api/users.$id.ts @@ -2,11 +2,7 @@ import { createFileRoute } from '@tanstack/react-router' import axios from 'redaxios' import type { User } from '../../utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/api/users/$id')({ server: { diff --git a/e2e/react-start/basic-react-query/src/utils/posts.tsx b/e2e/react-start/basic-react-query/src/utils/posts.tsx index 3fd16db69a..abb6e95b92 100644 --- a/e2e/react-start/basic-react-query/src/utils/posts.tsx +++ b/e2e/react-start/basic-react-query/src/utils/posts.tsx @@ -9,11 +9,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPosts = createServerFn({ method: 'GET' }).handler( async () => { diff --git a/e2e/react-start/basic-react-query/tests/setup/global.setup.ts b/e2e/react-start/basic-react-query/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-start/basic-react-query/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(packageJson.name) -} diff --git a/e2e/react-start/basic-react-query/tests/setup/global.teardown.ts b/e2e/react-start/basic-react-query/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-start/basic-react-query/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(packageJson.name) -} diff --git a/e2e/react-start/basic/package.json b/e2e/react-start/basic/package.json index f0a15aa274..a729a0d532 100644 --- a/e2e/react-start/basic/package.json +++ b/e2e/react-start/basic/package.json @@ -14,8 +14,6 @@ "preview": "vite preview", "preview:rsbuild": "rsbuild preview", "start": "node server.js", - "test:e2e:startDummyServer": "node -e 'import(\"./tests/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"./tests/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"./tests/setup/global.teardown.ts\").then(m => m.default())'", "test:e2e:local": "playwright test --project=chromium" }, "dependencies": { @@ -63,7 +61,10 @@ }, { "toolchain": "vite", - "mode": "prerender" + "mode": "prerender", + "env": { + "NODE_OPTIONS": "--import=@tanstack/router-e2e-utils/mock-api" + } }, { "toolchain": "vite", @@ -87,7 +88,10 @@ }, { "toolchain": "rsbuild", - "mode": "prerender" + "mode": "prerender", + "env": { + "NODE_OPTIONS": "--import=@tanstack/router-e2e-utils/mock-api" + } }, { "toolchain": "rsbuild", diff --git a/e2e/react-start/basic/playwright.config.ts b/e2e/react-start/basic/playwright.config.ts index db07d18608..8ba8953e9f 100644 --- a/e2e/react-start/basic/playwright.config.ts +++ b/e2e/react-start/basic/playwright.config.ts @@ -1,9 +1,6 @@ import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const mode = process.env.MODE ?? 'ssr' @@ -15,7 +12,6 @@ if (process.env.TEST_WORKER_INDEX === undefined) { for (const portFile of [ `port-${e2ePortKey}.txt`, `port-${e2ePortKey}_start.txt`, - `port-${e2ePortKey}-external.txt`, ]) { fs.rmSync(portFile, { force: true }) } @@ -23,16 +19,12 @@ if (process.env.TEST_WORKER_INDEX === undefined) { const PORT = await getTestServerPort(e2ePortKey) const START_PORT = await getTestServerPort(`${e2ePortKey}_start`) -const EXTERNAL_PORT = await getDummyServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` const previewCommand = toolchain === 'rsbuild' - ? `pnpm preview:rsbuild --port ${PORT}` - : `pnpm preview --outDir ${distDir} --port ${PORT}` -const commandByMode = - mode === 'preview' - ? `pnpm run test:e2e:startDummyServer && ${previewCommand}` - : `pnpm run test:e2e:startDummyServer && pnpm start` + ? `pnpm preview:rsbuild --host 0.0.0.0 --port ${PORT}` + : `pnpm preview --host 0.0.0.0 --outDir ${distDir} --port ${PORT}` +const commandByMode = mode === 'preview' ? `${previewCommand}` : `pnpm start` /** * See https://playwright.dev/docs/test-configuration. */ @@ -41,8 +33,6 @@ export default defineConfig({ workers: 1, reporter: [['line']], - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, @@ -54,10 +44,10 @@ export default defineConfig({ reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, MODE: mode, E2E_TOOLCHAIN: toolchain, VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), VITE_SERVER_PORT: String(PORT), START_PORT: String(START_PORT), PORT: String(PORT), diff --git a/e2e/react-start/basic/src/routes/api.users.ts b/e2e/react-start/basic/src/routes/api.users.ts index 9e055549ef..d6fff7c5af 100644 --- a/e2e/react-start/basic/src/routes/api.users.ts +++ b/e2e/react-start/basic/src/routes/api.users.ts @@ -3,18 +3,14 @@ import axios from 'redaxios' import type { User } from '~/utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} - export const Route = createFileRoute('/api/users')({ server: { handlers: { GET: async ({ request }) => { console.info('Fetching users... @', request.url) - const res = await axios.get>(`${queryURL}/users`) + const res = await axios.get>( + 'https://jsonplaceholder.typicode.com/users', + ) const list = res.data.slice(0, 10) diff --git a/e2e/react-start/basic/src/routes/api/users.$id.ts b/e2e/react-start/basic/src/routes/api/users.$id.ts index ac665381f1..797dffb637 100644 --- a/e2e/react-start/basic/src/routes/api/users.$id.ts +++ b/e2e/react-start/basic/src/routes/api/users.$id.ts @@ -2,19 +2,15 @@ import { createFileRoute } from '@tanstack/react-router' import axios from 'redaxios' import type { User } from '~/utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} - export const Route = createFileRoute('/api/users/$id')({ server: { handlers: { GET: async ({ request, params }) => { console.info(`Fetching users by id=${params.id}... @`, request.url) try { - const res = await axios.get(`${queryURL}/users/` + params.id) + const res = await axios.get( + `https://jsonplaceholder.typicode.com/users/${params.id}`, + ) return Response.json({ id: res.data.id, diff --git a/e2e/react-start/basic/src/utils/posts.tsx b/e2e/react-start/basic/src/utils/posts.tsx index 4cc5dcc4c6..9fdff27673 100644 --- a/e2e/react-start/basic/src/utils/posts.tsx +++ b/e2e/react-start/basic/src/utils/posts.tsx @@ -8,18 +8,12 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} - export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) .handler(async ({ data: postId }) => { console.info(`Fetching post with id ${postId}...`) const post = await axios - .get(`${queryURL}/posts/${postId}`) + .get(`https://jsonplaceholder.typicode.com/posts/${postId}`) .then((r) => r.data) .catch((err) => { console.error(err) @@ -36,7 +30,7 @@ export const fetchPosts = createServerFn({ method: 'GET' }).handler( async () => { console.info('Fetching posts...') return axios - .get>(`${queryURL}/posts`) + .get>('https://jsonplaceholder.typicode.com/posts') .then((r) => r.data.slice(0, 10)) }, ) diff --git a/e2e/react-start/basic/src/utils/users.tsx b/e2e/react-start/basic/src/utils/users.tsx index 46be4b1580..7ba645b383 100644 --- a/e2e/react-start/basic/src/utils/users.tsx +++ b/e2e/react-start/basic/src/utils/users.tsx @@ -3,7 +3,3 @@ export type User = { name: string email: string } - -const PORT = process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/react-start/basic/tests/fixture-api.spec.ts b/e2e/react-start/basic/tests/fixture-api.spec.ts new file mode 100644 index 0000000000..6c9b26dc4c --- /dev/null +++ b/e2e/react-start/basic/tests/fixture-api.spec.ts @@ -0,0 +1,11 @@ +import { expect, test } from '@playwright/test' + +test('server API receives canned users without a fixture listener', async ({ + request, +}) => { + const response = await request.get('/api/users') + expect(response.ok()).toBe(true) + const users = await response.json() + expect(users).toHaveLength(10) + expect(users[0]).toMatchObject({ id: 1, name: 'Leanne Graham' }) +}) diff --git a/e2e/react-start/basic/tests/redirect.spec.ts b/e2e/react-start/basic/tests/redirect.spec.ts index 34ba7b6ea9..14567d89ce 100644 --- a/e2e/react-start/basic/tests/redirect.spec.ts +++ b/e2e/react-start/basic/tests/redirect.spec.ts @@ -1,20 +1,18 @@ import queryString from 'node:querystring' -import { expect, type Page } from '@playwright/test' +import { expect } from '@playwright/test' +import { getTestServerPort, test } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' -import { - getDummyServerPort, - getTestServerPort, - test, -} from '@tanstack/router-e2e-utils' -import { getE2EPortKey } from './utils/getE2EPortKey.ts' +import type { Page } from '@playwright/test' +import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const e2ePortKey = getE2EPortKey() -const PORT = await getTestServerPort(e2ePortKey) +const PORT = await getTestServerPort( + process.env.E2E_PORT_KEY ?? packageJson.name, +) -const EXTERNAL_HOST_PORT = await getDummyServerPort(e2ePortKey) +const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` const POSTS_URL = `http://localhost:${PORT}/posts` async function waitForRouterIdle(page: Page) { @@ -111,7 +109,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + externalHost: `${EXTERNAL_ORIGIN}/`, }) if (scenario === 'navigate') { @@ -124,7 +122,7 @@ test.describe('redirects', () => { await page.goto(`/redirect/external/via-${thrower}?${q}`) } - const url = `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) expect(page.url()).toBe(url) @@ -147,7 +145,7 @@ test.describe('redirects', () => { }) => { let fullPageLoad = false const q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + externalHost: `${EXTERNAL_ORIGIN}/`, reloadDocument, }) @@ -170,10 +168,7 @@ test.describe('redirects', () => { await page.goto(`/redirect/${target}/serverFn/via-${thrower}?${q}`) } - const url = - target === 'internal' - ? POSTS_URL - : `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = target === 'internal' ? POSTS_URL : `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) @@ -202,7 +197,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + externalHost: `${EXTERNAL_ORIGIN}/`, reloadDocument, }) @@ -219,10 +214,7 @@ test.describe('redirects', () => { await button.click() - const url = - target === 'internal' - ? POSTS_URL - : `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = target === 'internal' ? POSTS_URL : `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) expect(page.url()).toBe(url) if (target === 'internal') { diff --git a/e2e/react-start/basic/tests/setup/global.setup.ts b/e2e/react-start/basic/tests/setup/global.setup.ts deleted file mode 100644 index cd38c35885..0000000000 --- a/e2e/react-start/basic/tests/setup/global.setup.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' -import { getE2EPortKey } from '../utils/getE2EPortKey.ts' - -export default async function setup() { - await e2eStartDummyServer(getE2EPortKey()) -} diff --git a/e2e/react-start/basic/tests/setup/global.teardown.ts b/e2e/react-start/basic/tests/setup/global.teardown.ts deleted file mode 100644 index 36e5c92858..0000000000 --- a/e2e/react-start/basic/tests/setup/global.teardown.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' -import { getE2EPortKey } from '../utils/getE2EPortKey.ts' - -export default async function teardown() { - try { - await e2eStopDummyServer(getE2EPortKey()) - } catch {} -} diff --git a/e2e/react-start/basic/tests/setup/waitForDummyServer.ts b/e2e/react-start/basic/tests/setup/waitForDummyServer.ts deleted file mode 100644 index 88c18fd79e..0000000000 --- a/e2e/react-start/basic/tests/setup/waitForDummyServer.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { getDummyServerPort } from '@tanstack/router-e2e-utils' -import { getE2EPortKey } from '../utils/getE2EPortKey.ts' - -const timeoutMs = 10_000 -const retryIntervalMs = 100 - -export default async function waitForDummyServer() { - const port = await getDummyServerPort(getE2EPortKey()) - const deadline = Date.now() + timeoutMs - - while (Date.now() < deadline) { - try { - const response = await fetch(`http://localhost:${port}/`) - - if (response.ok) { - return - } - } catch {} - - await new Promise((resolve) => setTimeout(resolve, retryIntervalMs)) - } - - throw new Error(`Timed out waiting for dummy server on port ${port}`) -} diff --git a/e2e/react-start/css-modules/playwright.config.ts b/e2e/react-start/css-modules/playwright.config.ts index 644798ca99..a1cb566e5d 100644 --- a/e2e/react-start/css-modules/playwright.config.ts +++ b/e2e/react-start/css-modules/playwright.config.ts @@ -21,9 +21,6 @@ export default defineConfig({ workers: 1, reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, diff --git a/e2e/react-start/css-modules/tests/setup/global.setup.ts b/e2e/react-start/css-modules/tests/setup/global.setup.ts deleted file mode 100644 index e8879c0165..0000000000 --- a/e2e/react-start/css-modules/tests/setup/global.setup.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { - e2eStartDummyServer, - getTestServerPort, - preOptimizeDevServer, - waitForServer, -} from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } - -export default async function setup() { - await e2eStartDummyServer(packageJson.name) - - if (process.env.MODE !== 'dev') return - - const viteConfig = process.env.VITE_CONFIG // 'nitro' | 'basepath' | 'cloudflare' | undefined - const port = await getTestServerPort( - viteConfig ? `${packageJson.name}-${viteConfig}` : packageJson.name, - ) - const basePath = viteConfig === 'basepath' ? '/my-app' : '' - const baseURL = `http://localhost:${port}${basePath}` - - await waitForServer(baseURL) - await preOptimizeDevServer({ - baseURL, - readyTestId: 'global-styled', - warmup: async (page) => { - await page.goto(`${baseURL}/modules`, { waitUntil: 'domcontentloaded' }) - await page.getByTestId('module-card').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.goto(`${baseURL}/sass-mixin`, { - waitUntil: 'domcontentloaded', - }) - await page.getByTestId('mixin-styled').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.goto(`${baseURL}/quotes`, { waitUntil: 'domcontentloaded' }) - await page.getByTestId('quote-styled').waitFor({ state: 'visible' }) - await page.getByTestId('after-quote-styled').waitFor({ - state: 'visible', - }) - await page.waitForLoadState('networkidle') - - await page.goto(`${baseURL}/`, { waitUntil: 'domcontentloaded' }) - await page.getByTestId('global-styled').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.getByTestId('nav-modules').click() - await page.waitForURL('**/modules') - await page.getByTestId('module-card').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.getByTestId('nav-home').click() - await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) - await page.getByTestId('global-styled').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - }, - }) -} diff --git a/e2e/react-start/css-modules/tests/setup/global.teardown.ts b/e2e/react-start/css-modules/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-start/css-modules/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(packageJson.name) -} diff --git a/e2e/react-start/custom-basepath/playwright.config.ts b/e2e/react-start/custom-basepath/playwright.config.ts index 5095425f47..9f14b88896 100644 --- a/e2e/react-start/custom-basepath/playwright.config.ts +++ b/e2e/react-start/custom-basepath/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}/custom/basepath` /** @@ -18,19 +14,19 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, + }, }, projects: [ diff --git a/e2e/react-start/custom-basepath/src/routes/api.users.ts b/e2e/react-start/custom-basepath/src/routes/api.users.ts index 9e055549ef..6fc8cde830 100644 --- a/e2e/react-start/custom-basepath/src/routes/api.users.ts +++ b/e2e/react-start/custom-basepath/src/routes/api.users.ts @@ -3,11 +3,7 @@ import axios from 'redaxios' import type { User } from '~/utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/api/users')({ server: { diff --git a/e2e/react-start/custom-basepath/src/routes/api/users.$id.ts b/e2e/react-start/custom-basepath/src/routes/api/users.$id.ts index 57682660fd..81c071afb5 100644 --- a/e2e/react-start/custom-basepath/src/routes/api/users.$id.ts +++ b/e2e/react-start/custom-basepath/src/routes/api/users.$id.ts @@ -2,11 +2,7 @@ import axios from 'redaxios' import type { User } from '~/utils/users' import { createFileRoute } from '@tanstack/react-router' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/api/users/$id')({ server: { diff --git a/e2e/react-start/custom-basepath/src/utils/posts.tsx b/e2e/react-start/custom-basepath/src/utils/posts.tsx index 4cc5dcc4c6..d9b98a8c9c 100644 --- a/e2e/react-start/custom-basepath/src/utils/posts.tsx +++ b/e2e/react-start/custom-basepath/src/utils/posts.tsx @@ -8,11 +8,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) diff --git a/e2e/react-start/custom-basepath/src/utils/users.tsx b/e2e/react-start/custom-basepath/src/utils/users.tsx index 46be4b1580..7ba645b383 100644 --- a/e2e/react-start/custom-basepath/src/utils/users.tsx +++ b/e2e/react-start/custom-basepath/src/utils/users.tsx @@ -3,7 +3,3 @@ export type User = { name: string email: string } - -const PORT = process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/react-start/custom-basepath/tests/setup/global.setup.ts b/e2e/react-start/custom-basepath/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-start/custom-basepath/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(packageJson.name) -} diff --git a/e2e/react-start/custom-basepath/tests/setup/global.teardown.ts b/e2e/react-start/custom-basepath/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-start/custom-basepath/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(packageJson.name) -} diff --git a/e2e/react-start/deferred-hydration/playwright.config.ts b/e2e/react-start/deferred-hydration/playwright.config.ts index 0125792d4b..5c33cd28a6 100644 --- a/e2e/react-start/deferred-hydration/playwright.config.ts +++ b/e2e/react-start/deferred-hydration/playwright.config.ts @@ -25,8 +25,6 @@ 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: isDev ? `${devCommand} --port ${PORT}` : startCommand, diff --git a/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts b/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts deleted file mode 100644 index 1117664a14..0000000000 --- a/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { - e2eStartDummyServer, - getTestServerPort, - preOptimizeDevServer, - waitForServer, -} from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } - -function getE2EPortKey() { - const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' - return process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` -} - -export default async function setup() { - if (process.env.MODE !== 'dev') return - - const e2ePortKey = getE2EPortKey() - - await e2eStartDummyServer(e2ePortKey) - - const port = await getTestServerPort(e2ePortKey) - const baseURL = `http://localhost:${port}` - - await waitForServer(baseURL) - await preOptimizeDevServer({ - baseURL, - readyTestId: 'home-heading', - warmup: async (page) => { - await page.goto(`${baseURL}/components`, { - waitUntil: 'domcontentloaded', - }) - await page.getByTestId('component-heading').waitFor({ - state: 'visible', - }) - await page.waitForLoadState('networkidle') - }, - }) -} diff --git a/e2e/react-start/deferred-hydration/tests/setup/global.teardown.ts b/e2e/react-start/deferred-hydration/tests/setup/global.teardown.ts deleted file mode 100644 index df79f50e82..0000000000 --- a/e2e/react-start/deferred-hydration/tests/setup/global.teardown.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } - -function getE2EPortKey() { - const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' - return process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` -} - -export default async function teardown() { - if (process.env.MODE !== 'dev') return - - await e2eStopDummyServer(getE2EPortKey()) -} diff --git a/e2e/react-start/dev-ssr-styles/playwright.config.ts b/e2e/react-start/dev-ssr-styles/playwright.config.ts index a1fdd7c3ef..7f263574b6 100644 --- a/e2e/react-start/dev-ssr-styles/playwright.config.ts +++ b/e2e/react-start/dev-ssr-styles/playwright.config.ts @@ -43,9 +43,6 @@ export default defineConfig({ workers: 1, reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, diff --git a/e2e/react-start/dev-ssr-styles/tests/setup/global.setup.ts b/e2e/react-start/dev-ssr-styles/tests/setup/global.setup.ts deleted file mode 100644 index 2bfd33163d..0000000000 --- a/e2e/react-start/dev-ssr-styles/tests/setup/global.setup.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { - e2eStartDummyServer, - getTestServerPort, - preOptimizeDevServer, - waitForServer, -} from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } -import { ssrStylesMode, useNitro, viteBundledDev } from '../../env' - -function getPortKey() { - let key = packageJson.name - if (ssrStylesMode !== 'default') { - key += `-${ssrStylesMode}` - } - if (useNitro) { - key += '-nitro' - } - if (viteBundledDev) { - key += '-bundled-dev' - } - return key -} - -export default async function setup() { - const portKey = getPortKey() - - await e2eStartDummyServer(portKey) - - if (process.env.MODE !== 'dev') return - - const port = await getTestServerPort(portKey) - const baseURL = `http://localhost:${port}` - - await waitForServer(baseURL) - await preOptimizeDevServer({ - baseURL, - readyTestId: 'home-heading', - }) -} diff --git a/e2e/react-start/dev-ssr-styles/tests/setup/global.teardown.ts b/e2e/react-start/dev-ssr-styles/tests/setup/global.teardown.ts deleted file mode 100644 index 0e44fca325..0000000000 --- a/e2e/react-start/dev-ssr-styles/tests/setup/global.teardown.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } -import { ssrStylesMode, useNitro, viteBundledDev } from '../../env' - -function getPortKey() { - let key = packageJson.name - if (ssrStylesMode !== 'default') { - key += `-${ssrStylesMode}` - } - if (useNitro) { - key += '-nitro' - } - if (viteBundledDev) { - key += '-bundled-dev' - } - return key -} - -export default async function teardown() { - await e2eStopDummyServer(getPortKey()) -} diff --git a/e2e/react-start/hmr/playwright.config.ts b/e2e/react-start/hmr/playwright.config.ts index c159aad328..da4abe4bee 100644 --- a/e2e/react-start/hmr/playwright.config.ts +++ b/e2e/react-start/hmr/playwright.config.ts @@ -17,9 +17,6 @@ export default defineConfig({ workers: 1, reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, diff --git a/e2e/react-start/hmr/tests/setup/global.setup.ts b/e2e/react-start/hmr/tests/setup/global.setup.ts deleted file mode 100644 index fb9aad22ae..0000000000 --- a/e2e/react-start/hmr/tests/setup/global.setup.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { - e2eStartDummyServer, - getTestServerPort, - preOptimizeDevServer, - waitForServer, -} from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } - -function getE2EPortKey() { - const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' - return process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` -} - -export default async function setup() { - const e2ePortKey = getE2EPortKey() - - await e2eStartDummyServer(e2ePortKey) - - const port = await getTestServerPort(e2ePortKey) - const baseURL = `http://localhost:${port}` - - await waitForServer(baseURL) - await preOptimizeDevServer({ - baseURL, - readyTestId: 'hydrated', - }) -} diff --git a/e2e/react-start/hmr/tests/setup/global.teardown.ts b/e2e/react-start/hmr/tests/setup/global.teardown.ts deleted file mode 100644 index e17856dd82..0000000000 --- a/e2e/react-start/hmr/tests/setup/global.teardown.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } - -function getE2EPortKey() { - const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' - return process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` -} - -export default async function teardown() { - await e2eStopDummyServer(getE2EPortKey()) -} diff --git a/e2e/react-start/rsc-deferred-hydration/playwright.config.ts b/e2e/react-start/rsc-deferred-hydration/playwright.config.ts index 10f41cd911..cbbc44cd92 100644 --- a/e2e/react-start/rsc-deferred-hydration/playwright.config.ts +++ b/e2e/react-start/rsc-deferred-hydration/playwright.config.ts @@ -11,8 +11,6 @@ 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: isDev ? 'pnpm dev:e2e' : 'pnpm build && pnpm start', diff --git a/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts b/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts deleted file mode 100644 index 3d1579ee87..0000000000 --- a/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { - e2eStartDummyServer, - getTestServerPort, - preOptimizeDevServer, - waitForServer, -} from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } - -export default async function setup() { - await e2eStartDummyServer(packageJson.name) - - if (process.env.MODE !== 'dev') return - - const port = await getTestServerPort(packageJson.name) - const baseURL = `http://localhost:${port}` - - await waitForServer(baseURL) - await preOptimizeDevServer({ - baseURL, - readyTestId: 'home-heading', - warmup: async (page) => { - for (const route of ['/server-client', '/composite', '/css']) { - await page.goto(`${baseURL}${route}`, { waitUntil: 'domcontentloaded' }) - await page.waitForLoadState('networkidle') - } - }, - }) -} diff --git a/e2e/react-start/rsc-deferred-hydration/tests/setup/global.teardown.ts b/e2e/react-start/rsc-deferred-hydration/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-start/rsc-deferred-hydration/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(packageJson.name) -} diff --git a/e2e/react-start/rsc-query/playwright.config.ts b/e2e/react-start/rsc-query/playwright.config.ts index 2cf7c1fe9b..9ce88b8a8f 100644 --- a/e2e/react-start/rsc-query/playwright.config.ts +++ b/e2e/react-start/rsc-query/playwright.config.ts @@ -10,9 +10,6 @@ export default defineConfig({ workers: 1, reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, diff --git a/e2e/react-start/rsc-query/tests/setup/global.setup.ts b/e2e/react-start/rsc-query/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-start/rsc-query/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(packageJson.name) -} diff --git a/e2e/react-start/rsc-query/tests/setup/global.teardown.ts b/e2e/react-start/rsc-query/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-start/rsc-query/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(packageJson.name) -} diff --git a/e2e/react-start/rsc-rsbuild/playwright.config.ts b/e2e/react-start/rsc-rsbuild/playwright.config.ts index 9bb7586df5..511813d8a9 100644 --- a/e2e/react-start/rsc-rsbuild/playwright.config.ts +++ b/e2e/react-start/rsc-rsbuild/playwright.config.ts @@ -1,25 +1,18 @@ import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { 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`, - ]) { + for (const portFile of [`port-${e2ePortKey}.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({ @@ -27,9 +20,6 @@ export default defineConfig({ workers: 1, reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, @@ -43,7 +33,6 @@ export default defineConfig({ PORT: String(PORT), E2E_DIST_DIR: distDir, E2E_PORT_KEY: e2ePortKey, - EXTERNAL_SERVER_URL: `http://localhost:${EXTERNAL_PORT}`, }, }, 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 3def5f6941..0000000000 --- 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 a9ad1445f7..0000000000 --- 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/playwright.config.ts b/e2e/react-start/rsc/playwright.config.ts index 9bb7586df5..be6164cf97 100644 --- a/e2e/react-start/rsc/playwright.config.ts +++ b/e2e/react-start/rsc/playwright.config.ts @@ -1,25 +1,18 @@ import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { 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`, - ]) { + for (const portFile of [`port-${e2ePortKey}.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({ @@ -27,9 +20,6 @@ export default defineConfig({ workers: 1, reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, @@ -40,10 +30,10 @@ export default defineConfig({ reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, PORT: String(PORT), E2E_DIST_DIR: distDir, E2E_PORT_KEY: e2ePortKey, - EXTERNAL_SERVER_URL: `http://localhost:${EXTERNAL_PORT}`, }, }, diff --git a/e2e/react-start/rsc/src/routes/rsc-external.tsx b/e2e/react-start/rsc/src/routes/rsc-external.tsx index d6da119b26..352f086b60 100644 --- a/e2e/react-start/rsc/src/routes/rsc-external.tsx +++ b/e2e/react-start/rsc/src/routes/rsc-external.tsx @@ -109,11 +109,7 @@ const getExternalDataServerComponent = createServerFn({ method: 'GET' }) ) }) -// The external server URL is provided by the e2e test setup -const EXTERNAL_SERVER_URL = - typeof process !== 'undefined' && process.env.EXTERNAL_SERVER_URL - ? process.env.EXTERNAL_SERVER_URL - : 'http://localhost:65003' +const EXTERNAL_SERVER_URL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/rsc-external')({ loader: async () => { diff --git a/e2e/react-start/rsc/tests/rsc-external.spec.ts b/e2e/react-start/rsc/tests/rsc-external.spec.ts index 7ce4bd3c18..ae16ef7c43 100644 --- a/e2e/react-start/rsc/tests/rsc-external.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-external.spec.ts @@ -19,13 +19,9 @@ test.describe('RSC External API Tests - External data fetching', () => { await page.goto('/rsc-external') await page.waitForURL(/\/rsc-external/) - // Verify the external server URL contains expected pattern - const serverUrl = await page - .getByTestId('external-server-url') - .textContent() - expect(serverUrl).toBeTruthy() - // Should be localhost with a port - expect(serverUrl).toMatch(/localhost:\d+/) + await expect(page.getByTestId('external-server-url')).toHaveText( + 'https://jsonplaceholder.typicode.com', + ) }) test('Loader timestamp is present', async ({ page }) => { diff --git a/e2e/react-start/rsc/tests/setup/global.setup.ts b/e2e/react-start/rsc/tests/setup/global.setup.ts deleted file mode 100644 index 3def5f6941..0000000000 --- a/e2e/react-start/rsc/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/tests/setup/global.teardown.ts b/e2e/react-start/rsc/tests/setup/global.teardown.ts deleted file mode 100644 index a9ad1445f7..0000000000 --- a/e2e/react-start/rsc/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/scroll-restoration/playwright.config.ts b/e2e/react-start/scroll-restoration/playwright.config.ts index 1e33c9ae5e..eb6acc23a7 100644 --- a/e2e/react-start/scroll-restoration/playwright.config.ts +++ b/e2e/react-start/scroll-restoration/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -18,19 +14,19 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, + }, }, projects: [ diff --git a/e2e/react-start/scroll-restoration/src/utils/posts.tsx b/e2e/react-start/scroll-restoration/src/utils/posts.tsx index c6cba486ab..bc56dff904 100644 --- a/e2e/react-start/scroll-restoration/src/utils/posts.tsx +++ b/e2e/react-start/scroll-restoration/src/utils/posts.tsx @@ -12,11 +12,7 @@ export type PostType = { export class PostNotFoundError extends Error {} -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-start/scroll-restoration/src/utils/users.tsx b/e2e/react-start/scroll-restoration/src/utils/users.tsx index 79b45867d5..7ba645b383 100644 --- a/e2e/react-start/scroll-restoration/src/utils/users.tsx +++ b/e2e/react-start/scroll-restoration/src/utils/users.tsx @@ -3,8 +3,3 @@ export type User = { name: string email: string } - -const PORT = - import.meta.env.VITE_SERVER_PORT || process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/react-start/scroll-restoration/tests/setup/global.setup.ts b/e2e/react-start/scroll-restoration/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-start/scroll-restoration/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(packageJson.name) -} diff --git a/e2e/react-start/scroll-restoration/tests/setup/global.teardown.ts b/e2e/react-start/scroll-restoration/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-start/scroll-restoration/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(packageJson.name) -} diff --git a/e2e/react-start/split-base-and-basepath/playwright.config.ts b/e2e/react-start/split-base-and-basepath/playwright.config.ts index 3596ccd106..671f26464b 100644 --- a/e2e/react-start/split-base-and-basepath/playwright.config.ts +++ b/e2e/react-start/split-base-and-basepath/playwright.config.ts @@ -13,9 +13,6 @@ export default defineConfig({ workers: 1, reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, diff --git a/e2e/react-start/split-base-and-basepath/tests/setup/global.setup.ts b/e2e/react-start/split-base-and-basepath/tests/setup/global.setup.ts deleted file mode 100644 index 41ad16a44f..0000000000 --- a/e2e/react-start/split-base-and-basepath/tests/setup/global.setup.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { - e2eStartDummyServer, - getTestServerPort, - preOptimizeDevServer, - waitForServer, -} from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } - -export default async function setup() { - await e2eStartDummyServer(packageJson.name) - - if (process.env.MODE !== 'dev') return - - const port = await getTestServerPort(packageJson.name) - const baseURL = `http://localhost:${port}` - - await waitForServer(baseURL) - await preOptimizeDevServer({ - baseURL, - readyTestId: 'home-heading', - warmup: async (page) => { - await page.getByTestId('link-about').click() - await page.waitForURL('**/about') - await page.getByTestId('about-heading').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.getByTestId('link-home').click() - await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) - await page.getByTestId('home-heading').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - }, - }) -} diff --git a/e2e/react-start/split-base-and-basepath/tests/setup/global.teardown.ts b/e2e/react-start/split-base-and-basepath/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-start/split-base-and-basepath/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(packageJson.name) -} diff --git a/e2e/react-start/virtual-routes/playwright.config.ts b/e2e/react-start/virtual-routes/playwright.config.ts index b0c365f8bd..76044a35d4 100644 --- a/e2e/react-start/virtual-routes/playwright.config.ts +++ b/e2e/react-start/virtual-routes/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -18,19 +14,19 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, + }, }, projects: [ diff --git a/e2e/react-start/virtual-routes/src/posts.tsx b/e2e/react-start/virtual-routes/src/posts.tsx index 01831e335c..cc3cb0f9c8 100644 --- a/e2e/react-start/virtual-routes/src/posts.tsx +++ b/e2e/react-start/virtual-routes/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-start/virtual-routes/src/utils/posts.tsx b/e2e/react-start/virtual-routes/src/utils/posts.tsx index 4cc5dcc4c6..d9b98a8c9c 100644 --- a/e2e/react-start/virtual-routes/src/utils/posts.tsx +++ b/e2e/react-start/virtual-routes/src/utils/posts.tsx @@ -8,11 +8,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) diff --git a/e2e/react-start/virtual-routes/src/utils/users.tsx b/e2e/react-start/virtual-routes/src/utils/users.tsx index 46be4b1580..7ba645b383 100644 --- a/e2e/react-start/virtual-routes/src/utils/users.tsx +++ b/e2e/react-start/virtual-routes/src/utils/users.tsx @@ -3,7 +3,3 @@ export type User = { name: string email: string } - -const PORT = process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/react-start/virtual-routes/tests/app.spec.ts b/e2e/react-start/virtual-routes/tests/app.spec.ts index 3182febfa0..e9db98e3f3 100644 --- a/e2e/react-start/virtual-routes/tests/app.spec.ts +++ b/e2e/react-start/virtual-routes/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-start/virtual-routes/tests/setup/global.setup.ts b/e2e/react-start/virtual-routes/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/react-start/virtual-routes/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(packageJson.name) -} diff --git a/e2e/react-start/virtual-routes/tests/setup/global.teardown.ts b/e2e/react-start/virtual-routes/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/react-start/virtual-routes/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(packageJson.name) -} diff --git a/e2e/solid-router/basepath-file-based/playwright.config.ts b/e2e/solid-router/basepath-file-based/playwright.config.ts index 6069bbe59f..be44f419e9 100644 --- a/e2e/solid-router/basepath-file-based/playwright.config.ts +++ b/e2e/solid-router/basepath-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/basepath-file-based/tests/setup/global.setup.ts b/e2e/solid-router/basepath-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/basepath-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/basepath-file-based/tests/setup/global.teardown.ts b/e2e/solid-router/basepath-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/basepath-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/basic-file-based-code-splitting/playwright.config.ts b/e2e/solid-router/basic-file-based-code-splitting/playwright.config.ts index 836ea41bd8..6976028d7a 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/playwright.config.ts +++ b/e2e/solid-router/basic-file-based-code-splitting/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/basic-file-based-code-splitting/src/posts.tsx b/e2e/solid-router/basic-file-based-code-splitting/src/posts.tsx index aebe80648f..d5f0ce903d 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/src/posts.tsx +++ b/e2e/solid-router/basic-file-based-code-splitting/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/solid-router/basic-file-based-code-splitting/tests/app.spec.ts b/e2e/solid-router/basic-file-based-code-splitting/tests/app.spec.ts index 3e5a69ccaa..fbf093cd51 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/tests/app.spec.ts +++ b/e2e/solid-router/basic-file-based-code-splitting/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/basic-file-based-code-splitting/tests/preload.spec.ts b/e2e/solid-router/basic-file-based-code-splitting/tests/preload.spec.ts index 0bc3265760..fd17fcc47b 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/tests/preload.spec.ts +++ b/e2e/solid-router/basic-file-based-code-splitting/tests/preload.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/basic-file-based-code-splitting/tests/setup/global.setup.ts b/e2e/solid-router/basic-file-based-code-splitting/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/basic-file-based-code-splitting/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(packageJson.name) -} diff --git a/e2e/solid-router/basic-file-based-code-splitting/tests/setup/global.teardown.ts b/e2e/solid-router/basic-file-based-code-splitting/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/basic-file-based-code-splitting/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(packageJson.name) -} diff --git a/e2e/solid-router/basic-file-based/playwright.config.ts b/e2e/solid-router/basic-file-based/playwright.config.ts index 6e4e1d7703..fe3edefe3a 100644 --- a/e2e/solid-router/basic-file-based/playwright.config.ts +++ b/e2e/solid-router/basic-file-based/playwright.config.ts @@ -1,14 +1,10 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` -const command = `pnpm build && pnpm preview --port ${PORT}` +const command = `pnpm build && pnpm preview --host 0.0.0.0 --port ${PORT}` console.info('Running with mode: ', process.env.MODE || 'default') @@ -21,9 +17,6 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, @@ -38,7 +31,6 @@ export default defineConfig({ MODE: process.env.MODE || '', VITE_MODE: process.env.MODE || '', VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), VITE_SERVER_PORT: String(PORT), PORT: String(PORT), }, diff --git a/e2e/solid-router/basic-file-based/src/posts.tsx b/e2e/solid-router/basic-file-based/src/posts.tsx index 909620abf9..6df270c619 100644 --- a/e2e/solid-router/basic-file-based/src/posts.tsx +++ b/e2e/solid-router/basic-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/solid-router/basic-file-based/tests/app.spec.ts b/e2e/solid-router/basic-file-based/tests/app.spec.ts index f535fdd78c..274d234031 100644 --- a/e2e/solid-router/basic-file-based/tests/app.spec.ts +++ b/e2e/solid-router/basic-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' test.beforeEach(async ({ page }) => { diff --git a/e2e/solid-router/basic-file-based/tests/hover-preload-hash.spec.ts b/e2e/solid-router/basic-file-based/tests/hover-preload-hash.spec.ts index b090c2a6b7..1263faf391 100644 --- a/e2e/solid-router/basic-file-based/tests/hover-preload-hash.spec.ts +++ b/e2e/solid-router/basic-file-based/tests/hover-preload-hash.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import { toRuntimePath } from '@tanstack/router-e2e-utils' test('clicking hash link then hovering another link does not scroll back to hash', async ({ diff --git a/e2e/solid-router/basic-file-based/tests/mask.spec.ts b/e2e/solid-router/basic-file-based/tests/mask.spec.ts index f6ec42c604..9a7ee8a1c8 100644 --- a/e2e/solid-router/basic-file-based/tests/mask.spec.ts +++ b/e2e/solid-router/basic-file-based/tests/mask.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test('route masks transform params and expose masked pathname in the browser (solid)', async ({ page, diff --git a/e2e/solid-router/basic-file-based/tests/non-nested-paths.spec.ts b/e2e/solid-router/basic-file-based/tests/non-nested-paths.spec.ts index dccdfd4acf..ea0e585c75 100644 --- a/e2e/solid-router/basic-file-based/tests/non-nested-paths.spec.ts +++ b/e2e/solid-router/basic-file-based/tests/non-nested-paths.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' const testCases: Array<{ name: string diff --git a/e2e/solid-router/basic-file-based/tests/params.spec.ts b/e2e/solid-router/basic-file-based/tests/params.spec.ts index ca9b2ca429..6014689ed2 100644 --- a/e2e/solid-router/basic-file-based/tests/params.spec.ts +++ b/e2e/solid-router/basic-file-based/tests/params.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' test.beforeEach(async ({ page }) => { diff --git a/e2e/solid-router/basic-file-based/tests/redirect.spec.ts b/e2e/solid-router/basic-file-based/tests/redirect.spec.ts index 4375aa6673..ce09189036 100644 --- a/e2e/solid-router/basic-file-based/tests/redirect.spec.ts +++ b/e2e/solid-router/basic-file-based/tests/redirect.spec.ts @@ -1,19 +1,16 @@ import queryString from 'node:querystring' -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' -import { - getDummyServerPort, - getTestServerPort, - localDummyServer, -} from '@tanstack/router-e2e-utils' import packageJson from '../package.json' with { type: 'json' } -import type { Server } from 'node:http' // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_HOST_PORT = await getDummyServerPort(packageJson.name) +const PORT = await getTestServerPort( + process.env.E2E_PORT_KEY ?? packageJson.name, +) +const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` test.describe('redirects', () => { const internalNavigationTestMatrix = combinate({ @@ -41,7 +38,7 @@ test.describe('redirects', () => { const requestPromise = new Promise((resolve) => { page.on('request', (request) => { if ( - request.url() === `http://localhost:${EXTERNAL_HOST_PORT}/posts` + request.url() === 'https://jsonplaceholder.typicode.com/posts' ) { requestHappened = true resolve() @@ -106,8 +103,8 @@ test.describe('redirects', () => { }) => { await page.waitForLoadState('networkidle') - let q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + const q = queryString.stringify({ + externalHost: `${EXTERNAL_ORIGIN}/`, }) if (scenario === 'navigate') { await page.goto(`/redirect/external?${q}`) @@ -116,7 +113,7 @@ test.describe('redirects', () => { await page.goto(`/redirect/external/via-${thrower}?${q}`) } - const url = `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) expect(page.url()).toBe(url) diff --git a/e2e/solid-router/basic-file-based/tests/relative.spec.ts b/e2e/solid-router/basic-file-based/tests/relative.spec.ts index 4850d3630d..7aa5f0b84b 100644 --- a/e2e/solid-router/basic-file-based/tests/relative.spec.ts +++ b/e2e/solid-router/basic-file-based/tests/relative.spec.ts @@ -1,12 +1,14 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' -import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = await getTestServerPort(packageJson.name) +const PORT = await getTestServerPort( + process.env.E2E_PORT_KEY ?? packageJson.name, +) test.describe('relative_routing', () => { const internalNavigationTestMatrix = combinate({ diff --git a/e2e/solid-router/basic-file-based/tests/scroll-into-view.spec.ts b/e2e/solid-router/basic-file-based/tests/scroll-into-view.spec.ts index d1af86adfb..6730959838 100644 --- a/e2e/solid-router/basic-file-based/tests/scroll-into-view.spec.ts +++ b/e2e/solid-router/basic-file-based/tests/scroll-into-view.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' const anchors = { diff --git a/e2e/solid-router/basic-file-based/tests/search-params.spec.ts b/e2e/solid-router/basic-file-based/tests/search-params.spec.ts index d6307cbcf8..a99488a47a 100644 --- a/e2e/solid-router/basic-file-based/tests/search-params.spec.ts +++ b/e2e/solid-router/basic-file-based/tests/search-params.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.describe('/search-params/default', () => { test('Directly visiting the route without search param set', async ({ diff --git a/e2e/solid-router/basic-file-based/tests/setup/global.setup.ts b/e2e/solid-router/basic-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/basic-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/basic-file-based/tests/setup/global.teardown.ts b/e2e/solid-router/basic-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/basic-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/basic-file-based/tests/transition.spec.ts b/e2e/solid-router/basic-file-based/tests/transition.spec.ts index b777c52862..06f6d04a77 100644 --- a/e2e/solid-router/basic-file-based/tests/transition.spec.ts +++ b/e2e/solid-router/basic-file-based/tests/transition.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test('transitions/count/create-resource should keep old values visible during navigation', async ({ page, diff --git a/e2e/solid-router/basic-solid-query-file-based/playwright.config.ts b/e2e/solid-router/basic-solid-query-file-based/playwright.config.ts index 836ea41bd8..6976028d7a 100644 --- a/e2e/solid-router/basic-solid-query-file-based/playwright.config.ts +++ b/e2e/solid-router/basic-solid-query-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/basic-solid-query-file-based/src/posts.tsx b/e2e/solid-router/basic-solid-query-file-based/src/posts.tsx index 1becc2c242..1f6cb8e308 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/posts.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/posts.tsx @@ -8,11 +8,7 @@ export type PostType = { export class PostNotFoundError extends Error {} -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/solid-router/basic-solid-query-file-based/tests/app.spec.ts b/e2e/solid-router/basic-solid-query-file-based/tests/app.spec.ts index 3e5a69ccaa..fbf093cd51 100644 --- a/e2e/solid-router/basic-solid-query-file-based/tests/app.spec.ts +++ b/e2e/solid-router/basic-solid-query-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/basic-solid-query-file-based/tests/setup/global.setup.ts b/e2e/solid-router/basic-solid-query-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/basic-solid-query-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/basic-solid-query-file-based/tests/setup/global.teardown.ts b/e2e/solid-router/basic-solid-query-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/basic-solid-query-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/basic-solid-query/playwright.config.ts b/e2e/solid-router/basic-solid-query/playwright.config.ts index 1faa47a497..aecc8fd69b 100644 --- a/e2e/solid-router/basic-solid-query/playwright.config.ts +++ b/e2e/solid-router/basic-solid-query/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -18,16 +14,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/basic-solid-query/src/posts.ts b/e2e/solid-router/basic-solid-query/src/posts.ts index 9700a8463a..392fd2deb0 100644 --- a/e2e/solid-router/basic-solid-query/src/posts.ts +++ b/e2e/solid-router/basic-solid-query/src/posts.ts @@ -9,11 +9,7 @@ type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/solid-router/basic-solid-query/tests/app.spec.ts b/e2e/solid-router/basic-solid-query/tests/app.spec.ts index 3e5a69ccaa..fbf093cd51 100644 --- a/e2e/solid-router/basic-solid-query/tests/app.spec.ts +++ b/e2e/solid-router/basic-solid-query/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/basic-solid-query/tests/setup/global.setup.ts b/e2e/solid-router/basic-solid-query/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/basic-solid-query/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(packageJson.name) -} diff --git a/e2e/solid-router/basic-solid-query/tests/setup/global.teardown.ts b/e2e/solid-router/basic-solid-query/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/basic-solid-query/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(packageJson.name) -} diff --git a/e2e/solid-router/basic-virtual-file-based/playwright.config.ts b/e2e/solid-router/basic-virtual-file-based/playwright.config.ts index 836ea41bd8..6976028d7a 100644 --- a/e2e/solid-router/basic-virtual-file-based/playwright.config.ts +++ b/e2e/solid-router/basic-virtual-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/basic-virtual-file-based/src/posts.tsx b/e2e/solid-router/basic-virtual-file-based/src/posts.tsx index aebe80648f..d5f0ce903d 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/posts.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/solid-router/basic-virtual-file-based/tests/app.spec.ts b/e2e/solid-router/basic-virtual-file-based/tests/app.spec.ts index 3e5a69ccaa..fbf093cd51 100644 --- a/e2e/solid-router/basic-virtual-file-based/tests/app.spec.ts +++ b/e2e/solid-router/basic-virtual-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/basic-virtual-file-based/tests/setup/global.setup.ts b/e2e/solid-router/basic-virtual-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/basic-virtual-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/basic-virtual-file-based/tests/setup/global.teardown.ts b/e2e/solid-router/basic-virtual-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/basic-virtual-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/solid-router/basic-virtual-named-export-config-file-based/playwright.config.ts index 836ea41bd8..6976028d7a 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/posts.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/posts.tsx index aebe80648f..d5f0ce903d 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/posts.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts b/e2e/solid-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts index 3e5a69ccaa..fbf093cd51 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts b/e2e/solid-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts b/e2e/solid-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/basic/playwright.config.ts b/e2e/solid-router/basic/playwright.config.ts index 836ea41bd8..6976028d7a 100644 --- a/e2e/solid-router/basic/playwright.config.ts +++ b/e2e/solid-router/basic/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/basic/src/posts.ts b/e2e/solid-router/basic/src/posts.ts index e859645746..f72d16fee3 100644 --- a/e2e/solid-router/basic/src/posts.ts +++ b/e2e/solid-router/basic/src/posts.ts @@ -8,11 +8,7 @@ type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/solid-router/basic/tests/app.spec.ts b/e2e/solid-router/basic/tests/app.spec.ts index ec0e24d8a4..5038f79098 100644 --- a/e2e/solid-router/basic/tests/app.spec.ts +++ b/e2e/solid-router/basic/tests/app.spec.ts @@ -1,8 +1,10 @@ -import { expect, test } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' +import { expect } from '@playwright/test' +import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from '../package.json' with { type: 'json' } -const PORT = await getTestServerPort(packageJson.name) +const PORT = await getTestServerPort( + process.env.E2E_PORT_KEY ?? packageJson.name, +) test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/basic/tests/params.spec.ts b/e2e/solid-router/basic/tests/params.spec.ts index ac18f39864..f673138047 100644 --- a/e2e/solid-router/basic/tests/params.spec.ts +++ b/e2e/solid-router/basic/tests/params.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.describe('params operations + prefix/suffix', () => { test.beforeEach(async ({ page }) => { diff --git a/e2e/solid-router/basic/tests/setup/global.setup.ts b/e2e/solid-router/basic/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/basic/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(packageJson.name) -} diff --git a/e2e/solid-router/basic/tests/setup/global.teardown.ts b/e2e/solid-router/basic/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/basic/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(packageJson.name) -} diff --git a/e2e/solid-router/generator-cli-only/playwright.config.ts b/e2e/solid-router/generator-cli-only/playwright.config.ts index c9d9a76ae7..be44f419e9 100644 --- a/e2e/solid-router/generator-cli-only/playwright.config.ts +++ b/e2e/solid-router/generator-cli-only/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/generator-cli-only/src/posts.ts b/e2e/solid-router/generator-cli-only/src/posts.ts index e859645746..f72d16fee3 100644 --- a/e2e/solid-router/generator-cli-only/src/posts.ts +++ b/e2e/solid-router/generator-cli-only/src/posts.ts @@ -8,11 +8,7 @@ type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/solid-router/generator-cli-only/tests/app.spec.ts b/e2e/solid-router/generator-cli-only/tests/app.spec.ts index 5a83a314f2..ced5ac9310 100644 --- a/e2e/solid-router/generator-cli-only/tests/app.spec.ts +++ b/e2e/solid-router/generator-cli-only/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/generator-cli-only/tests/setup/global.setup.ts b/e2e/solid-router/generator-cli-only/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/generator-cli-only/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(packageJson.name) -} diff --git a/e2e/solid-router/generator-cli-only/tests/setup/global.teardown.ts b/e2e/solid-router/generator-cli-only/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/generator-cli-only/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(packageJson.name) -} diff --git a/e2e/solid-router/js-only-file-based/playwright.config.ts b/e2e/solid-router/js-only-file-based/playwright.config.ts index 4f93bc1413..ccf3853685 100644 --- a/e2e/solid-router/js-only-file-based/playwright.config.ts +++ b/e2e/solid-router/js-only-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -18,16 +14,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/js-only-file-based/src/posts.js b/e2e/solid-router/js-only-file-based/src/posts.js index 979e5e381c..36c1c281f6 100644 --- a/e2e/solid-router/js-only-file-based/src/posts.js +++ b/e2e/solid-router/js-only-file-based/src/posts.js @@ -2,11 +2,7 @@ import axios from 'redaxios' export class NotFoundError extends Error {} -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/solid-router/js-only-file-based/tests/app.spec.ts b/e2e/solid-router/js-only-file-based/tests/app.spec.ts index 5a83a314f2..ced5ac9310 100644 --- a/e2e/solid-router/js-only-file-based/tests/app.spec.ts +++ b/e2e/solid-router/js-only-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/js-only-file-based/tests/setup/global.setup.ts b/e2e/solid-router/js-only-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/js-only-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/js-only-file-based/tests/setup/global.teardown.ts b/e2e/solid-router/js-only-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/js-only-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/rspack-basic-file-based/playwright.config.ts b/e2e/solid-router/rspack-basic-file-based/playwright.config.ts index 5f20415459..025582e53e 100644 --- a/e2e/solid-router/rspack-basic-file-based/playwright.config.ts +++ b/e2e/solid-router/rspack-basic-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/rspack-basic-file-based/src/posts.tsx b/e2e/solid-router/rspack-basic-file-based/src/posts.tsx index 93faeb7c27..d5f0ce903d 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/posts.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.PUBLIC_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.PUBLIC_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/solid-router/rspack-basic-file-based/tests/app.spec.ts b/e2e/solid-router/rspack-basic-file-based/tests/app.spec.ts index 10beff655f..d230263bfe 100644 --- a/e2e/solid-router/rspack-basic-file-based/tests/app.spec.ts +++ b/e2e/solid-router/rspack-basic-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/rspack-basic-file-based/tests/setup/global.setup.ts b/e2e/solid-router/rspack-basic-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/rspack-basic-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/rspack-basic-file-based/tests/setup/global.teardown.ts b/e2e/solid-router/rspack-basic-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/rspack-basic-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts index bf3adc082c..e66d2ff339 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx index 93faeb7c27..d5f0ce903d 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.PUBLIC_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.PUBLIC_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts index 10beff655f..d230263bfe 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/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(packageJson.name) -} diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts b/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts index 9d7691f0fd..0617259e4f 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts @@ -1,6 +1,5 @@ import { defineConfig, devices } from '@playwright/test' import { - getDummyServerPort, getTestServerPort, resolveRuntimeSuffix, } from '@tanstack/router-e2e-utils' @@ -9,7 +8,6 @@ import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort( packageJson.name + `-${resolveRuntimeSuffix('browser')}`, ) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,16 +18,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts b/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts index 80a340cef4..9fa1623c08 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts @@ -1,6 +1,5 @@ import { defineConfig, devices } from '@playwright/test' import { - getDummyServerPort, getTestServerPort, resolveRuntimeSuffix, } from '@tanstack/router-e2e-utils' @@ -9,7 +8,6 @@ import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort( packageJson.name + `-${resolveRuntimeSuffix('hash')}`, ) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,16 +18,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/posts.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/posts.tsx index c6cba486ab..bc56dff904 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/posts.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/posts.tsx @@ -12,11 +12,7 @@ export type PostType = { export class PostNotFoundError extends Error {} -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/tests/app.spec.ts b/e2e/solid-router/scroll-restoration-sandbox-vite/tests/app.spec.ts index 5f226c6db3..067f0341c4 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/tests/app.spec.ts +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import { toRuntimePath } from '@tanstack/router-e2e-utils' test('Smoke - Renders home', async ({ page }) => { diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts b/e2e/solid-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/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(packageJson.name) -} diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts b/e2e/solid-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/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(packageJson.name) -} diff --git a/e2e/solid-router/view-transitions/playwright.config.ts b/e2e/solid-router/view-transitions/playwright.config.ts index c5de6b5611..e7e4795203 100644 --- a/e2e/solid-router/view-transitions/playwright.config.ts +++ b/e2e/solid-router/view-transitions/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -22,11 +18,8 @@ export default defineConfig({ baseURL, }, - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-router/view-transitions/tests/app.spec.ts b/e2e/solid-router/view-transitions/tests/app.spec.ts index 472bd6ed0b..6c1ccf1a6e 100644 --- a/e2e/solid-router/view-transitions/tests/app.spec.ts +++ b/e2e/solid-router/view-transitions/tests/app.spec.ts @@ -1,4 +1,4 @@ -import { test } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/view-transitions/tests/setup/global.setup.ts b/e2e/solid-router/view-transitions/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-router/view-transitions/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(packageJson.name) -} diff --git a/e2e/solid-router/view-transitions/tests/setup/global.teardown.ts b/e2e/solid-router/view-transitions/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-router/view-transitions/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(packageJson.name) -} diff --git a/e2e/solid-start/basic-cloudflare/playwright.config.ts b/e2e/solid-start/basic-cloudflare/playwright.config.ts index a545dff891..99b9f3460a 100644 --- a/e2e/solid-start/basic-cloudflare/playwright.config.ts +++ b/e2e/solid-start/basic-cloudflare/playwright.config.ts @@ -14,9 +14,6 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, diff --git a/e2e/solid-start/basic-cloudflare/tests/setup/global.setup.ts b/e2e/solid-start/basic-cloudflare/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-start/basic-cloudflare/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(packageJson.name) -} diff --git a/e2e/solid-start/basic-cloudflare/tests/setup/global.teardown.ts b/e2e/solid-start/basic-cloudflare/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-start/basic-cloudflare/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(packageJson.name) -} diff --git a/e2e/solid-start/basic-solid-query/playwright.config.ts b/e2e/solid-start/basic-solid-query/playwright.config.ts index 84636ab0f9..d31cc03c2e 100644 --- a/e2e/solid-start/basic-solid-query/playwright.config.ts +++ b/e2e/solid-start/basic-solid-query/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` @@ -16,18 +12,18 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, + }, }, projects: [ diff --git a/e2e/solid-start/basic-solid-query/src/routes/api.users.ts b/e2e/solid-start/basic-solid-query/src/routes/api.users.ts index 54859a701e..1ab58b711a 100644 --- a/e2e/solid-start/basic-solid-query/src/routes/api.users.ts +++ b/e2e/solid-start/basic-solid-query/src/routes/api.users.ts @@ -2,11 +2,7 @@ import { createFileRoute } from '@tanstack/solid-router' import axios from 'redaxios' import type { User } from '../utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/api/users')({ server: { diff --git a/e2e/solid-start/basic-solid-query/src/routes/api/users.$id.ts b/e2e/solid-start/basic-solid-query/src/routes/api/users.$id.ts index a7b2e44491..b0947a27f1 100644 --- a/e2e/solid-start/basic-solid-query/src/routes/api/users.$id.ts +++ b/e2e/solid-start/basic-solid-query/src/routes/api/users.$id.ts @@ -2,11 +2,7 @@ import { createFileRoute } from '@tanstack/solid-router' import axios from 'redaxios' import type { User } from '../../utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/api/users/$id')({ server: { diff --git a/e2e/solid-start/basic-solid-query/tests/app.spec.ts b/e2e/solid-start/basic-solid-query/tests/app.spec.ts index ab2469f68d..4ce5c20ef7 100644 --- a/e2e/solid-start/basic-solid-query/tests/app.spec.ts +++ b/e2e/solid-start/basic-solid-query/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test('Navigating to post', async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-start/basic-solid-query/tests/setup/global.setup.ts b/e2e/solid-start/basic-solid-query/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-start/basic-solid-query/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(packageJson.name) -} diff --git a/e2e/solid-start/basic-solid-query/tests/setup/global.teardown.ts b/e2e/solid-start/basic-solid-query/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-start/basic-solid-query/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(packageJson.name) -} diff --git a/e2e/solid-start/basic-solid-query/tests/transition.spec.ts b/e2e/solid-start/basic-solid-query/tests/transition.spec.ts index 2c28fc72a2..a0f3bf0964 100644 --- a/e2e/solid-start/basic-solid-query/tests/transition.spec.ts +++ b/e2e/solid-start/basic-solid-query/tests/transition.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test('transitions/count/query should keep old values visible during navigation', async ({ page, diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json index f4dde5a3b2..f6a814705d 100644 --- a/e2e/solid-start/basic/package.json +++ b/e2e/solid-start/basic/package.json @@ -6,12 +6,12 @@ "scripts": { "dev": "vite dev --port 3000", "dev:e2e": "vite dev", - "build": "vite build && tsc --noEmit", + "build": "pnpm build:vite", "preview": "vite preview", "start": "node server.js", - "test:e2e:startDummyServer": "node -e 'import(\"./tests/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"./tests/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"./tests/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e:local": "playwright test --project=chromium" + "test:e2e:local": "playwright test --project=chromium", + "build:vite": "vite build && tsc --noEmit", + "build:rsbuild": "rsbuild build && tsc --noEmit" }, "dependencies": { "@tanstack/solid-router": "workspace:^", @@ -57,7 +57,10 @@ }, { "toolchain": "vite", - "mode": "prerender" + "mode": "prerender", + "env": { + "NODE_OPTIONS": "--import=@tanstack/router-e2e-utils/mock-api" + } }, { "toolchain": "vite", diff --git a/e2e/solid-start/basic/playwright.config.ts b/e2e/solid-start/basic/playwright.config.ts index 6924134cd1..165bd03ce1 100644 --- a/e2e/solid-start/basic/playwright.config.ts +++ b/e2e/solid-start/basic/playwright.config.ts @@ -1,9 +1,6 @@ import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const mode = process.env.MODE ?? 'ssr' @@ -14,7 +11,6 @@ if (process.env.TEST_WORKER_INDEX === undefined) { for (const portFile of [ `port-${e2ePortKey}.txt`, `port-${e2ePortKey}_start.txt`, - `port-${e2ePortKey}-external.txt`, ]) { fs.rmSync(portFile, { force: true }) } @@ -22,20 +18,17 @@ if (process.env.TEST_WORKER_INDEX === undefined) { const PORT = await getTestServerPort(e2ePortKey) const START_PORT = await getTestServerPort(`${e2ePortKey}_start`) -const EXTERNAL_PORT = await getDummyServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` const commandByMode = mode === 'preview' - ? `pnpm run test:e2e:startDummyServer && pnpm preview --outDir ${distDir} --port ${PORT}` - : `pnpm run test:e2e:startDummyServer && pnpm start` + ? `pnpm preview --host 0.0.0.0 --outDir ${distDir} --port ${PORT}` + : `pnpm start` export default defineConfig({ testDir: './tests', workers: 1, reporter: [['line']], - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, @@ -46,9 +39,9 @@ export default defineConfig({ reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, MODE: mode, VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), VITE_SERVER_PORT: String(PORT), START_PORT: String(START_PORT), PORT: String(PORT), diff --git a/e2e/solid-start/basic/src/routes/api/users.$userId.ts b/e2e/solid-start/basic/src/routes/api/users.$userId.ts index 6c583f2619..ed90076917 100644 --- a/e2e/solid-start/basic/src/routes/api/users.$userId.ts +++ b/e2e/solid-start/basic/src/routes/api/users.$userId.ts @@ -1,19 +1,15 @@ import { createFileRoute } from '@tanstack/solid-router' import type { User } from '~/utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} - export const Route = createFileRoute('/api/users/$userId')({ server: { handlers: { GET: async ({ params, request }) => { console.info(`Fetching users by id=${params.userId}... @`, request.url) try { - const res = await fetch(`${queryURL}/users/${params.userId}`) + const res = await fetch( + `https://jsonplaceholder.typicode.com/users/${params.userId}`, + ) if (!res.ok) { throw new Error('Failed to fetch user') } diff --git a/e2e/solid-start/basic/src/routes/api/users.ts b/e2e/solid-start/basic/src/routes/api/users.ts index 3d0a2f1116..f2fa98359a 100644 --- a/e2e/solid-start/basic/src/routes/api/users.ts +++ b/e2e/solid-start/basic/src/routes/api/users.ts @@ -38,19 +38,13 @@ const testMiddleware = createMiddleware() return result }) -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} - export const Route = createFileRoute('/api/users')({ server: { middleware: [testMiddleware, userLoggerMiddleware, testParentMiddleware], handlers: { GET: async ({ request }) => { console.info('Fetching users... @', request.url) - const res = await fetch(`${queryURL}/users`) + const res = await fetch('https://jsonplaceholder.typicode.com/users') if (!res.ok) { throw new Error('Failed to fetch users') } diff --git a/e2e/solid-start/basic/src/utils/posts.tsx b/e2e/solid-start/basic/src/utils/posts.tsx index 05ca4651fb..6c12105ab8 100644 --- a/e2e/solid-start/basic/src/utils/posts.tsx +++ b/e2e/solid-start/basic/src/utils/posts.tsx @@ -8,18 +8,12 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} - export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) .handler(async ({ data: postId }) => { console.info(`Fetching post with id ${postId}...`) const post = await axios - .get(`${queryURL}/posts/${postId}`) + .get(`https://jsonplaceholder.typicode.com/posts/${postId}`) .then((r) => r.data) .catch((err) => { console.error(err) @@ -36,7 +30,7 @@ export const fetchPosts = createServerFn({ method: 'GET' }).handler( async () => { console.info('Fetching posts...') return axios - .get>(`${queryURL}/posts`) + .get>('https://jsonplaceholder.typicode.com/posts') .then((r) => r.data.slice(0, 10)) }, ) diff --git a/e2e/solid-start/basic/src/utils/users.tsx b/e2e/solid-start/basic/src/utils/users.tsx index 46be4b1580..7ba645b383 100644 --- a/e2e/solid-start/basic/src/utils/users.tsx +++ b/e2e/solid-start/basic/src/utils/users.tsx @@ -3,7 +3,3 @@ export type User = { name: string email: string } - -const PORT = process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/solid-start/basic/tests/fixture-api.spec.ts b/e2e/solid-start/basic/tests/fixture-api.spec.ts new file mode 100644 index 0000000000..6c9b26dc4c --- /dev/null +++ b/e2e/solid-start/basic/tests/fixture-api.spec.ts @@ -0,0 +1,11 @@ +import { expect, test } from '@playwright/test' + +test('server API receives canned users without a fixture listener', async ({ + request, +}) => { + const response = await request.get('/api/users') + expect(response.ok()).toBe(true) + const users = await response.json() + expect(users).toHaveLength(10) + expect(users[0]).toMatchObject({ id: 1, name: 'Leanne Graham' }) +}) diff --git a/e2e/solid-start/basic/tests/redirect.spec.ts b/e2e/solid-start/basic/tests/redirect.spec.ts index 2f6354aa81..c78124abe8 100644 --- a/e2e/solid-start/basic/tests/redirect.spec.ts +++ b/e2e/solid-start/basic/tests/redirect.spec.ts @@ -1,19 +1,17 @@ import queryString from 'node:querystring' -import { expect, type Page } from '@playwright/test' +import { expect } from '@playwright/test' +import { getTestServerPort, test } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' -import { - getDummyServerPort, - getTestServerPort, - test, -} from '@tanstack/router-e2e-utils' -import { getE2EPortKey } from './utils/getE2EPortKey.ts' +import type { Page } from '@playwright/test' +import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const e2ePortKey = getE2EPortKey() -const PORT = await getTestServerPort(e2ePortKey) -const EXTERNAL_HOST_PORT = await getDummyServerPort(e2ePortKey) +const PORT = await getTestServerPort( + process.env.E2E_PORT_KEY ?? packageJson.name, +) +const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` const POSTS_URL = `http://localhost:${PORT}/posts` async function waitForRouterIdle(page: Page) { @@ -106,7 +104,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + externalHost: `${EXTERNAL_ORIGIN}/`, }) if (scenario === 'navigate') { @@ -119,7 +117,7 @@ test.describe('redirects', () => { await page.goto(`/redirect/external/via-${thrower}?${q}`) } - const url = `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) expect(page.url()).toBe(url) @@ -140,7 +138,7 @@ test.describe('redirects', () => { }) => { let fullPageLoad = false const q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + externalHost: `${EXTERNAL_ORIGIN}/`, reloadDocument, }) @@ -159,10 +157,7 @@ test.describe('redirects', () => { await page.goto(`/redirect/${target}/serverFn/via-${thrower}?${q}`) } - const url = - target === 'internal' - ? POSTS_URL - : `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = target === 'internal' ? POSTS_URL : `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) expect(page.url()).toBe(url) if (target === 'internal' && scenario === 'navigate') { @@ -184,7 +179,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + externalHost: `${EXTERNAL_ORIGIN}/`, reloadDocument, }) @@ -201,10 +196,7 @@ test.describe('redirects', () => { await button.click() - const url = - target === 'internal' - ? POSTS_URL - : `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = target === 'internal' ? POSTS_URL : `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) expect(page.url()).toBe(url) if (target === 'internal') { diff --git a/e2e/solid-start/basic/tests/setup/global.setup.ts b/e2e/solid-start/basic/tests/setup/global.setup.ts deleted file mode 100644 index cd38c35885..0000000000 --- a/e2e/solid-start/basic/tests/setup/global.setup.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' -import { getE2EPortKey } from '../utils/getE2EPortKey.ts' - -export default async function setup() { - await e2eStartDummyServer(getE2EPortKey()) -} diff --git a/e2e/solid-start/basic/tests/setup/global.teardown.ts b/e2e/solid-start/basic/tests/setup/global.teardown.ts deleted file mode 100644 index 36e5c92858..0000000000 --- a/e2e/solid-start/basic/tests/setup/global.teardown.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' -import { getE2EPortKey } from '../utils/getE2EPortKey.ts' - -export default async function teardown() { - try { - await e2eStopDummyServer(getE2EPortKey()) - } catch {} -} diff --git a/e2e/solid-start/basic/tests/setup/waitForDummyServer.ts b/e2e/solid-start/basic/tests/setup/waitForDummyServer.ts deleted file mode 100644 index 88c18fd79e..0000000000 --- a/e2e/solid-start/basic/tests/setup/waitForDummyServer.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { getDummyServerPort } from '@tanstack/router-e2e-utils' -import { getE2EPortKey } from '../utils/getE2EPortKey.ts' - -const timeoutMs = 10_000 -const retryIntervalMs = 100 - -export default async function waitForDummyServer() { - const port = await getDummyServerPort(getE2EPortKey()) - const deadline = Date.now() + timeoutMs - - while (Date.now() < deadline) { - try { - const response = await fetch(`http://localhost:${port}/`) - - if (response.ok) { - return - } - } catch {} - - await new Promise((resolve) => setTimeout(resolve, retryIntervalMs)) - } - - throw new Error(`Timed out waiting for dummy server on port ${port}`) -} diff --git a/e2e/solid-start/css-modules/playwright.config.ts b/e2e/solid-start/css-modules/playwright.config.ts index 0b810d5372..fd9ace2034 100644 --- a/e2e/solid-start/css-modules/playwright.config.ts +++ b/e2e/solid-start/css-modules/playwright.config.ts @@ -12,9 +12,6 @@ export default defineConfig({ workers: 1, reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, diff --git a/e2e/solid-start/css-modules/tests/setup/global.setup.ts b/e2e/solid-start/css-modules/tests/setup/global.setup.ts deleted file mode 100644 index 2d3a1db946..0000000000 --- a/e2e/solid-start/css-modules/tests/setup/global.setup.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { - e2eStartDummyServer, - getTestServerPort, - preOptimizeDevServer, - waitForServer, -} from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } - -export default async function setup() { - await e2eStartDummyServer(packageJson.name) - - if (process.env.MODE !== 'dev') return - - const port = await getTestServerPort(packageJson.name) - const baseURL = `http://localhost:${port}` - - await waitForServer(baseURL) - await preOptimizeDevServer({ - baseURL, - readyTestId: 'global-styled', - warmup: async (page) => { - await page.goto(`${baseURL}/modules`, { waitUntil: 'domcontentloaded' }) - await page.getByTestId('module-card').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.goto(`${baseURL}/sass-mixin`, { - waitUntil: 'domcontentloaded', - }) - await page.getByTestId('mixin-styled').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.goto(`${baseURL}/`, { waitUntil: 'domcontentloaded' }) - await page.getByTestId('global-styled').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.getByTestId('nav-modules').click() - await page.waitForURL('**/modules') - await page.getByTestId('module-card').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.getByTestId('nav-home').click() - await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) - await page.getByTestId('global-styled').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - }, - }) -} diff --git a/e2e/solid-start/css-modules/tests/setup/global.teardown.ts b/e2e/solid-start/css-modules/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-start/css-modules/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(packageJson.name) -} diff --git a/e2e/solid-start/custom-basepath/playwright.config.ts b/e2e/solid-start/custom-basepath/playwright.config.ts index 5095425f47..9f14b88896 100644 --- a/e2e/solid-start/custom-basepath/playwright.config.ts +++ b/e2e/solid-start/custom-basepath/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}/custom/basepath` /** @@ -18,19 +14,19 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, + }, }, projects: [ diff --git a/e2e/solid-start/custom-basepath/src/routes/api/users.$userId.ts b/e2e/solid-start/custom-basepath/src/routes/api/users.$userId.ts index 6c583f2619..2c1978b370 100644 --- a/e2e/solid-start/custom-basepath/src/routes/api/users.$userId.ts +++ b/e2e/solid-start/custom-basepath/src/routes/api/users.$userId.ts @@ -1,11 +1,7 @@ import { createFileRoute } from '@tanstack/solid-router' import type { User } from '~/utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/api/users/$userId')({ server: { diff --git a/e2e/solid-start/custom-basepath/src/routes/api/users.ts b/e2e/solid-start/custom-basepath/src/routes/api/users.ts index 3d0a2f1116..d9fe7817d6 100644 --- a/e2e/solid-start/custom-basepath/src/routes/api/users.ts +++ b/e2e/solid-start/custom-basepath/src/routes/api/users.ts @@ -38,11 +38,7 @@ const testMiddleware = createMiddleware() return result }) -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/api/users')({ server: { diff --git a/e2e/solid-start/custom-basepath/src/utils/posts.tsx b/e2e/solid-start/custom-basepath/src/utils/posts.tsx index 05ca4651fb..d0889bd725 100644 --- a/e2e/solid-start/custom-basepath/src/utils/posts.tsx +++ b/e2e/solid-start/custom-basepath/src/utils/posts.tsx @@ -8,11 +8,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) diff --git a/e2e/solid-start/custom-basepath/src/utils/users.tsx b/e2e/solid-start/custom-basepath/src/utils/users.tsx index 46be4b1580..7ba645b383 100644 --- a/e2e/solid-start/custom-basepath/src/utils/users.tsx +++ b/e2e/solid-start/custom-basepath/src/utils/users.tsx @@ -3,7 +3,3 @@ export type User = { name: string email: string } - -const PORT = process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/solid-start/custom-basepath/tests/setup/global.setup.ts b/e2e/solid-start/custom-basepath/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-start/custom-basepath/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(packageJson.name) -} diff --git a/e2e/solid-start/custom-basepath/tests/setup/global.teardown.ts b/e2e/solid-start/custom-basepath/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-start/custom-basepath/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(packageJson.name) -} diff --git a/e2e/solid-start/query-integration/playwright.config.ts b/e2e/solid-start/query-integration/playwright.config.ts index c09b27e29f..26bd8d37b2 100644 --- a/e2e/solid-start/query-integration/playwright.config.ts +++ b/e2e/solid-start/query-integration/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` @@ -21,7 +17,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-start/scroll-restoration/playwright.config.ts b/e2e/solid-start/scroll-restoration/playwright.config.ts index b0c365f8bd..76044a35d4 100644 --- a/e2e/solid-start/scroll-restoration/playwright.config.ts +++ b/e2e/solid-start/scroll-restoration/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -18,19 +14,19 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, + }, }, projects: [ diff --git a/e2e/solid-start/scroll-restoration/src/utils/posts.tsx b/e2e/solid-start/scroll-restoration/src/utils/posts.tsx index e45ef52969..c4a2d0dcca 100644 --- a/e2e/solid-start/scroll-restoration/src/utils/posts.tsx +++ b/e2e/solid-start/scroll-restoration/src/utils/posts.tsx @@ -10,11 +10,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export class PostNotFoundError extends Error {} diff --git a/e2e/solid-start/scroll-restoration/src/utils/users.tsx b/e2e/solid-start/scroll-restoration/src/utils/users.tsx index 46be4b1580..7ba645b383 100644 --- a/e2e/solid-start/scroll-restoration/src/utils/users.tsx +++ b/e2e/solid-start/scroll-restoration/src/utils/users.tsx @@ -3,7 +3,3 @@ export type User = { name: string email: string } - -const PORT = process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/solid-start/scroll-restoration/tests/setup/global.setup.ts b/e2e/solid-start/scroll-restoration/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-start/scroll-restoration/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(packageJson.name) -} diff --git a/e2e/solid-start/scroll-restoration/tests/setup/global.teardown.ts b/e2e/solid-start/scroll-restoration/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-start/scroll-restoration/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(packageJson.name) -} diff --git a/e2e/solid-start/virtual-routes/playwright.config.ts b/e2e/solid-start/virtual-routes/playwright.config.ts index b0c365f8bd..76044a35d4 100644 --- a/e2e/solid-start/virtual-routes/playwright.config.ts +++ b/e2e/solid-start/virtual-routes/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -18,19 +14,19 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, + }, }, projects: [ diff --git a/e2e/solid-start/virtual-routes/src/posts.tsx b/e2e/solid-start/virtual-routes/src/posts.tsx index 909620abf9..6df270c619 100644 --- a/e2e/solid-start/virtual-routes/src/posts.tsx +++ b/e2e/solid-start/virtual-routes/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/solid-start/virtual-routes/src/utils/posts.tsx b/e2e/solid-start/virtual-routes/src/utils/posts.tsx index 05ca4651fb..d0889bd725 100644 --- a/e2e/solid-start/virtual-routes/src/utils/posts.tsx +++ b/e2e/solid-start/virtual-routes/src/utils/posts.tsx @@ -8,11 +8,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) diff --git a/e2e/solid-start/virtual-routes/src/utils/users.tsx b/e2e/solid-start/virtual-routes/src/utils/users.tsx index 46be4b1580..7ba645b383 100644 --- a/e2e/solid-start/virtual-routes/src/utils/users.tsx +++ b/e2e/solid-start/virtual-routes/src/utils/users.tsx @@ -3,7 +3,3 @@ export type User = { name: string email: string } - -const PORT = process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/solid-start/virtual-routes/tests/app.spec.ts b/e2e/solid-start/virtual-routes/tests/app.spec.ts index 3182febfa0..e9db98e3f3 100644 --- a/e2e/solid-start/virtual-routes/tests/app.spec.ts +++ b/e2e/solid-start/virtual-routes/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-start/virtual-routes/tests/setup/global.setup.ts b/e2e/solid-start/virtual-routes/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/solid-start/virtual-routes/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(packageJson.name) -} diff --git a/e2e/solid-start/virtual-routes/tests/setup/global.teardown.ts b/e2e/solid-start/virtual-routes/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/solid-start/virtual-routes/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(packageJson.name) -} diff --git a/e2e/vue-router/basepath-file-based/playwright.config.ts b/e2e/vue-router/basepath-file-based/playwright.config.ts index 6069bbe59f..be44f419e9 100644 --- a/e2e/vue-router/basepath-file-based/playwright.config.ts +++ b/e2e/vue-router/basepath-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/basepath-file-based/tests/setup/global.setup.ts b/e2e/vue-router/basepath-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/basepath-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/basepath-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/basepath-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/basepath-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-esbuild-file-based/playwright.config.ts b/e2e/vue-router/basic-esbuild-file-based/playwright.config.ts index 836ea41bd8..6976028d7a 100644 --- a/e2e/vue-router/basic-esbuild-file-based/playwright.config.ts +++ b/e2e/vue-router/basic-esbuild-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/basic-esbuild-file-based/tests/app.spec.ts b/e2e/vue-router/basic-esbuild-file-based/tests/app.spec.ts index 543746d64d..7380859e7b 100644 --- a/e2e/vue-router/basic-esbuild-file-based/tests/app.spec.ts +++ b/e2e/vue-router/basic-esbuild-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' test.beforeEach(async ({ page }) => { diff --git a/e2e/vue-router/basic-esbuild-file-based/tests/setup/global.setup.ts b/e2e/vue-router/basic-esbuild-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/basic-esbuild-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-esbuild-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/basic-esbuild-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/basic-esbuild-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-file-based-jsx/playwright.config.ts b/e2e/vue-router/basic-file-based-jsx/playwright.config.ts index 836ea41bd8..6976028d7a 100644 --- a/e2e/vue-router/basic-file-based-jsx/playwright.config.ts +++ b/e2e/vue-router/basic-file-based-jsx/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/basic-file-based-jsx/src/posts.tsx b/e2e/vue-router/basic-file-based-jsx/src/posts.tsx index 1b4c92b41d..f7a1941605 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/posts.tsx +++ b/e2e/vue-router/basic-file-based-jsx/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/basic-file-based-jsx/tests/app.spec.ts b/e2e/vue-router/basic-file-based-jsx/tests/app.spec.ts index 543746d64d..7380859e7b 100644 --- a/e2e/vue-router/basic-file-based-jsx/tests/app.spec.ts +++ b/e2e/vue-router/basic-file-based-jsx/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' test.beforeEach(async ({ page }) => { diff --git a/e2e/vue-router/basic-file-based-jsx/tests/setup/global.setup.ts b/e2e/vue-router/basic-file-based-jsx/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/basic-file-based-jsx/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-file-based-jsx/tests/setup/global.teardown.ts b/e2e/vue-router/basic-file-based-jsx/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/basic-file-based-jsx/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-file-based-sfc/playwright.config.ts b/e2e/vue-router/basic-file-based-sfc/playwright.config.ts index 836ea41bd8..6976028d7a 100644 --- a/e2e/vue-router/basic-file-based-sfc/playwright.config.ts +++ b/e2e/vue-router/basic-file-based-sfc/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/basic-file-based-sfc/src/posts.ts b/e2e/vue-router/basic-file-based-sfc/src/posts.ts index 1b4c92b41d..f7a1941605 100644 --- a/e2e/vue-router/basic-file-based-sfc/src/posts.ts +++ b/e2e/vue-router/basic-file-based-sfc/src/posts.ts @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/basic-file-based-sfc/tests/app.spec.ts b/e2e/vue-router/basic-file-based-sfc/tests/app.spec.ts index 543746d64d..7380859e7b 100644 --- a/e2e/vue-router/basic-file-based-sfc/tests/app.spec.ts +++ b/e2e/vue-router/basic-file-based-sfc/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' test.beforeEach(async ({ page }) => { diff --git a/e2e/vue-router/basic-file-based-sfc/tests/setup/global.setup.ts b/e2e/vue-router/basic-file-based-sfc/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/basic-file-based-sfc/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-file-based-sfc/tests/setup/global.teardown.ts b/e2e/vue-router/basic-file-based-sfc/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/basic-file-based-sfc/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-virtual-file-based/playwright.config.ts b/e2e/vue-router/basic-virtual-file-based/playwright.config.ts index 836ea41bd8..6976028d7a 100644 --- a/e2e/vue-router/basic-virtual-file-based/playwright.config.ts +++ b/e2e/vue-router/basic-virtual-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/basic-virtual-file-based/src/posts.tsx b/e2e/vue-router/basic-virtual-file-based/src/posts.tsx index 8576a3799a..5f5463a668 100644 --- a/e2e/vue-router/basic-virtual-file-based/src/posts.tsx +++ b/e2e/vue-router/basic-virtual-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/basic-virtual-file-based/tests/app.spec.ts b/e2e/vue-router/basic-virtual-file-based/tests/app.spec.ts index 3e5a69ccaa..fbf093cd51 100644 --- a/e2e/vue-router/basic-virtual-file-based/tests/app.spec.ts +++ b/e2e/vue-router/basic-virtual-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/basic-virtual-file-based/tests/setup/global.setup.ts b/e2e/vue-router/basic-virtual-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/basic-virtual-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-virtual-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/basic-virtual-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/basic-virtual-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/vue-router/basic-virtual-named-export-config-file-based/playwright.config.ts index 836ea41bd8..6976028d7a 100644 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/src/posts.tsx b/e2e/vue-router/basic-virtual-named-export-config-file-based/src/posts.tsx index 8576a3799a..5f5463a668 100644 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/src/posts.tsx +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts b/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts index 3e5a69ccaa..fbf093cd51 100644 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts b/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-vue-query-file-based/playwright.config.ts b/e2e/vue-router/basic-vue-query-file-based/playwright.config.ts index 6e7c123f74..af35a4f8ba 100644 --- a/e2e/vue-router/basic-vue-query-file-based/playwright.config.ts +++ b/e2e/vue-router/basic-vue-query-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -17,15 +13,13 @@ export default defineConfig({ workers: 1, reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/basic-vue-query-file-based/src/posts.tsx b/e2e/vue-router/basic-vue-query-file-based/src/posts.tsx index 1becc2c242..1f6cb8e308 100644 --- a/e2e/vue-router/basic-vue-query-file-based/src/posts.tsx +++ b/e2e/vue-router/basic-vue-query-file-based/src/posts.tsx @@ -8,11 +8,7 @@ export type PostType = { export class PostNotFoundError extends Error {} -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/basic-vue-query-file-based/tests/app.spec.ts b/e2e/vue-router/basic-vue-query-file-based/tests/app.spec.ts index d80e8dada5..2b42d6d589 100644 --- a/e2e/vue-router/basic-vue-query-file-based/tests/app.spec.ts +++ b/e2e/vue-router/basic-vue-query-file-based/tests/app.spec.ts @@ -1,24 +1,23 @@ -import { expect, test } from '@playwright/test' -import { getDummyServerPort } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') }) -test('GetPosts', async () => { - const port = await getDummyServerPort(packageJson.name) - const res = await fetch(`http://localhost:${port}/posts`) - - expect(res.status).toBe(200) - - const posts = await res.json() - +test('GetPosts with networking disabled', async ({ page, context }) => { + await page.goto('about:blank') + await context.setOffline(true) + const { status, posts, post } = await page.evaluate(async () => { + const response = await fetch('https://jsonplaceholder.typicode.com/posts') + const posts = await response.json() + const post = await fetch( + 'https://jsonplaceholder.typicode.com/posts/1', + ).then((r) => r.json()) + return { status: response.status, posts, post } + }) + expect(status).toBe(200) expect(posts.length).toBeGreaterThan(0) - - const postRes = await fetch(`http://localhost:${port}/posts/1`) - expect(postRes.status).toBe(200) - const post = await postRes.json() expect(post).toEqual(posts[0]) }) diff --git a/e2e/vue-router/basic-vue-query-file-based/tests/setup/global.setup.ts b/e2e/vue-router/basic-vue-query-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/basic-vue-query-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-vue-query-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/basic-vue-query-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/basic-vue-query-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-vue-query/playwright.config.ts b/e2e/vue-router/basic-vue-query/playwright.config.ts index 836ea41bd8..6976028d7a 100644 --- a/e2e/vue-router/basic-vue-query/playwright.config.ts +++ b/e2e/vue-router/basic-vue-query/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/basic-vue-query/src/posts.ts b/e2e/vue-router/basic-vue-query/src/posts.ts index 18f8a9f93f..69e1814af5 100644 --- a/e2e/vue-router/basic-vue-query/src/posts.ts +++ b/e2e/vue-router/basic-vue-query/src/posts.ts @@ -9,11 +9,7 @@ type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/vue-router/basic-vue-query/tests/app.spec.ts b/e2e/vue-router/basic-vue-query/tests/app.spec.ts index 3e5a69ccaa..fbf093cd51 100644 --- a/e2e/vue-router/basic-vue-query/tests/app.spec.ts +++ b/e2e/vue-router/basic-vue-query/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/basic-vue-query/tests/setup/global.setup.ts b/e2e/vue-router/basic-vue-query/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/basic-vue-query/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(packageJson.name) -} diff --git a/e2e/vue-router/basic-vue-query/tests/setup/global.teardown.ts b/e2e/vue-router/basic-vue-query/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/basic-vue-query/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(packageJson.name) -} diff --git a/e2e/vue-router/basic/playwright.config.ts b/e2e/vue-router/basic/playwright.config.ts index 836ea41bd8..6976028d7a 100644 --- a/e2e/vue-router/basic/playwright.config.ts +++ b/e2e/vue-router/basic/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/basic/src/posts.ts b/e2e/vue-router/basic/src/posts.ts index e859645746..f72d16fee3 100644 --- a/e2e/vue-router/basic/src/posts.ts +++ b/e2e/vue-router/basic/src/posts.ts @@ -8,11 +8,7 @@ type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/vue-router/basic/tests/app.spec.ts b/e2e/vue-router/basic/tests/app.spec.ts index ec0e24d8a4..5038f79098 100644 --- a/e2e/vue-router/basic/tests/app.spec.ts +++ b/e2e/vue-router/basic/tests/app.spec.ts @@ -1,8 +1,10 @@ -import { expect, test } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' +import { expect } from '@playwright/test' +import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from '../package.json' with { type: 'json' } -const PORT = await getTestServerPort(packageJson.name) +const PORT = await getTestServerPort( + process.env.E2E_PORT_KEY ?? packageJson.name, +) test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/basic/tests/params.spec.ts b/e2e/vue-router/basic/tests/params.spec.ts index ac18f39864..f673138047 100644 --- a/e2e/vue-router/basic/tests/params.spec.ts +++ b/e2e/vue-router/basic/tests/params.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.describe('params operations + prefix/suffix', () => { test.beforeEach(async ({ page }) => { diff --git a/e2e/vue-router/basic/tests/setup/global.setup.ts b/e2e/vue-router/basic/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/basic/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(packageJson.name) -} diff --git a/e2e/vue-router/basic/tests/setup/global.teardown.ts b/e2e/vue-router/basic/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/basic/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(packageJson.name) -} diff --git a/e2e/vue-router/generator-cli-only/playwright.config.ts b/e2e/vue-router/generator-cli-only/playwright.config.ts index c9d9a76ae7..be44f419e9 100644 --- a/e2e/vue-router/generator-cli-only/playwright.config.ts +++ b/e2e/vue-router/generator-cli-only/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/generator-cli-only/src/posts.ts b/e2e/vue-router/generator-cli-only/src/posts.ts index e859645746..f72d16fee3 100644 --- a/e2e/vue-router/generator-cli-only/src/posts.ts +++ b/e2e/vue-router/generator-cli-only/src/posts.ts @@ -8,11 +8,7 @@ type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/vue-router/generator-cli-only/tests/app.spec.ts b/e2e/vue-router/generator-cli-only/tests/app.spec.ts index 5a83a314f2..ced5ac9310 100644 --- a/e2e/vue-router/generator-cli-only/tests/app.spec.ts +++ b/e2e/vue-router/generator-cli-only/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/generator-cli-only/tests/setup/global.setup.ts b/e2e/vue-router/generator-cli-only/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/generator-cli-only/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(packageJson.name) -} diff --git a/e2e/vue-router/generator-cli-only/tests/setup/global.teardown.ts b/e2e/vue-router/generator-cli-only/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/generator-cli-only/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(packageJson.name) -} diff --git a/e2e/vue-router/js-only-file-based/playwright.config.ts b/e2e/vue-router/js-only-file-based/playwright.config.ts index 4f93bc1413..ccf3853685 100644 --- a/e2e/vue-router/js-only-file-based/playwright.config.ts +++ b/e2e/vue-router/js-only-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -18,16 +14,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/js-only-file-based/src/posts.js b/e2e/vue-router/js-only-file-based/src/posts.js index 979e5e381c..36c1c281f6 100644 --- a/e2e/vue-router/js-only-file-based/src/posts.js +++ b/e2e/vue-router/js-only-file-based/src/posts.js @@ -2,11 +2,7 @@ import axios from 'redaxios' export class NotFoundError extends Error {} -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/vue-router/js-only-file-based/tests/app.spec.ts b/e2e/vue-router/js-only-file-based/tests/app.spec.ts index 5a83a314f2..ced5ac9310 100644 --- a/e2e/vue-router/js-only-file-based/tests/app.spec.ts +++ b/e2e/vue-router/js-only-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/js-only-file-based/tests/setup/global.setup.ts b/e2e/vue-router/js-only-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/js-only-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/js-only-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/js-only-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/js-only-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/rspack-basic-file-based/playwright.config.ts b/e2e/vue-router/rspack-basic-file-based/playwright.config.ts index 5f20415459..025582e53e 100644 --- a/e2e/vue-router/rspack-basic-file-based/playwright.config.ts +++ b/e2e/vue-router/rspack-basic-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + command: `PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/rspack-basic-file-based/rsbuild.config.ts b/e2e/vue-router/rspack-basic-file-based/rsbuild.config.ts index d5e4b7456c..c91449b6c3 100644 --- a/e2e/vue-router/rspack-basic-file-based/rsbuild.config.ts +++ b/e2e/vue-router/rspack-basic-file-based/rsbuild.config.ts @@ -12,19 +12,6 @@ export default defineConfig({ pluginVue(), pluginVueJsx(), ], - source: { - define: { - // Rsbuild only defines `import.meta.env.PUBLIC_*` when the env var exists. - // When it doesn't, rspack can transform `import.meta.env` to `void 0`, which - // makes `import.meta.env.PUBLIC_*` crash at runtime. - 'import.meta.env.PUBLIC_NODE_ENV': JSON.stringify( - process.env.PUBLIC_NODE_ENV ?? '', - ), - 'import.meta.env.PUBLIC_EXTERNAL_PORT': JSON.stringify( - process.env.PUBLIC_EXTERNAL_PORT ?? '', - ), - }, - }, tools: { rspack: { plugins: [tanstackRouter({ target: 'vue', autoCodeSplitting: true })], diff --git a/e2e/vue-router/rspack-basic-file-based/src/posts.tsx b/e2e/vue-router/rspack-basic-file-based/src/posts.tsx index 0b557a0f65..5f5463a668 100644 --- a/e2e/vue-router/rspack-basic-file-based/src/posts.tsx +++ b/e2e/vue-router/rspack-basic-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.PUBLIC_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.PUBLIC_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/rspack-basic-file-based/tests/app.spec.ts b/e2e/vue-router/rspack-basic-file-based/tests/app.spec.ts index 10beff655f..d230263bfe 100644 --- a/e2e/vue-router/rspack-basic-file-based/tests/app.spec.ts +++ b/e2e/vue-router/rspack-basic-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/rspack-basic-file-based/tests/setup/global.setup.ts b/e2e/vue-router/rspack-basic-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/rspack-basic-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/rspack-basic-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/rspack-basic-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/rspack-basic-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts index bf3adc082c..e66d2ff339 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,16 +13,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts index b09f6ccda8..e5c7e8b77e 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts @@ -12,19 +12,6 @@ export default defineConfig({ pluginVue(), pluginVueJsx(), ], - source: { - define: { - // Rsbuild only defines `import.meta.env.PUBLIC_*` when the env var exists. - // When it doesn't, rspack can transform `import.meta.env` to `void 0`, which - // makes `import.meta.env.PUBLIC_*` crash at runtime. - 'import.meta.env.PUBLIC_NODE_ENV': JSON.stringify( - process.env.PUBLIC_NODE_ENV ?? '', - ), - 'import.meta.env.PUBLIC_EXTERNAL_PORT': JSON.stringify( - process.env.PUBLIC_EXTERNAL_PORT ?? '', - ), - }, - }, tools: { rspack: { plugins: [ diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx index 0b557a0f65..5f5463a668 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.PUBLIC_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.PUBLIC_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts index 10beff655f..d230263bfe 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/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(packageJson.name) -} diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts b/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts index 9d7691f0fd..0617259e4f 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts @@ -1,6 +1,5 @@ import { defineConfig, devices } from '@playwright/test' import { - getDummyServerPort, getTestServerPort, resolveRuntimeSuffix, } from '@tanstack/router-e2e-utils' @@ -9,7 +8,6 @@ import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort( packageJson.name + `-${resolveRuntimeSuffix('browser')}`, ) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,16 +18,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts b/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts index 80a340cef4..9fa1623c08 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts @@ -1,6 +1,5 @@ import { defineConfig, devices } from '@playwright/test' import { - getDummyServerPort, getTestServerPort, resolveRuntimeSuffix, } from '@tanstack/router-e2e-utils' @@ -9,7 +8,6 @@ import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort( packageJson.name + `-${resolveRuntimeSuffix('hash')}`, ) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,16 +18,13 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/src/posts.tsx b/e2e/vue-router/scroll-restoration-sandbox-vite/src/posts.tsx index c6cba486ab..bc56dff904 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/src/posts.tsx +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/src/posts.tsx @@ -12,11 +12,7 @@ export type PostType = { export class PostNotFoundError extends Error {} -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/tests/app.spec.ts b/e2e/vue-router/scroll-restoration-sandbox-vite/tests/app.spec.ts index 5f226c6db3..067f0341c4 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/tests/app.spec.ts +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' import { toRuntimePath } from '@tanstack/router-e2e-utils' test('Smoke - Renders home', async ({ page }) => { diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts b/e2e/vue-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/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(packageJson.name) -} diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts b/e2e/vue-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/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(packageJson.name) -} diff --git a/e2e/vue-router/view-transitions/playwright.config.ts b/e2e/vue-router/view-transitions/playwright.config.ts index c5de6b5611..e7e4795203 100644 --- a/e2e/vue-router/view-transitions/playwright.config.ts +++ b/e2e/vue-router/view-transitions/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -22,11 +18,8 @@ export default defineConfig({ baseURL, }, - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/vue-router/view-transitions/tests/app.spec.ts b/e2e/vue-router/view-transitions/tests/app.spec.ts index 472bd6ed0b..6c1ccf1a6e 100644 --- a/e2e/vue-router/view-transitions/tests/app.spec.ts +++ b/e2e/vue-router/view-transitions/tests/app.spec.ts @@ -1,4 +1,4 @@ -import { test } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/view-transitions/tests/setup/global.setup.ts b/e2e/vue-router/view-transitions/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-router/view-transitions/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(packageJson.name) -} diff --git a/e2e/vue-router/view-transitions/tests/setup/global.teardown.ts b/e2e/vue-router/view-transitions/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-router/view-transitions/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(packageJson.name) -} diff --git a/e2e/vue-router/view-transitions/tests/view-transitions.spec.ts b/e2e/vue-router/view-transitions/tests/view-transitions.spec.ts index 31d8b12b04..e62662a1d2 100644 --- a/e2e/vue-router/view-transitions/tests/view-transitions.spec.ts +++ b/e2e/vue-router/view-transitions/tests/view-transitions.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.addInitScript(() => { diff --git a/e2e/vue-start/basic-cloudflare/playwright.config.ts b/e2e/vue-start/basic-cloudflare/playwright.config.ts index a545dff891..99b9f3460a 100644 --- a/e2e/vue-start/basic-cloudflare/playwright.config.ts +++ b/e2e/vue-start/basic-cloudflare/playwright.config.ts @@ -14,9 +14,6 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, diff --git a/e2e/vue-start/basic-cloudflare/tests/setup/global.setup.ts b/e2e/vue-start/basic-cloudflare/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-start/basic-cloudflare/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(packageJson.name) -} diff --git a/e2e/vue-start/basic-cloudflare/tests/setup/global.teardown.ts b/e2e/vue-start/basic-cloudflare/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-start/basic-cloudflare/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(packageJson.name) -} diff --git a/e2e/vue-start/basic-vue-query/playwright.config.ts b/e2e/vue-start/basic-vue-query/playwright.config.ts index 84636ab0f9..d31cc03c2e 100644 --- a/e2e/vue-start/basic-vue-query/playwright.config.ts +++ b/e2e/vue-start/basic-vue-query/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` @@ -16,18 +12,18 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, + }, }, projects: [ diff --git a/e2e/vue-start/basic-vue-query/src/routes/api.users.ts b/e2e/vue-start/basic-vue-query/src/routes/api.users.ts index cab4cafc3f..f9330a87db 100644 --- a/e2e/vue-start/basic-vue-query/src/routes/api.users.ts +++ b/e2e/vue-start/basic-vue-query/src/routes/api.users.ts @@ -2,11 +2,7 @@ import { createFileRoute } from '@tanstack/vue-router' import axios from 'redaxios' import type { User } from '../utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/api/users')({ server: { diff --git a/e2e/vue-start/basic-vue-query/src/routes/api/users.$id.ts b/e2e/vue-start/basic-vue-query/src/routes/api/users.$id.ts index 4cc4b33a0b..d138746730 100644 --- a/e2e/vue-start/basic-vue-query/src/routes/api/users.$id.ts +++ b/e2e/vue-start/basic-vue-query/src/routes/api/users.$id.ts @@ -2,11 +2,7 @@ import { createFileRoute } from '@tanstack/vue-router' import axios from 'redaxios' import type { User } from '../../utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/api/users/$id')({ server: { diff --git a/e2e/vue-start/basic-vue-query/src/utils/posts.tsx b/e2e/vue-start/basic-vue-query/src/utils/posts.tsx index b0a0b8f60d..c6b5e70a0b 100644 --- a/e2e/vue-start/basic-vue-query/src/utils/posts.tsx +++ b/e2e/vue-start/basic-vue-query/src/utils/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const postsQueryOptions = () => queryOptions({ diff --git a/e2e/vue-start/basic-vue-query/tests/app.spec.ts b/e2e/vue-start/basic-vue-query/tests/app.spec.ts index ab2469f68d..4ce5c20ef7 100644 --- a/e2e/vue-start/basic-vue-query/tests/app.spec.ts +++ b/e2e/vue-start/basic-vue-query/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test('Navigating to post', async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-start/basic-vue-query/tests/setup/global.setup.ts b/e2e/vue-start/basic-vue-query/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-start/basic-vue-query/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(packageJson.name) -} diff --git a/e2e/vue-start/basic-vue-query/tests/setup/global.teardown.ts b/e2e/vue-start/basic-vue-query/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-start/basic-vue-query/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(packageJson.name) -} diff --git a/e2e/vue-start/basic-vue-query/tests/transition.spec.ts b/e2e/vue-start/basic-vue-query/tests/transition.spec.ts index 2c28fc72a2..a0f3bf0964 100644 --- a/e2e/vue-start/basic-vue-query/tests/transition.spec.ts +++ b/e2e/vue-start/basic-vue-query/tests/transition.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test('transitions/count/query should keep old values visible during navigation', async ({ page, diff --git a/e2e/vue-start/basic/package.json b/e2e/vue-start/basic/package.json index 6d456525b5..c321586d1d 100644 --- a/e2e/vue-start/basic/package.json +++ b/e2e/vue-start/basic/package.json @@ -6,12 +6,12 @@ "scripts": { "dev": "vite dev --port 3000", "dev:e2e": "vite dev", - "build": "vite build && tsc --noEmit", + "build": "pnpm build:vite", "preview": "vite preview", "start": "node server.js", - "test:e2e:startDummyServer": "node -e 'import(\"./tests/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"./tests/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"./tests/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e:local": "playwright test --project=chromium" + "test:e2e:local": "playwright test --project=chromium", + "build:vite": "vite build && tsc --noEmit", + "build:rsbuild": "rsbuild build && tsc --noEmit" }, "dependencies": { "@tanstack/vue-router": "workspace:^", @@ -59,7 +59,10 @@ }, { "toolchain": "vite", - "mode": "prerender" + "mode": "prerender", + "env": { + "NODE_OPTIONS": "--import=@tanstack/router-e2e-utils/mock-api" + } }, { "toolchain": "vite", diff --git a/e2e/vue-start/basic/playwright.config.ts b/e2e/vue-start/basic/playwright.config.ts index 6924134cd1..165bd03ce1 100644 --- a/e2e/vue-start/basic/playwright.config.ts +++ b/e2e/vue-start/basic/playwright.config.ts @@ -1,9 +1,6 @@ import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const mode = process.env.MODE ?? 'ssr' @@ -14,7 +11,6 @@ if (process.env.TEST_WORKER_INDEX === undefined) { for (const portFile of [ `port-${e2ePortKey}.txt`, `port-${e2ePortKey}_start.txt`, - `port-${e2ePortKey}-external.txt`, ]) { fs.rmSync(portFile, { force: true }) } @@ -22,20 +18,17 @@ if (process.env.TEST_WORKER_INDEX === undefined) { const PORT = await getTestServerPort(e2ePortKey) const START_PORT = await getTestServerPort(`${e2ePortKey}_start`) -const EXTERNAL_PORT = await getDummyServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` const commandByMode = mode === 'preview' - ? `pnpm run test:e2e:startDummyServer && pnpm preview --outDir ${distDir} --port ${PORT}` - : `pnpm run test:e2e:startDummyServer && pnpm start` + ? `pnpm preview --host 0.0.0.0 --outDir ${distDir} --port ${PORT}` + : `pnpm start` export default defineConfig({ testDir: './tests', workers: 1, reporter: [['line']], - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, @@ -46,9 +39,9 @@ export default defineConfig({ reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, MODE: mode, VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), VITE_SERVER_PORT: String(PORT), START_PORT: String(START_PORT), PORT: String(PORT), diff --git a/e2e/vue-start/basic/src/routes/api/users.$userId.ts b/e2e/vue-start/basic/src/routes/api/users.$userId.ts index 50b9ca995a..24938d51c2 100644 --- a/e2e/vue-start/basic/src/routes/api/users.$userId.ts +++ b/e2e/vue-start/basic/src/routes/api/users.$userId.ts @@ -1,19 +1,15 @@ import { createFileRoute } from '@tanstack/vue-router' import type { User } from '~/utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} - export const Route = createFileRoute('/api/users/$userId')({ server: { handlers: { GET: async ({ params, request }) => { console.info(`Fetching users by id=${params.userId}... @`, request.url) try { - const res = await fetch(`${queryURL}/users/${params.userId}`) + const res = await fetch( + `https://jsonplaceholder.typicode.com/users/${params.userId}`, + ) if (!res.ok) { throw new Error('Failed to fetch user') } diff --git a/e2e/vue-start/basic/src/routes/api/users.ts b/e2e/vue-start/basic/src/routes/api/users.ts index 97989b93ca..c6045977b8 100644 --- a/e2e/vue-start/basic/src/routes/api/users.ts +++ b/e2e/vue-start/basic/src/routes/api/users.ts @@ -38,19 +38,13 @@ const testMiddleware = createMiddleware() return result }) -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} - export const Route = createFileRoute('/api/users')({ server: { middleware: [testMiddleware, userLoggerMiddleware, testParentMiddleware], handlers: { GET: async ({ request }) => { console.info('Fetching users... @', request.url) - const res = await fetch(`${queryURL}/users`) + const res = await fetch('https://jsonplaceholder.typicode.com/users') if (!res.ok) { throw new Error('Failed to fetch users') } diff --git a/e2e/vue-start/basic/src/utils/posts.tsx b/e2e/vue-start/basic/src/utils/posts.tsx index 66cb298f83..d8e2dc7450 100644 --- a/e2e/vue-start/basic/src/utils/posts.tsx +++ b/e2e/vue-start/basic/src/utils/posts.tsx @@ -8,18 +8,12 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} - export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) .handler(async ({ data: postId }) => { console.info(`Fetching post with id ${postId}...`) const post = await axios - .get(`${queryURL}/posts/${postId}`) + .get(`https://jsonplaceholder.typicode.com/posts/${postId}`) .then((r) => r.data) .catch((err) => { console.error(err) @@ -36,7 +30,7 @@ export const fetchPosts = createServerFn({ method: 'GET' }).handler( async () => { console.info('Fetching posts...') return axios - .get>(`${queryURL}/posts`) + .get>('https://jsonplaceholder.typicode.com/posts') .then((r) => r.data.slice(0, 10)) }, ) diff --git a/e2e/vue-start/basic/src/utils/users.tsx b/e2e/vue-start/basic/src/utils/users.tsx index 46be4b1580..7ba645b383 100644 --- a/e2e/vue-start/basic/src/utils/users.tsx +++ b/e2e/vue-start/basic/src/utils/users.tsx @@ -3,7 +3,3 @@ export type User = { name: string email: string } - -const PORT = process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/vue-start/basic/src/vite-env.d.ts b/e2e/vue-start/basic/src/vite-env.d.ts index e8259b1e33..4da6234c8a 100644 --- a/e2e/vue-start/basic/src/vite-env.d.ts +++ b/e2e/vue-start/basic/src/vite-env.d.ts @@ -2,7 +2,6 @@ interface ImportMetaEnv { readonly VITE_NODE_ENV: string - readonly VITE_EXTERNAL_PORT: string readonly VITE_SERVER_PORT: string } diff --git a/e2e/vue-start/basic/tests/fixture-api.spec.ts b/e2e/vue-start/basic/tests/fixture-api.spec.ts new file mode 100644 index 0000000000..6c9b26dc4c --- /dev/null +++ b/e2e/vue-start/basic/tests/fixture-api.spec.ts @@ -0,0 +1,11 @@ +import { expect, test } from '@playwright/test' + +test('server API receives canned users without a fixture listener', async ({ + request, +}) => { + const response = await request.get('/api/users') + expect(response.ok()).toBe(true) + const users = await response.json() + expect(users).toHaveLength(10) + expect(users[0]).toMatchObject({ id: 1, name: 'Leanne Graham' }) +}) diff --git a/e2e/vue-start/basic/tests/redirect.spec.ts b/e2e/vue-start/basic/tests/redirect.spec.ts index 2f6354aa81..c78124abe8 100644 --- a/e2e/vue-start/basic/tests/redirect.spec.ts +++ b/e2e/vue-start/basic/tests/redirect.spec.ts @@ -1,19 +1,17 @@ import queryString from 'node:querystring' -import { expect, type Page } from '@playwright/test' +import { expect } from '@playwright/test' +import { getTestServerPort, test } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' -import { - getDummyServerPort, - getTestServerPort, - test, -} from '@tanstack/router-e2e-utils' -import { getE2EPortKey } from './utils/getE2EPortKey.ts' +import type { Page } from '@playwright/test' +import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const e2ePortKey = getE2EPortKey() -const PORT = await getTestServerPort(e2ePortKey) -const EXTERNAL_HOST_PORT = await getDummyServerPort(e2ePortKey) +const PORT = await getTestServerPort( + process.env.E2E_PORT_KEY ?? packageJson.name, +) +const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` const POSTS_URL = `http://localhost:${PORT}/posts` async function waitForRouterIdle(page: Page) { @@ -106,7 +104,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + externalHost: `${EXTERNAL_ORIGIN}/`, }) if (scenario === 'navigate') { @@ -119,7 +117,7 @@ test.describe('redirects', () => { await page.goto(`/redirect/external/via-${thrower}?${q}`) } - const url = `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) expect(page.url()).toBe(url) @@ -140,7 +138,7 @@ test.describe('redirects', () => { }) => { let fullPageLoad = false const q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + externalHost: `${EXTERNAL_ORIGIN}/`, reloadDocument, }) @@ -159,10 +157,7 @@ test.describe('redirects', () => { await page.goto(`/redirect/${target}/serverFn/via-${thrower}?${q}`) } - const url = - target === 'internal' - ? POSTS_URL - : `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = target === 'internal' ? POSTS_URL : `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) expect(page.url()).toBe(url) if (target === 'internal' && scenario === 'navigate') { @@ -184,7 +179,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, + externalHost: `${EXTERNAL_ORIGIN}/`, reloadDocument, }) @@ -201,10 +196,7 @@ test.describe('redirects', () => { await button.click() - const url = - target === 'internal' - ? POSTS_URL - : `http://localhost:${EXTERNAL_HOST_PORT}/` + const url = target === 'internal' ? POSTS_URL : `${EXTERNAL_ORIGIN}/` await page.waitForURL(url) expect(page.url()).toBe(url) if (target === 'internal') { diff --git a/e2e/vue-start/basic/tests/setup/global.setup.ts b/e2e/vue-start/basic/tests/setup/global.setup.ts deleted file mode 100644 index cd38c35885..0000000000 --- a/e2e/vue-start/basic/tests/setup/global.setup.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' -import { getE2EPortKey } from '../utils/getE2EPortKey.ts' - -export default async function setup() { - await e2eStartDummyServer(getE2EPortKey()) -} diff --git a/e2e/vue-start/basic/tests/setup/global.teardown.ts b/e2e/vue-start/basic/tests/setup/global.teardown.ts deleted file mode 100644 index 36e5c92858..0000000000 --- a/e2e/vue-start/basic/tests/setup/global.teardown.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' -import { getE2EPortKey } from '../utils/getE2EPortKey.ts' - -export default async function teardown() { - try { - await e2eStopDummyServer(getE2EPortKey()) - } catch {} -} diff --git a/e2e/vue-start/basic/tests/setup/waitForDummyServer.ts b/e2e/vue-start/basic/tests/setup/waitForDummyServer.ts deleted file mode 100644 index 88c18fd79e..0000000000 --- a/e2e/vue-start/basic/tests/setup/waitForDummyServer.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { getDummyServerPort } from '@tanstack/router-e2e-utils' -import { getE2EPortKey } from '../utils/getE2EPortKey.ts' - -const timeoutMs = 10_000 -const retryIntervalMs = 100 - -export default async function waitForDummyServer() { - const port = await getDummyServerPort(getE2EPortKey()) - const deadline = Date.now() + timeoutMs - - while (Date.now() < deadline) { - try { - const response = await fetch(`http://localhost:${port}/`) - - if (response.ok) { - return - } - } catch {} - - await new Promise((resolve) => setTimeout(resolve, retryIntervalMs)) - } - - throw new Error(`Timed out waiting for dummy server on port ${port}`) -} diff --git a/e2e/vue-start/css-modules/playwright.config.ts b/e2e/vue-start/css-modules/playwright.config.ts index 0b810d5372..fd9ace2034 100644 --- a/e2e/vue-start/css-modules/playwright.config.ts +++ b/e2e/vue-start/css-modules/playwright.config.ts @@ -12,9 +12,6 @@ export default defineConfig({ workers: 1, reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { baseURL, }, diff --git a/e2e/vue-start/css-modules/tests/setup/global.setup.ts b/e2e/vue-start/css-modules/tests/setup/global.setup.ts deleted file mode 100644 index 2d3a1db946..0000000000 --- a/e2e/vue-start/css-modules/tests/setup/global.setup.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { - e2eStartDummyServer, - getTestServerPort, - preOptimizeDevServer, - waitForServer, -} from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } - -export default async function setup() { - await e2eStartDummyServer(packageJson.name) - - if (process.env.MODE !== 'dev') return - - const port = await getTestServerPort(packageJson.name) - const baseURL = `http://localhost:${port}` - - await waitForServer(baseURL) - await preOptimizeDevServer({ - baseURL, - readyTestId: 'global-styled', - warmup: async (page) => { - await page.goto(`${baseURL}/modules`, { waitUntil: 'domcontentloaded' }) - await page.getByTestId('module-card').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.goto(`${baseURL}/sass-mixin`, { - waitUntil: 'domcontentloaded', - }) - await page.getByTestId('mixin-styled').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.goto(`${baseURL}/`, { waitUntil: 'domcontentloaded' }) - await page.getByTestId('global-styled').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.getByTestId('nav-modules').click() - await page.waitForURL('**/modules') - await page.getByTestId('module-card').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - - await page.getByTestId('nav-home').click() - await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) - await page.getByTestId('global-styled').waitFor({ state: 'visible' }) - await page.waitForLoadState('networkidle') - }, - }) -} diff --git a/e2e/vue-start/css-modules/tests/setup/global.teardown.ts b/e2e/vue-start/css-modules/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-start/css-modules/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(packageJson.name) -} diff --git a/e2e/vue-start/custom-basepath/playwright.config.ts b/e2e/vue-start/custom-basepath/playwright.config.ts index 5095425f47..9f14b88896 100644 --- a/e2e/vue-start/custom-basepath/playwright.config.ts +++ b/e2e/vue-start/custom-basepath/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}/custom/basepath` /** @@ -18,19 +14,19 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, + }, }, projects: [ diff --git a/e2e/vue-start/custom-basepath/src/routes/api/users.$userId.ts b/e2e/vue-start/custom-basepath/src/routes/api/users.$userId.ts index 50b9ca995a..7e3f528d68 100644 --- a/e2e/vue-start/custom-basepath/src/routes/api/users.$userId.ts +++ b/e2e/vue-start/custom-basepath/src/routes/api/users.$userId.ts @@ -1,11 +1,7 @@ import { createFileRoute } from '@tanstack/vue-router' import type { User } from '~/utils/users' -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/api/users/$userId')({ server: { diff --git a/e2e/vue-start/custom-basepath/src/routes/api/users.ts b/e2e/vue-start/custom-basepath/src/routes/api/users.ts index 97989b93ca..dfdb5cd844 100644 --- a/e2e/vue-start/custom-basepath/src/routes/api/users.ts +++ b/e2e/vue-start/custom-basepath/src/routes/api/users.ts @@ -38,11 +38,7 @@ const testMiddleware = createMiddleware() return result }) -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const Route = createFileRoute('/api/users')({ server: { diff --git a/e2e/vue-start/custom-basepath/src/utils/posts.tsx b/e2e/vue-start/custom-basepath/src/utils/posts.tsx index 66cb298f83..11d80d08b5 100644 --- a/e2e/vue-start/custom-basepath/src/utils/posts.tsx +++ b/e2e/vue-start/custom-basepath/src/utils/posts.tsx @@ -8,11 +8,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) diff --git a/e2e/vue-start/custom-basepath/src/utils/users.tsx b/e2e/vue-start/custom-basepath/src/utils/users.tsx index 46be4b1580..7ba645b383 100644 --- a/e2e/vue-start/custom-basepath/src/utils/users.tsx +++ b/e2e/vue-start/custom-basepath/src/utils/users.tsx @@ -3,7 +3,3 @@ export type User = { name: string email: string } - -const PORT = process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/vue-start/custom-basepath/tests/setup/global.setup.ts b/e2e/vue-start/custom-basepath/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-start/custom-basepath/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(packageJson.name) -} diff --git a/e2e/vue-start/custom-basepath/tests/setup/global.teardown.ts b/e2e/vue-start/custom-basepath/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-start/custom-basepath/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(packageJson.name) -} diff --git a/e2e/vue-start/scroll-restoration/playwright.config.ts b/e2e/vue-start/scroll-restoration/playwright.config.ts index b0c365f8bd..76044a35d4 100644 --- a/e2e/vue-start/scroll-restoration/playwright.config.ts +++ b/e2e/vue-start/scroll-restoration/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -18,19 +14,19 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, + }, }, projects: [ diff --git a/e2e/vue-start/scroll-restoration/src/utils/posts.tsx b/e2e/vue-start/scroll-restoration/src/utils/posts.tsx index e45ef52969..c4a2d0dcca 100644 --- a/e2e/vue-start/scroll-restoration/src/utils/posts.tsx +++ b/e2e/vue-start/scroll-restoration/src/utils/posts.tsx @@ -10,11 +10,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export class PostNotFoundError extends Error {} diff --git a/e2e/vue-start/scroll-restoration/src/utils/users.tsx b/e2e/vue-start/scroll-restoration/src/utils/users.tsx index 46be4b1580..7ba645b383 100644 --- a/e2e/vue-start/scroll-restoration/src/utils/users.tsx +++ b/e2e/vue-start/scroll-restoration/src/utils/users.tsx @@ -3,7 +3,3 @@ export type User = { name: string email: string } - -const PORT = process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/vue-start/scroll-restoration/tests/setup/global.setup.ts b/e2e/vue-start/scroll-restoration/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-start/scroll-restoration/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(packageJson.name) -} diff --git a/e2e/vue-start/scroll-restoration/tests/setup/global.teardown.ts b/e2e/vue-start/scroll-restoration/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-start/scroll-restoration/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(packageJson.name) -} diff --git a/e2e/vue-start/virtual-routes/playwright.config.ts b/e2e/vue-start/virtual-routes/playwright.config.ts index b0c365f8bd..76044a35d4 100644 --- a/e2e/vue-start/virtual-routes/playwright.config.ts +++ b/e2e/vue-start/virtual-routes/playwright.config.ts @@ -1,12 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const PORT = await getTestServerPort(packageJson.name) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -18,19 +14,19 @@ export default defineConfig({ reporter: [['line']], - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, + }, }, projects: [ diff --git a/e2e/vue-start/virtual-routes/src/posts.tsx b/e2e/vue-start/virtual-routes/src/posts.tsx index 1b4c92b41d..f7a1941605 100644 --- a/e2e/vue-start/virtual-routes/src/posts.tsx +++ b/e2e/vue-start/virtual-routes/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-start/virtual-routes/src/utils/posts.tsx b/e2e/vue-start/virtual-routes/src/utils/posts.tsx index 66cb298f83..11d80d08b5 100644 --- a/e2e/vue-start/virtual-routes/src/utils/posts.tsx +++ b/e2e/vue-start/virtual-routes/src/utils/posts.tsx @@ -8,11 +8,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) diff --git a/e2e/vue-start/virtual-routes/src/utils/users.tsx b/e2e/vue-start/virtual-routes/src/utils/users.tsx index 46be4b1580..7ba645b383 100644 --- a/e2e/vue-start/virtual-routes/src/utils/users.tsx +++ b/e2e/vue-start/virtual-routes/src/utils/users.tsx @@ -3,7 +3,3 @@ export type User = { name: string email: string } - -const PORT = process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/vue-start/virtual-routes/tests/app.spec.ts b/e2e/vue-start/virtual-routes/tests/app.spec.ts index 3182febfa0..e9db98e3f3 100644 --- a/e2e/vue-start/virtual-routes/tests/app.spec.ts +++ b/e2e/vue-start/virtual-routes/tests/app.spec.ts @@ -1,4 +1,5 @@ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { apiTest as test } from '@tanstack/router-e2e-utils' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-start/virtual-routes/tests/setup/global.setup.ts b/e2e/vue-start/virtual-routes/tests/setup/global.setup.ts deleted file mode 100644 index 3593d10ab9..0000000000 --- a/e2e/vue-start/virtual-routes/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(packageJson.name) -} diff --git a/e2e/vue-start/virtual-routes/tests/setup/global.teardown.ts b/e2e/vue-start/virtual-routes/tests/setup/global.teardown.ts deleted file mode 100644 index 62fd79911c..0000000000 --- a/e2e/vue-start/virtual-routes/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(packageJson.name) -} diff --git a/examples/vue/basic-file-based-jsx/src/posts.tsx b/examples/vue/basic-file-based-jsx/src/posts.tsx index 1b4c92b41d..f7a1941605 100644 --- a/examples/vue/basic-file-based-jsx/src/posts.tsx +++ b/examples/vue/basic-file-based-jsx/src/posts.tsx @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/examples/vue/basic-file-based-sfc/src/posts.ts b/examples/vue/basic-file-based-sfc/src/posts.ts index 1b4c92b41d..f7a1941605 100644 --- a/examples/vue/basic-file-based-sfc/src/posts.ts +++ b/examples/vue/basic-file-based-sfc/src/posts.ts @@ -7,11 +7,7 @@ export type PostType = { body: string } -let queryURL = 'https://jsonplaceholder.typicode.com' - -if (import.meta.env.VITE_NODE_ENV === 'test') { - queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` -} +const queryURL = 'https://jsonplaceholder.typicode.com' export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1f7b082882..65aed76f9d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -573,9 +573,15 @@ importers: e2e/e2e-utils: devDependencies: + '@msw/playwright': + specifier: 0.6.7 + version: 0.6.7(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2)) get-port-please: specifier: ^3.2.0 version: 3.2.0 + msw: + specifier: 2.15.0 + version: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) rimraf: specifier: 'catalog:' version: 6.1.2 @@ -585,6 +591,9 @@ importers: vite-plugin-dts: specifier: 4.2.3 version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + vitest: + specifier: 'catalog:' + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) e2e/eslint-plugin-start: devDependencies: @@ -29750,6 +29759,95 @@ packages: use-sync-external-store: optional: true + '@msw/playwright@0.6.7': + resolution: {integrity: sha512-q7m2JtnN1Iz25xauqx5lkD+tbbDM3oXZBg67aXr4EbxK7IZKTh6c71bbTCnDi/F2SuHq/jPUfS8NJXPcdroARA==} + engines: {node: '>=20.0.0'} + peerDependencies: + msw: ^2.12.10 + + '@mswjs/interceptors@0.41.9': + resolution: {integrity: sha512-VVPPgHyQ6ShqnrmDWuxjmUIsO9gWyOZFmuOfLd9LfBGQJwZfy0gvv9pbHSJuoFNIYC7ZDX9aoFwowjcdSC4E8w==} + engines: {node: '>=18'} + + msw@2.15.0: + resolution: {integrity: sha512-2wQAmKkQKxRuXvYJxVhPGG0wZNBQyD06oJvxqw90XqLvptdqxdlHrFUfEteKkpaNORX3Xzc+HtEl/q0nfmN2wQ==} + engines: {node: '>=18'} + hasBin: true + peerDependencies: + typescript: '>= 4.8.x' + peerDependenciesMeta: + typescript: + optional: true + + '@inquirer/confirm@6.3.2': + resolution: {integrity: sha512-Xvr/0HggjddPtGppuqVmxhTw+Hr8PvsZ/k0HmOEaAqQEt80OITNkFWnsdNmyT0/eM4Ab+iJLx2R8rctlEyfSVg==} + engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + peerDependencies: + '@types/node': 25.0.9 + peerDependenciesMeta: + '@types/node': + optional: true + + '@inquirer/core@12.0.3': + resolution: {integrity: sha512-wsSy0sznmXwkty+2PzZwx00Cazc/E0r0B7mAzdGROz2Ct+DFZXaK7WDjGZvgjRldxH5ZhFVfF2lgkYrqgOw2KA==} + engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + peerDependencies: + '@types/node': 25.0.9 + peerDependenciesMeta: + '@types/node': + optional: true + + '@inquirer/ansi@2.0.8': + resolution: {integrity: sha512-WpQM+Ti6Z40EFwwt+uL2p4UabT+W179zHp6HhLVOzfbwnVn05IPO/eXIZXGNqcT1jbQ15SujNLzQ39k4QPPxBQ==} + engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + + '@inquirer/figures@2.0.9': + resolution: {integrity: sha512-EAWgUTGQ/Umgga51dE3B2PUHbufuXarDfg86uVgoSgNHNNQnyFKcOrQLWVqYMghuSyHh8+2HUH0Js9cTC1WAdg==} + engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + + '@inquirer/type@4.1.1': + resolution: {integrity: sha512-yJoHYrMnxIsJZCY+0Vb66Dy3he3kL3e2wOBKhoSwWWAzZAY82emlxwgprCtp6yRixvNRNq9ztfRWQYPNr3Go7A==} + engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + peerDependencies: + '@types/node': 25.0.9 + peerDependenciesMeta: + '@types/node': + optional: true + + mute-stream@3.0.0: + resolution: {integrity: sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==} + engines: {node: ^20.17.0 || >=22.9.0} + + '@open-draft/deferred-promise@3.0.0': + resolution: {integrity: sha512-XW375UK8/9SqUVNVa6M0yEy8+iTi4QN5VZ7aZuRFQmy76LRwI9wy5F4YIBU6T+eTe2/DNDo8tqu8RHlwLHM6RA==} + + '@types/statuses@2.0.6': + resolution: {integrity: sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==} + + cookie@1.1.1: + resolution: {integrity: sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==} + engines: {node: '>=18'} + + graphql@16.14.2: + resolution: {integrity: sha512-Chq1s4CY7jmh8gO2qvLIJyfCDIN+EHLFW/9iShnp1z8FjBQMoodWP1kDC36VAMXXIvAjj4ARa7ntfAV2BrjsbA==} + engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} + + headers-polyfill@5.0.1: + resolution: {integrity: sha512-1TJ6Fih/b8h5TIcv+1+Hw0PDQWJTKDKzFZzcKOiW1wJza3XoAQlkCuXLbymPYB8+ZQyw8mHvdw560e8zVFIWyA==} + + '@types/set-cookie-parser@2.4.10': + resolution: {integrity: sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==} + + rettime@0.11.11: + resolution: {integrity: sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==} + + type-fest@5.9.0: + resolution: {integrity: sha512-yANm3Jr3GiJ1qgJlxGAVxTOIcEOk1rhQHamlXtnrCK7EHP4HeM9OGxtMg/W7HFdrVzw/ZWJKGVIJusVH85sLtw==} + engines: {node: '>=20'} + + until-async@3.0.2: + resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==} + snapshots: '@adobe/css-tools@4.4.1': {} @@ -45987,3 +46085,134 @@ snapshots: immer: 10.1.1 react: 19.2.3 use-sync-external-store: 1.6.0(react@19.2.3) + '@msw/playwright@0.6.7(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))': + dependencies: + '@mswjs/interceptors': 0.41.9 + msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) + outvariant: 1.4.3 + + '@mswjs/interceptors@0.41.9': + dependencies: + '@open-draft/deferred-promise': 2.2.0 + '@open-draft/logger': 0.3.0 + '@open-draft/until': 2.1.0 + is-node-process: 1.2.0 + outvariant: 1.4.3 + strict-event-emitter: 0.5.1 + + msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2): + dependencies: + '@inquirer/confirm': 6.3.2(@types/node@25.0.9) + '@mswjs/interceptors': 0.41.9 + '@open-draft/deferred-promise': 3.0.0 + '@types/statuses': 2.0.6 + cookie: 1.1.1 + graphql: 16.14.2 + headers-polyfill: 5.0.1 + is-node-process: 1.2.0 + outvariant: 1.4.3 + path-to-regexp: 6.3.0 + picocolors: 1.1.1 + rettime: 0.11.11 + statuses: 2.0.2 + strict-event-emitter: 0.5.1 + tough-cookie: 6.0.1 + type-fest: 5.9.0 + until-async: 3.0.2 + yargs: 17.7.2 + optionalDependencies: + typescript: '@typescript/typescript6@6.0.2' + transitivePeerDependencies: + - '@types/node' + + '@inquirer/confirm@6.3.2(@types/node@25.0.9)': + dependencies: + '@inquirer/core': 12.0.3(@types/node@25.0.9) + '@inquirer/type': 4.1.1(@types/node@25.0.9) + optionalDependencies: + '@types/node': 25.0.9 + + '@inquirer/core@12.0.3(@types/node@25.0.9)': + dependencies: + '@inquirer/ansi': 2.0.8 + '@inquirer/figures': 2.0.9 + '@inquirer/type': 4.1.1(@types/node@25.0.9) + cli-width: 4.1.0 + fast-wrap-ansi: 0.2.0 + mute-stream: 3.0.0 + signal-exit: 4.1.0 + optionalDependencies: + '@types/node': 25.0.9 + + '@inquirer/ansi@2.0.8': {} + + '@inquirer/figures@2.0.9': {} + + '@inquirer/type@4.1.1(@types/node@25.0.9)': + optionalDependencies: + '@types/node': 25.0.9 + + mute-stream@3.0.0: {} + + '@open-draft/deferred-promise@3.0.0': {} + + '@types/statuses@2.0.6': {} + + cookie@1.1.1: {} + + graphql@16.14.2: {} + + headers-polyfill@5.0.1: + dependencies: + '@types/set-cookie-parser': 2.4.10 + set-cookie-parser: 3.1.0 + + '@types/set-cookie-parser@2.4.10': + dependencies: + '@types/node': 25.0.9 + + rettime@0.11.11: {} + + type-fest@5.9.0: + dependencies: + tagged-tag: 1.0.0 + + until-async@3.0.2: {} + + vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): + dependencies: + '@vitest/expect': 4.1.4 + '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + '@vitest/pretty-format': 4.1.4 + '@vitest/runner': 4.1.4 + '@vitest/snapshot': 4.1.4 + '@vitest/spy': 4.1.4 + '@vitest/utils': 4.1.4 + es-module-lexer: 2.3.1 + expect-type: 1.3.0 + magic-string: 0.30.21 + obug: 2.1.1 + pathe: 2.0.3 + picomatch: 4.0.4 + std-env: 4.1.0 + tinybench: 2.9.0 + tinyexec: 1.0.2 + tinyglobby: 0.2.16 + tinyrainbow: 3.1.0 + vite: 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.9.0) + why-is-node-running: 2.3.0 + optionalDependencies: + '@types/node': 25.0.9 + '@vitest/ui': 4.1.4(vitest@4.1.4) + jsdom: 29.1.1(@noble/hashes@2.0.1) + transitivePeerDependencies: + - msw + + '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0))': + dependencies: + '@vitest/spy': 4.1.4 + estree-walker: 3.0.3 + magic-string: 0.30.21 + optionalDependencies: + msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) + vite: 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.9.0) diff --git a/scripts/nx/playwright-plugin.md b/scripts/nx/playwright-plugin.md index a9f33bb4c8..668210cf99 100644 --- a/scripts/nx/playwright-plugin.md +++ b/scripts/nx/playwright-plugin.md @@ -125,8 +125,7 @@ webServer: { ## 5. Use `E2E_PORT_KEY` for all server ports -If your setup uses `getTestServerPort`, `getDummyServerPort`, -`e2eStartDummyServer`, or `e2eStopDummyServer`, use +If your setup uses `getTestServerPort`, use `process.env.E2E_PORT_KEY` first. ```ts @@ -140,8 +139,7 @@ const PORT = await getTestServerPort(e2ePortKey) Dummy server setup/teardown should use the same key: ```ts -await e2eStartDummyServer(process.env.E2E_PORT_KEY ?? packageJson.name) -await e2eStopDummyServer(process.env.E2E_PORT_KEY ?? packageJson.name) + ``` ## 6. Clean stale port files once per Playwright run @@ -201,3 +199,21 @@ If `playwrightModes` is not configured, the plugin still supports: This generates legacy shard targets under `test:e2e--shard-...` plus a parent `test:e2e` target. + +## Mock API and standalone development + +Applications use `https://jsonplaceholder.typicode.com` directly. Ordinary dev, +build, and start commands reach the public API. E2E browser suites opt into +`apiTest` from the private E2E utilities, which installs the shared MSW handlers +through the official Playwright adapter. Routing disables the browser HTTP cache; +suites without API requests keep the ordinary Playwright fixture. + +Start application servers preload `@tanstack/router-e2e-utils/mock-api` through +Playwright's `webServer.env.NODE_OPTIONS`. Prerender modes set the same Node +preload in their Nx mode metadata, so cached builds and fresh servers use the +same URL without an API listener or fixture port. Other origins pass through; +unmatched requests to the API origin fail through a final MSW handler. + +External navigation uses `localhost` and `127.0.0.1` on the same application +listener, with a static destination document where needed. The application port +allocator is independent of API mocking and is removed in the next stack PR. From fda8a77405f743b6d1f053175811107fd3ef67c5 Mon Sep 17 00:00:00 2001 From: Flo Date: Mon, 14 Sep 2026 10:54:23 +0200 Subject: [PATCH 030/175] test(e2e): let Playwright manage application servers (#8357) --- e2e/e2e-utils/package.json | 3 +- e2e/e2e-utils/src/derivePort.ts | 23 --- e2e/e2e-utils/src/index.ts | 8 +- e2e/e2e-utils/src/webServer.ts | 9 ++ e2e/e2e-utils/tests/webServer.test.ts | 23 +++ .../basepath-file-based/package.json | 2 +- .../basepath-file-based/playwright.config.ts | 11 +- .../basic-esbuild-file-based/package.json | 2 +- .../playwright.config.ts | 10 +- .../package.json | 2 +- .../playwright.config.ts | 11 +- .../basic-file-based/package.json | 2 +- .../basic-file-based/playwright.config.ts | 11 +- .../tests/document-navigation.spec.ts | 7 +- .../basic-file-based/tests/redirect.spec.ts | 7 +- .../basic-file-based/tests/relative.spec.ts | 7 +- .../basic-react-query-file-based/package.json | 2 +- .../playwright.config.ts | 11 +- .../basic-react-query/package.json | 2 +- .../basic-react-query/playwright.config.ts | 11 +- .../basic-scroll-restoration/package.json | 2 +- .../playwright.config.ts | 9 +- .../basic-virtual-file-based/package.json | 2 +- .../playwright.config.ts | 11 +- .../package.json | 2 +- .../playwright.config.ts | 11 +- e2e/react-router/basic/package.json | 2 +- e2e/react-router/basic/playwright.config.ts | 11 +- e2e/react-router/basic/tests/app.spec.ts | 7 +- .../escaped-special-strings/package.json | 2 +- .../playwright.config.ts | 11 +- .../generator-cli-only/package.json | 2 +- .../generator-cli-only/playwright.config.ts | 11 +- e2e/react-router/i18n-paraglide/package.json | 2 +- .../i18n-paraglide/playwright.config.ts | 9 +- e2e/react-router/issue-4759/package.json | 2 +- .../issue-4759/playwright.config.ts | 9 +- e2e/react-router/issue-7120/package.json | 2 +- .../issue-7120/playwright.config.ts | 9 +- e2e/react-router/issue-7457/package.json | 2 +- .../issue-7457/playwright.config.ts | 9 +- .../js-only-file-based/package.json | 2 +- .../js-only-file-based/playwright.config.ts | 11 +- e2e/react-router/match-params/package.json | 2 +- .../match-params/playwright.config.ts | 9 +- e2e/react-router/react-compiler/package.json | 2 +- .../react-compiler/playwright.config.ts | 9 +- .../rspack-basic-file-based/package.json | 2 +- .../playwright.config.ts | 11 +- .../package.json | 2 +- .../playwright.config.ts | 11 +- .../package.json | 2 +- .../playwright.browser.config.ts | 16 +-- .../playwright.hash.config.ts | 16 +-- .../sentry-integration/package.json | 2 +- .../sentry-integration/playwright.config.ts | 9 +- .../view-transitions/package.json | 2 +- .../view-transitions/playwright.config.ts | 11 +- e2e/react-start/basic-auth/package.json | 2 +- .../basic-auth/playwright.config.ts | 9 +- e2e/react-start/basic-cloudflare/package.json | 2 +- .../basic-cloudflare/playwright.config.ts | 9 +- .../basic-react-query/package.json | 2 +- .../basic-react-query/playwright.config.ts | 11 +- .../basic-react-query/src/utils/users.tsx | 13 +- e2e/react-start/basic-tsr-config/package.json | 2 +- .../basic-tsr-config/playwright.config.ts | 9 +- e2e/react-start/basic/playwright.config.ts | 29 +--- e2e/react-start/basic/server.js | 55 ++++---- e2e/react-start/basic/tests/redirect.spec.ts | 7 +- .../basic/tests/utils/getE2EPortKey.ts | 5 - e2e/react-start/clerk-basic/package.json | 2 +- .../clerk-basic/playwright.config.ts | 9 +- e2e/react-start/csp/package.json | 2 +- e2e/react-start/csp/playwright.config.ts | 9 +- .../css-inline/playwright.config.ts | 17 +-- e2e/react-start/css-inline/server.js | 10 +- e2e/react-start/css-modules/package.json | 6 +- .../css-modules/playwright.config.ts | 17 +-- .../css-modules/tests/setup/global.setup.ts | 48 +++++++ .../custom-basepath/express-server.ts | 11 +- e2e/react-start/custom-basepath/package.json | 2 +- .../custom-basepath/playwright.config.ts | 11 +- .../custom-server-rsbuild/express-server.ts | 19 ++- .../custom-server-rsbuild/package.json | 2 +- .../playwright.config.ts | 8 +- .../deferred-hydration/playwright.config.ts | 19 +-- .../tests/setup/global.setup.ts | 25 ++++ e2e/react-start/dev-ssr-styles/package.json | 4 +- .../dev-ssr-styles/playwright.config.ts | 24 +--- .../tests/setup/global.setup.ts | 14 ++ e2e/react-start/early-hints/package.json | 2 +- .../early-hints/playwright.config.ts | 9 +- .../tests/early-hints-protocol.spec.ts | 10 +- e2e/react-start/hmr/playwright.config.ts | 15 +- .../hmr/tests/setup/global.setup.ts | 12 ++ e2e/react-start/i18n-paraglide/package.json | 2 +- .../i18n-paraglide/playwright.config.ts | 9 +- .../package.json | 18 ++- .../playwright.config.ts | 9 +- .../tests/error-mode.setup.ts | 30 ++-- .../tests/violations.setup.ts | 25 +++- .../import-protection/playwright.config.ts | 15 +- .../tests/error-mode.setup.ts | 39 ++++-- .../tests/violations.setup.ts | 37 ++--- e2e/react-start/issue-8049/package.json | 2 +- .../issue-8049/playwright.config.ts | 10 +- .../query-integration/package.json | 2 +- .../query-integration/playwright.config.ts | 9 +- .../root-document-hydration/package.json | 2 +- .../playwright.config.ts | 13 +- e2e/react-start/rsbuild/package.json | 2 +- e2e/react-start/rsbuild/playwright.config.ts | 13 -- .../rsbuild/tests/error-overlay.spec.ts | 24 ++-- .../playwright.config.ts | 12 +- .../tests/setup/global.setup.ts | 20 +++ e2e/react-start/rsc-query/package.json | 2 +- .../rsc-query/playwright.config.ts | 11 +- e2e/react-start/rsc-rsbuild/package.json | 2 +- .../rsc-rsbuild/playwright.config.ts | 18 +-- e2e/react-start/rsc/package.json | 2 +- e2e/react-start/rsc/playwright.config.ts | 18 +-- .../scroll-restoration/package.json | 2 +- .../scroll-restoration/playwright.config.ts | 11 +- e2e/react-start/selective-ssr/package.json | 2 +- .../selective-ssr/playwright.config.ts | 9 +- .../serialization-adapters/package.json | 2 +- .../playwright.config.ts | 9 +- .../package.json | 2 +- .../playwright.config.ts | 9 +- e2e/react-start/server-functions/package.json | 2 +- .../server-functions/playwright.config.ts | 11 +- .../tests/server-functions.spec.ts | 6 +- .../package.json | 2 +- .../playwright.config.ts | 9 +- .../server-routes/playwright.config.ts | 9 +- e2e/react-start/spa-mode/package.json | 2 +- e2e/react-start/spa-mode/playwright.config.ts | 9 +- .../split-base-and-basepath/package.json | 2 +- .../playwright.config.ts | 15 +- .../split-base-and-basepath/prod-server.js | 8 +- .../tests/setup/global.setup.ts | 25 ++++ .../start-manifest/playwright.config.ts | 9 +- .../static-server-functions/package.json | 11 +- .../playwright.config.ts | 8 +- e2e/react-start/streaming-ssr/package.json | 4 +- .../streaming-ssr/playwright.config.ts | 11 +- .../transform-asset-urls/package.json | 26 ++-- .../transform-asset-urls/playwright.config.ts | 20 +-- .../transform-asset-urls/tests/cdn-server.mjs | 6 +- e2e/react-start/virtual-routes/package.json | 2 +- .../virtual-routes/playwright.config.ts | 11 +- e2e/react-start/website/package.json | 2 +- e2e/react-start/website/playwright.config.ts | 9 +- .../basepath-file-based/package.json | 2 +- .../basepath-file-based/playwright.config.ts | 11 +- .../basic-esbuild-file-based/package.json | 2 +- .../playwright.config.ts | 9 +- .../package.json | 2 +- .../playwright.config.ts | 11 +- .../basic-file-based/package.json | 2 +- .../basic-file-based/playwright.config.ts | 11 +- .../basic-file-based/tests/redirect.spec.ts | 7 +- .../basic-file-based/tests/relative.spec.ts | 7 +- .../basic-scroll-restoration/package.json | 2 +- .../playwright.config.ts | 9 +- .../basic-solid-query-file-based/package.json | 2 +- .../playwright.config.ts | 11 +- .../basic-solid-query/package.json | 2 +- .../basic-solid-query/playwright.config.ts | 11 +- .../basic-virtual-file-based/package.json | 2 +- .../playwright.config.ts | 11 +- .../package.json | 2 +- .../playwright.config.ts | 11 +- e2e/solid-router/basic/package.json | 2 +- e2e/solid-router/basic/playwright.config.ts | 11 +- e2e/solid-router/basic/tests/app.spec.ts | 7 +- .../generator-cli-only/package.json | 2 +- .../generator-cli-only/playwright.config.ts | 11 +- .../js-only-file-based/package.json | 2 +- .../js-only-file-based/playwright.config.ts | 11 +- .../rspack-basic-file-based/package.json | 2 +- .../playwright.config.ts | 11 +- .../package.json | 2 +- .../playwright.config.ts | 11 +- .../package.json | 2 +- .../playwright.browser.config.ts | 16 +-- .../playwright.hash.config.ts | 16 +-- .../sentry-integration/package.json | 2 +- .../sentry-integration/playwright.config.ts | 9 +- .../view-transitions/package.json | 2 +- .../view-transitions/playwright.config.ts | 11 +- e2e/solid-start/basic-auth/package.json | 2 +- .../basic-auth/playwright.config.ts | 11 +- e2e/solid-start/basic-cloudflare/package.json | 2 +- .../basic-cloudflare/playwright.config.ts | 9 +- .../basic-solid-query/package.json | 2 +- .../basic-solid-query/playwright.config.ts | 11 +- .../basic-solid-query/src/utils/users.tsx | 13 +- e2e/solid-start/basic-tsr-config/package.json | 2 +- .../basic-tsr-config/playwright.config.ts | 9 +- e2e/solid-start/basic/playwright.config.ts | 27 +--- e2e/solid-start/basic/server.js | 55 ++++---- e2e/solid-start/basic/tests/redirect.spec.ts | 7 +- .../basic/tests/utils/getE2EPortKey.ts | 5 - e2e/solid-start/csp/package.json | 2 +- e2e/solid-start/csp/playwright.config.ts | 9 +- e2e/solid-start/css-modules/package.json | 2 +- .../css-modules/playwright.config.ts | 15 +- .../css-modules/tests/setup/global.setup.ts | 39 ++++++ .../custom-basepath/express-server.ts | 11 +- e2e/solid-start/custom-basepath/package.json | 2 +- .../custom-basepath/playwright.config.ts | 11 +- .../deferred-hydration/playwright.config.ts | 17 +-- .../query-integration/package.json | 2 +- .../query-integration/playwright.config.ts | 11 +- .../scroll-restoration/package.json | 2 +- .../scroll-restoration/playwright.config.ts | 11 +- e2e/solid-start/selective-ssr/dev-server.ts | 5 +- e2e/solid-start/selective-ssr/package.json | 2 +- .../selective-ssr/playwright.config.ts | 22 +-- .../serialization-adapters/package.json | 2 +- .../playwright.config.ts | 9 +- e2e/solid-start/server-functions/package.json | 2 +- .../server-functions/playwright.config.ts | 9 +- .../server-routes/playwright.config.ts | 9 +- .../solid-query-layout-suspense/package.json | 2 +- .../playwright.config.ts | 11 +- e2e/solid-start/spa-mode/package.json | 2 +- e2e/solid-start/spa-mode/playwright.config.ts | 9 +- .../start-manifest/playwright.config.ts | 9 +- e2e/solid-start/virtual-routes/package.json | 2 +- .../virtual-routes/playwright.config.ts | 11 +- e2e/solid-start/website/package.json | 2 +- e2e/solid-start/website/playwright.config.ts | 9 +- .../basepath-file-based/package.json | 2 +- .../basepath-file-based/playwright.config.ts | 11 +- .../basic-esbuild-file-based/package.json | 2 +- .../playwright.config.ts | 9 +- .../src/esbuild.run.js | 9 +- .../basic-file-based-jsx/package.json | 2 +- .../basic-file-based-jsx/playwright.config.ts | 11 +- .../basic-file-based-sfc/package.json | 2 +- .../basic-file-based-sfc/playwright.config.ts | 11 +- .../basic-scroll-restoration/package.json | 2 +- .../playwright.config.ts | 9 +- .../basic-virtual-file-based/package.json | 2 +- .../playwright.config.ts | 11 +- .../package.json | 2 +- .../playwright.config.ts | 11 +- .../basic-vue-query-file-based/package.json | 2 +- .../playwright.config.ts | 11 +- .../basic-vue-query-file-based/tsconfig.json | 2 +- e2e/vue-router/basic-vue-query/package.json | 2 +- .../basic-vue-query/playwright.config.ts | 11 +- e2e/vue-router/basic/package.json | 2 +- e2e/vue-router/basic/playwright.config.ts | 11 +- e2e/vue-router/basic/tests/app.spec.ts | 7 +- .../generator-cli-only/package.json | 2 +- .../generator-cli-only/playwright.config.ts | 11 +- .../js-only-file-based/package.json | 2 +- .../js-only-file-based/playwright.config.ts | 11 +- .../rspack-basic-file-based/package.json | 2 +- .../playwright.config.ts | 11 +- .../package.json | 2 +- .../playwright.config.ts | 11 +- .../package.json | 2 +- .../playwright.browser.config.ts | 16 +-- .../playwright.hash.config.ts | 16 +-- .../sentry-integration/package.json | 2 +- .../sentry-integration/playwright.config.ts | 9 +- e2e/vue-router/view-transitions/package.json | 2 +- .../view-transitions/playwright.config.ts | 11 +- e2e/vue-start/basic-auth/package.json | 2 +- e2e/vue-start/basic-auth/playwright.config.ts | 9 +- e2e/vue-start/basic-cloudflare/package.json | 2 +- .../basic-cloudflare/playwright.config.ts | 9 +- e2e/vue-start/basic-tsr-config/package.json | 2 +- .../basic-tsr-config/playwright.config.ts | 9 +- e2e/vue-start/basic-vue-query/package.json | 2 +- .../basic-vue-query/playwright.config.ts | 11 +- .../basic-vue-query/src/utils/users.tsx | 13 +- e2e/vue-start/basic/playwright.config.ts | 27 +--- e2e/vue-start/basic/server.js | 55 ++++---- e2e/vue-start/basic/tests/redirect.spec.ts | 7 +- .../basic/tests/utils/getE2EPortKey.ts | 5 - e2e/vue-start/css-modules/package.json | 2 +- .../css-modules/playwright.config.ts | 15 +- .../css-modules/tests/setup/global.setup.ts | 39 ++++++ .../custom-basepath/express-server.ts | 11 +- e2e/vue-start/custom-basepath/package.json | 2 +- .../custom-basepath/playwright.config.ts | 11 +- e2e/vue-start/query-integration/package.json | 2 +- .../query-integration/playwright.config.ts | 9 +- e2e/vue-start/scroll-restoration/package.json | 2 +- .../scroll-restoration/playwright.config.ts | 11 +- e2e/vue-start/selective-ssr/package.json | 2 +- .../selective-ssr/playwright.config.ts | 9 +- .../serialization-adapters/package.json | 2 +- .../playwright.config.ts | 9 +- e2e/vue-start/server-functions/package.json | 2 +- .../server-functions/playwright.config.ts | 9 +- .../server-routes/playwright.config.ts | 9 +- e2e/vue-start/spa-mode/package.json | 2 +- e2e/vue-start/spa-mode/playwright.config.ts | 9 +- .../start-manifest/playwright.config.ts | 9 +- e2e/vue-start/virtual-routes/package.json | 2 +- .../virtual-routes/playwright.config.ts | 11 +- e2e/vue-start/website/package.json | 2 +- e2e/vue-start/website/playwright.config.ts | 9 +- nx.json | 6 +- pnpm-lock.yaml | 3 - scripts/nx/playwright-plugin.md | 131 +++++++----------- scripts/nx/playwright-plugin.ts | 35 ++--- 314 files changed, 1434 insertions(+), 1484 deletions(-) delete mode 100644 e2e/e2e-utils/src/derivePort.ts create mode 100644 e2e/e2e-utils/src/webServer.ts create mode 100644 e2e/e2e-utils/tests/webServer.test.ts delete mode 100644 e2e/react-start/basic/tests/utils/getE2EPortKey.ts create mode 100644 e2e/react-start/css-modules/tests/setup/global.setup.ts create mode 100644 e2e/react-start/deferred-hydration/tests/setup/global.setup.ts create mode 100644 e2e/react-start/dev-ssr-styles/tests/setup/global.setup.ts create mode 100644 e2e/react-start/hmr/tests/setup/global.setup.ts create mode 100644 e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts create mode 100644 e2e/react-start/split-base-and-basepath/tests/setup/global.setup.ts delete mode 100644 e2e/solid-start/basic/tests/utils/getE2EPortKey.ts create mode 100644 e2e/solid-start/css-modules/tests/setup/global.setup.ts delete mode 100644 e2e/vue-start/basic/tests/utils/getE2EPortKey.ts create mode 100644 e2e/vue-start/css-modules/tests/setup/global.setup.ts diff --git a/e2e/e2e-utils/package.json b/e2e/e2e-utils/package.json index b2fad2161b..fcfa5f8dc0 100644 --- a/e2e/e2e-utils/package.json +++ b/e2e/e2e-utils/package.json @@ -39,7 +39,6 @@ "rimraf": "catalog:", "vite": "^8.0.14", "vite-plugin-dts": "^4.5.4", - "vitest": "catalog:", - "get-port-please": "^3.2.0" + "vitest": "catalog:" } } diff --git a/e2e/e2e-utils/src/derivePort.ts b/e2e/e2e-utils/src/derivePort.ts deleted file mode 100644 index ffbdf0ad9e..0000000000 --- a/e2e/e2e-utils/src/derivePort.ts +++ /dev/null @@ -1,23 +0,0 @@ -import fs from 'node:fs' -import { getRandomPort } from 'get-port-please' - -/** - * Check if a port has been allocated, if it hasn't generate a random port and save it. - * @param {string} input - port test allocation - * @returns {number} A random port. - */ -export async function derivePort(input: string): Promise { - const portFile = `port-${input}.txt` - - if (!fs.existsSync(portFile)) { - fs.writeFileSync(portFile, (await getRandomPort()).toString()) - } - - const portNumber = parseInt(await fs.promises.readFile(portFile, 'utf-8')) - console.info(`Mapped "${input}" to port ${portNumber}`) - return portNumber -} - -export async function getTestServerPort(input: string): Promise { - return await derivePort(input) -} diff --git a/e2e/e2e-utils/src/index.ts b/e2e/e2e-utils/src/index.ts index c6aad7c63c..960a01a9be 100644 --- a/e2e/e2e-utils/src/index.ts +++ b/e2e/e2e-utils/src/index.ts @@ -1,9 +1,9 @@ export { apiTest } from './api-fixture' -export { derivePort, getTestServerPort } from './derivePort' -export { toRuntimePath } from './to-runtime-path' -export { resolveRuntimeSuffix } from './resolve-runtime-suffix' export { preOptimizeDevServer, waitForServer } from './devServerWarmup' +export { collectBrowserErrors, test } from './fixture' export { createHmrFileEditor, replaceAll } from './hmrFileEditor' export type { HmrFileEditorOptions } from './hmrFileEditor' export type { Post } from './posts' -export { collectBrowserErrors, test } from './fixture' +export { resolveRuntimeSuffix } from './resolve-runtime-suffix' +export { toRuntimePath } from './to-runtime-path' +export { appServerReady, appServerReadyPattern } from './webServer' diff --git a/e2e/e2e-utils/src/webServer.ts b/e2e/e2e-utils/src/webServer.ts new file mode 100644 index 0000000000..77536e4c69 --- /dev/null +++ b/e2e/e2e-utils/src/webServer.ts @@ -0,0 +1,9 @@ +// Vite, Rsbuild, srvx, serve, and the custom E2E servers print their bound +// address only after listening. Playwright exports named captures to workers. +export const appServerReadyPattern = + /(?:Local:|Listening on|Accepting connections at|E2E app:)[^\n]*?https?:\/\/(?:localhost|127\.0\.0\.1|\[::\]):(?\d+)/ + +export const appServerReady = { + stdout: appServerReadyPattern, + stderr: appServerReadyPattern, +} diff --git a/e2e/e2e-utils/tests/webServer.test.ts b/e2e/e2e-utils/tests/webServer.test.ts new file mode 100644 index 0000000000..fd3a8b239c --- /dev/null +++ b/e2e/e2e-utils/tests/webServer.test.ts @@ -0,0 +1,23 @@ +import { stripVTControlCharacters } from 'node:util' +import { expect, test } from 'vitest' +import { appServerReadyPattern } from '../src/webServer' + +test.each([ + '➜ Local: http://localhost:49152/', + '\u001b[32m➜\u001b[39m \u001b[1mLocal\u001b[22m: \u001b[36mhttp://localhost:\u001b[1m49152\u001b[22m/\u001b[39m', + 'Listening on http://[::]:49152', + 'E2E app: http://localhost:49152', + 'Accepting connections at http://localhost:49152', + 'Local: https://localhost:49152/', +])('captures a bound application port from %s', (line) => { + expect( + appServerReadyPattern.exec(stripVTControlCharacters(line))?.groups + ?.E2E_APP_PORT, + ).toBe('49152') +}) + +test('does not confuse an arbitrary URL with app readiness', () => { + expect(appServerReadyPattern.test('fetching http://localhost:49152')).toBe( + false, + ) +}) diff --git a/e2e/react-router/basepath-file-based/package.json b/e2e/react-router/basepath-file-based/package.json index a155cc2173..3dfbb58180 100644 --- a/e2e/react-router/basepath-file-based/package.json +++ b/e2e/react-router/basepath-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/basepath-file-based/playwright.config.ts b/e2e/react-router/basepath-file-based/playwright.config.ts index be44f419e9..4eead86444 100644 --- a/e2e/react-router/basepath-file-based/playwright.config.ts +++ b/e2e/react-router/basepath-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-esbuild-file-based/package.json b/e2e/react-router/basic-esbuild-file-based/package.json index 9421e4666c..59210c24d7 100644 --- a/e2e/react-router/basic-esbuild-file-based/package.json +++ b/e2e/react-router/basic-esbuild-file-based/package.json @@ -7,7 +7,7 @@ "build": "esbuild src/main.tsx --bundle --outfile=dist/main.js && tsc --noEmit", "serve": "esbuild src/main.tsx --bundle --outfile=dist/main.js --servedir=.", "start": "dev", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/basic-esbuild-file-based/playwright.config.ts b/e2e/react-router/basic-esbuild-file-based/playwright.config.ts index ca68d5f708..a38252921f 100644 --- a/e2e/react-router/basic-esbuild-file-based/playwright.config.ts +++ b/e2e/react-router/basic-esbuild-file-based/playwright.config.ts @@ -1,8 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' + +const PORT = Number(process.env.E2E_APP_PORT ?? 0) -const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +20,8 @@ export default defineConfig({ webServer: { command: `pnpm run build && pnpm run serve --serve=${PORT} --define:process.env.NODE_ENV=\\"test\\"`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-file-based-code-splitting/package.json b/e2e/react-router/basic-file-based-code-splitting/package.json index 8355ed79ab..82ebb90e93 100644 --- a/e2e/react-router/basic-file-based-code-splitting/package.json +++ b/e2e/react-router/basic-file-based-code-splitting/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-file-based-code-splitting/playwright.config.ts b/e2e/react-router/basic-file-based-code-splitting/playwright.config.ts index e7e4795203..4eead86444 100644 --- a/e2e/react-router/basic-file-based-code-splitting/playwright.config.ts +++ b/e2e/react-router/basic-file-based-code-splitting/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-file-based/package.json b/e2e/react-router/basic-file-based/package.json index 9868755b87..0f3d243432 100644 --- a/e2e/react-router/basic-file-based/package.json +++ b/e2e/react-router/basic-file-based/package.json @@ -9,7 +9,7 @@ "preview": "vite preview", "start": "vite", "test:e2e": "pnpm run test:e2e:default", - "test:e2e:default": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e:default": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-file-based/playwright.config.ts b/e2e/react-router/basic-file-based/playwright.config.ts index fe3edefe3a..ea3ef9ffec 100644 --- a/e2e/react-router/basic-file-based/playwright.config.ts +++ b/e2e/react-router/basic-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` const command = `pnpm build && pnpm preview --host 0.0.0.0 --port ${PORT}` @@ -24,14 +23,12 @@ export default defineConfig({ webServer: { command, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { MODE: process.env.MODE || '', VITE_MODE: process.env.MODE || '', - VITE_NODE_ENV: 'test', - VITE_SERVER_PORT: String(PORT), PORT: String(PORT), }, }, diff --git a/e2e/react-router/basic-file-based/tests/document-navigation.spec.ts b/e2e/react-router/basic-file-based/tests/document-navigation.spec.ts index c07d23bff3..bd81eaa44b 100644 --- a/e2e/react-router/basic-file-based/tests/document-navigation.spec.ts +++ b/e2e/react-router/basic-file-based/tests/document-navigation.spec.ts @@ -1,10 +1,7 @@ import { expect } from '@playwright/test' -import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } +import { apiTest as test } from '@tanstack/router-e2e-utils' -const appPort = await getTestServerPort( - process.env.E2E_PORT_KEY ?? packageJson.name, -) +const appPort = Number(process.env.E2E_APP_PORT ?? 0) const adminHref = `http://127.0.0.1:${appPort}/external.html` for (const role of ['button', 'link'] as const) { diff --git a/e2e/react-router/basic-file-based/tests/redirect.spec.ts b/e2e/react-router/basic-file-based/tests/redirect.spec.ts index 69c7ee6c12..aaa9c1a6b6 100644 --- a/e2e/react-router/basic-file-based/tests/redirect.spec.ts +++ b/e2e/react-router/basic-file-based/tests/redirect.spec.ts @@ -1,15 +1,12 @@ import queryString from 'node:querystring' import { expect } from '@playwright/test' -import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' +import { apiTest as test } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' -import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = await getTestServerPort( - process.env.E2E_PORT_KEY ?? packageJson.name, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` test.describe('redirects', () => { diff --git a/e2e/react-router/basic-file-based/tests/relative.spec.ts b/e2e/react-router/basic-file-based/tests/relative.spec.ts index 7aa5f0b84b..f62c248680 100644 --- a/e2e/react-router/basic-file-based/tests/relative.spec.ts +++ b/e2e/react-router/basic-file-based/tests/relative.spec.ts @@ -1,14 +1,11 @@ import { expect } from '@playwright/test' -import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' +import { apiTest as test } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' -import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = await getTestServerPort( - process.env.E2E_PORT_KEY ?? packageJson.name, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) test.describe('relative_routing', () => { const internalNavigationTestMatrix = combinate({ diff --git a/e2e/react-router/basic-react-query-file-based/package.json b/e2e/react-router/basic-react-query-file-based/package.json index 568313a6c3..3a90a3cd6d 100644 --- a/e2e/react-router/basic-react-query-file-based/package.json +++ b/e2e/react-router/basic-react-query-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-react-query-file-based/playwright.config.ts b/e2e/react-router/basic-react-query-file-based/playwright.config.ts index d88e7ee048..fbda9bd451 100644 --- a/e2e/react-router/basic-react-query-file-based/playwright.config.ts +++ b/e2e/react-router/basic-react-query-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-react-query/package.json b/e2e/react-router/basic-react-query/package.json index a0af3b6c21..8f28340f56 100644 --- a/e2e/react-router/basic-react-query/package.json +++ b/e2e/react-router/basic-react-query/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-react-query/playwright.config.ts b/e2e/react-router/basic-react-query/playwright.config.ts index e7e4795203..4eead86444 100644 --- a/e2e/react-router/basic-react-query/playwright.config.ts +++ b/e2e/react-router/basic-react-query/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-scroll-restoration/package.json b/e2e/react-router/basic-scroll-restoration/package.json index 2ddbafc37f..c13e92cec8 100644 --- a/e2e/react-router/basic-scroll-restoration/package.json +++ b/e2e/react-router/basic-scroll-restoration/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-scroll-restoration/playwright.config.ts b/e2e/react-router/basic-scroll-restoration/playwright.config.ts index 0c5cee43e4..6a684ac89e 100644 --- a/e2e/react-router/basic-scroll-restoration/playwright.config.ts +++ b/e2e/react-router/basic-scroll-restoration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-virtual-file-based/package.json b/e2e/react-router/basic-virtual-file-based/package.json index 65122dd2a7..0343de0846 100644 --- a/e2e/react-router/basic-virtual-file-based/package.json +++ b/e2e/react-router/basic-virtual-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-virtual-file-based/playwright.config.ts b/e2e/react-router/basic-virtual-file-based/playwright.config.ts index e7e4795203..4eead86444 100644 --- a/e2e/react-router/basic-virtual-file-based/playwright.config.ts +++ b/e2e/react-router/basic-virtual-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/package.json b/e2e/react-router/basic-virtual-named-export-config-file-based/package.json index 7738971eb6..6bdb1248f6 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/package.json +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/react-router/basic-virtual-named-export-config-file-based/playwright.config.ts index e7e4795203..4eead86444 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/basic/package.json b/e2e/react-router/basic/package.json index 6eba409188..667b016896 100644 --- a/e2e/react-router/basic/package.json +++ b/e2e/react-router/basic/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic/playwright.config.ts b/e2e/react-router/basic/playwright.config.ts index e7e4795203..4eead86444 100644 --- a/e2e/react-router/basic/playwright.config.ts +++ b/e2e/react-router/basic/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/basic/tests/app.spec.ts b/e2e/react-router/basic/tests/app.spec.ts index 5038f79098..9c0a6b6901 100644 --- a/e2e/react-router/basic/tests/app.spec.ts +++ b/e2e/react-router/basic/tests/app.spec.ts @@ -1,10 +1,7 @@ import { expect } from '@playwright/test' -import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } +import { apiTest as test } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort( - process.env.E2E_PORT_KEY ?? packageJson.name, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/escaped-special-strings/package.json b/e2e/react-router/escaped-special-strings/package.json index 71a3cb08ca..af401c49d3 100644 --- a/e2e/react-router/escaped-special-strings/package.json +++ b/e2e/react-router/escaped-special-strings/package.json @@ -9,7 +9,7 @@ "preview": "vite preview", "start": "vite", "test:e2e": "pnpm run test:e2e:default", - "test:e2e:default": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e:default": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/escaped-special-strings/playwright.config.ts b/e2e/react-router/escaped-special-strings/playwright.config.ts index 0637880451..629ddefccf 100644 --- a/e2e/react-router/escaped-special-strings/playwright.config.ts +++ b/e2e/react-router/escaped-special-strings/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` const command = `pnpm build && pnpm preview --port ${PORT}` @@ -24,14 +23,12 @@ export default defineConfig({ webServer: { command, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { MODE: process.env.MODE || '', VITE_MODE: process.env.MODE || '', - VITE_NODE_ENV: 'test', - VITE_SERVER_PORT: String(PORT), PORT: String(PORT), }, }, diff --git a/e2e/react-router/generator-cli-only/package.json b/e2e/react-router/generator-cli-only/package.json index f7ff46d958..159ba05500 100644 --- a/e2e/react-router/generator-cli-only/package.json +++ b/e2e/react-router/generator-cli-only/package.json @@ -8,7 +8,7 @@ "build": "tsr generate && vite build && tsc --noEmit", "preview": "vite preview", "start": "tsr generate && vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/generator-cli-only/playwright.config.ts b/e2e/react-router/generator-cli-only/playwright.config.ts index be44f419e9..4eead86444 100644 --- a/e2e/react-router/generator-cli-only/playwright.config.ts +++ b/e2e/react-router/generator-cli-only/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/i18n-paraglide/package.json b/e2e/react-router/i18n-paraglide/package.json index a100d58e85..450af0c8ef 100644 --- a/e2e/react-router/i18n-paraglide/package.json +++ b/e2e/react-router/i18n-paraglide/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/i18n-paraglide/playwright.config.ts b/e2e/react-router/i18n-paraglide/playwright.config.ts index 91ef8fbd9f..8e94d5f9a1 100644 --- a/e2e/react-router/i18n-paraglide/playwright.config.ts +++ b/e2e/react-router/i18n-paraglide/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/issue-4759/package.json b/e2e/react-router/issue-4759/package.json index 91a7a5053e..ee6a105ad5 100644 --- a/e2e/react-router/issue-4759/package.json +++ b/e2e/react-router/issue-4759/package.json @@ -8,7 +8,7 @@ "dev:e2e": "vite", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/issue-4759/playwright.config.ts b/e2e/react-router/issue-4759/playwright.config.ts index b5e8249edc..a301f62881 100644 --- a/e2e/react-router/issue-4759/playwright.config.ts +++ b/e2e/react-router/issue-4759/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -12,8 +11,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, projects: [ diff --git a/e2e/react-router/issue-7120/package.json b/e2e/react-router/issue-7120/package.json index a16155eb61..979b32556c 100644 --- a/e2e/react-router/issue-7120/package.json +++ b/e2e/react-router/issue-7120/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/issue-7120/playwright.config.ts b/e2e/react-router/issue-7120/playwright.config.ts index 61a995a815..a8ba116fb4 100644 --- a/e2e/react-router/issue-7120/playwright.config.ts +++ b/e2e/react-router/issue-7120/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -12,8 +11,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, projects: [ diff --git a/e2e/react-router/issue-7457/package.json b/e2e/react-router/issue-7457/package.json index 3220a4dbb4..838f5173e2 100644 --- a/e2e/react-router/issue-7457/package.json +++ b/e2e/react-router/issue-7457/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.99.0", diff --git a/e2e/react-router/issue-7457/playwright.config.ts b/e2e/react-router/issue-7457/playwright.config.ts index 61a995a815..a8ba116fb4 100644 --- a/e2e/react-router/issue-7457/playwright.config.ts +++ b/e2e/react-router/issue-7457/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -12,8 +11,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, projects: [ diff --git a/e2e/react-router/js-only-file-based/package.json b/e2e/react-router/js-only-file-based/package.json index a8fbe87b8f..39742d9c84 100644 --- a/e2e/react-router/js-only-file-based/package.json +++ b/e2e/react-router/js-only-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/js-only-file-based/playwright.config.ts b/e2e/react-router/js-only-file-based/playwright.config.ts index ccf3853685..0925936d55 100644 --- a/e2e/react-router/js-only-file-based/playwright.config.ts +++ b/e2e/react-router/js-only-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/match-params/package.json b/e2e/react-router/match-params/package.json index 3282e5e5c2..908be67a9d 100644 --- a/e2e/react-router/match-params/package.json +++ b/e2e/react-router/match-params/package.json @@ -6,7 +6,7 @@ "dev": "vite --port 3000", "build": "vite build && tsc --noEmit", "preview": "vite preview", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/match-params/playwright.config.ts b/e2e/react-router/match-params/playwright.config.ts index 246cf40060..9e8c1fab2b 100644 --- a/e2e/react-router/match-params/playwright.config.ts +++ b/e2e/react-router/match-params/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -14,8 +13,8 @@ export default defineConfig({ }, webServer: { command: `pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, projects: [ diff --git a/e2e/react-router/react-compiler/package.json b/e2e/react-router/react-compiler/package.json index d4d0e6473a..82e6fbf86b 100644 --- a/e2e/react-router/react-compiler/package.json +++ b/e2e/react-router/react-compiler/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/react-compiler/playwright.config.ts b/e2e/react-router/react-compiler/playwright.config.ts index 61a995a815..a8ba116fb4 100644 --- a/e2e/react-router/react-compiler/playwright.config.ts +++ b/e2e/react-router/react-compiler/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -12,8 +11,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, projects: [ diff --git a/e2e/react-router/rspack-basic-file-based/package.json b/e2e/react-router/rspack-basic-file-based/package.json index af7c78ec7b..4bff5e7801 100644 --- a/e2e/react-router/rspack-basic-file-based/package.json +++ b/e2e/react-router/rspack-basic-file-based/package.json @@ -7,7 +7,7 @@ "build": "rsbuild build && tsc --noEmit", "preview": "rsbuild preview", "start": "rsbuild preview", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/rspack-basic-file-based/playwright.config.ts b/e2e/react-router/rspack-basic-file-based/playwright.config.ts index a3644d1a62..4eead86444 100644 --- a/e2e/react-router/rspack-basic-file-based/playwright.config.ts +++ b/e2e/react-router/rspack-basic-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/package.json b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/package.json index 07daac365c..efd3f6e2c3 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/package.json +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/package.json @@ -7,7 +7,7 @@ "build": "rsbuild build && tsc --noEmit", "preview": "rsbuild preview", "start": "rsbuild preview", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts index e66d2ff339..1c1d021f2f 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm start --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/package.json b/e2e/react-router/scroll-restoration-sandbox-vite/package.json index a4ad2e8121..56bd2f80df 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/package.json +++ b/e2e/react-router/scroll-restoration-sandbox-vite/package.json @@ -11,7 +11,7 @@ "start": "vite", "test:e2e:browser": "VITE_APP_HISTORY=browser playwright test --config=playwright.browser.config.ts --project=chromium", "test:e2e:hash": "VITE_APP_HISTORY=hash playwright test --config=playwright.hash.config.ts --project=chromium", - "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:browser && pnpm run test:e2e:hash" + "test:e2e": "pnpm run test:e2e:browser && pnpm run test:e2e:hash" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts b/e2e/react-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts index b7e0b2525f..eb31d94080 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts @@ -1,13 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { - getTestServerPort, - resolveRuntimeSuffix, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort( - packageJson.name + `-${resolveRuntimeSuffix('browser')}`, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -25,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm build && VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `VITE_APP_HISTORY=browser pnpm build && VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts b/e2e/react-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts index 8ec5160a3c..6b160e3908 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts @@ -1,13 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { - getTestServerPort, - resolveRuntimeSuffix, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort( - packageJson.name + `-${resolveRuntimeSuffix('hash')}`, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -25,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/sentry-integration/package.json b/e2e/react-router/sentry-integration/package.json index b136e4f9a4..5ebbdf31d9 100644 --- a/e2e/react-router/sentry-integration/package.json +++ b/e2e/react-router/sentry-integration/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@sentry/react": "^10.32.0", diff --git a/e2e/react-router/sentry-integration/playwright.config.ts b/e2e/react-router/sentry-integration/playwright.config.ts index 0c5cee43e4..6a684ac89e 100644 --- a/e2e/react-router/sentry-integration/playwright.config.ts +++ b/e2e/react-router/sentry-integration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-router/view-transitions/package.json b/e2e/react-router/view-transitions/package.json index 03ed5c3be9..e2d7a181e1 100644 --- a/e2e/react-router/view-transitions/package.json +++ b/e2e/react-router/view-transitions/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/view-transitions/playwright.config.ts b/e2e/react-router/view-transitions/playwright.config.ts index e7e4795203..4eead86444 100644 --- a/e2e/react-router/view-transitions/playwright.config.ts +++ b/e2e/react-router/view-transitions/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/basic-auth/package.json b/e2e/react-start/basic-auth/package.json index b434d3f305..5539513ff2 100644 --- a/e2e/react-start/basic-auth/package.json +++ b/e2e/react-start/basic-auth/package.json @@ -10,7 +10,7 @@ "preview": "vite preview", "start": "node .output/server/index.mjs", "prisma-generate": "prisma generate", - "test:e2e": "exit 0; rm -rf port*.txt; pnpm run prisma-generate && playwright test --project=chromium" + "test:e2e": "exit 0; pnpm run prisma-generate && playwright test --project=chromium" }, "dependencies": { "@libsql/client": "^0.15.15", diff --git a/e2e/react-start/basic-auth/playwright.config.ts b/e2e/react-start/basic-auth/playwright.config.ts index 18b8905468..82678ac00b 100644 --- a/e2e/react-start/basic-auth/playwright.config.ts +++ b/e2e/react-start/basic-auth/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/basic-cloudflare/package.json b/e2e/react-start/basic-cloudflare/package.json index 7baa24073b..52f9be934d 100644 --- a/e2e/react-start/basic-cloudflare/package.json +++ b/e2e/react-start/basic-cloudflare/package.json @@ -10,7 +10,7 @@ "preview": "vite preview", "cf-typegen": "wrangler types", "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/basic-cloudflare/playwright.config.ts b/e2e/react-start/basic-cloudflare/playwright.config.ts index 99b9f3460a..0925936d55 100644 --- a/e2e/react-start/basic-cloudflare/playwright.config.ts +++ b/e2e/react-start/basic-cloudflare/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/basic-react-query/package.json b/e2e/react-start/basic-react-query/package.json index 87789282ec..56af87c1bf 100644 --- a/e2e/react-start/basic-react-query/package.json +++ b/e2e/react-start/basic-react-query/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.90.0", diff --git a/e2e/react-start/basic-react-query/playwright.config.ts b/e2e/react-start/basic-react-query/playwright.config.ts index 6fc8d3cc63..216fade4d5 100644 --- a/e2e/react-start/basic-react-query/playwright.config.ts +++ b/e2e/react-start/basic-react-query/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, diff --git a/e2e/react-start/basic-react-query/src/utils/users.tsx b/e2e/react-start/basic-react-query/src/utils/users.tsx index 26b934fcb3..15216680e9 100644 --- a/e2e/react-start/basic-react-query/src/utils/users.tsx +++ b/e2e/react-start/basic-react-query/src/utils/users.tsx @@ -1,4 +1,6 @@ import { queryOptions } from '@tanstack/react-query' +import { createIsomorphicFn } from '@tanstack/react-start' +import { getRequestUrl } from '@tanstack/react-start/server' import axios from 'redaxios' export type User = { @@ -7,17 +9,16 @@ export type User = { email: string } -const PORT = - import.meta.env.VITE_SERVER_PORT || process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` +const getOrigin = createIsomorphicFn() + .server(() => getRequestUrl().origin) + .client(() => window.location.origin) export const usersQueryOptions = () => queryOptions({ queryKey: ['users'], queryFn: () => axios - .get>(DEPLOY_URL + '/api/users') + .get>(getOrigin() + '/api/users') .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch users') @@ -29,7 +30,7 @@ export const userQueryOptions = (id: string) => queryKey: ['users', id], queryFn: () => axios - .get(DEPLOY_URL + '/api/users/' + id) + .get(getOrigin() + '/api/users/' + id) .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch user') diff --git a/e2e/react-start/basic-tsr-config/package.json b/e2e/react-start/basic-tsr-config/package.json index 6aaacfefd4..b3367d05d4 100644 --- a/e2e/react-start/basic-tsr-config/package.json +++ b/e2e/react-start/basic-tsr-config/package.json @@ -8,7 +8,7 @@ "dev:e2e": "vite dev", "build": "rimraf ./count.txt && vite build && tsc --noEmit", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/basic-tsr-config/playwright.config.ts b/e2e/react-start/basic-tsr-config/playwright.config.ts index 18b8905468..82678ac00b 100644 --- a/e2e/react-start/basic-tsr-config/playwright.config.ts +++ b/e2e/react-start/basic-tsr-config/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/basic/playwright.config.ts b/e2e/react-start/basic/playwright.config.ts index 8ba8953e9f..bdf5fd74ca 100644 --- a/e2e/react-start/basic/playwright.config.ts +++ b/e2e/react-start/basic/playwright.config.ts @@ -1,30 +1,18 @@ -import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const mode = process.env.MODE ?? 'ssr' const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' -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}_start.txt`, - ]) { - fs.rmSync(portFile, { force: true }) - } -} - -const PORT = await getTestServerPort(e2ePortKey) -const START_PORT = await getTestServerPort(`${e2ePortKey}_start`) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` const previewCommand = toolchain === 'rsbuild' ? `pnpm preview:rsbuild --host 0.0.0.0 --port ${PORT}` : `pnpm preview --host 0.0.0.0 --outDir ${distDir} --port ${PORT}` -const commandByMode = mode === 'preview' ? `${previewCommand}` : `pnpm start` +const commandByMode = mode === 'preview' ? previewCommand : 'pnpm start' /** * See https://playwright.dev/docs/test-configuration. */ @@ -40,19 +28,16 @@ export default defineConfig({ webServer: { command: commandByMode, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, MODE: mode, E2E_TOOLCHAIN: toolchain, - VITE_NODE_ENV: 'test', - VITE_SERVER_PORT: String(PORT), - START_PORT: String(START_PORT), + START_PORT: '0', PORT: String(PORT), E2E_DIST_DIR: distDir, - E2E_PORT_KEY: e2ePortKey, ...(process.env.TSS_RSB_CLIENT_OUTPUT ? { TSS_RSB_CLIENT_OUTPUT: process.env.TSS_RSB_CLIENT_OUTPUT } : {}), diff --git a/e2e/react-start/basic/server.js b/e2e/react-start/basic/server.js index 69c1e4ca91..3e1ddab400 100644 --- a/e2e/react-start/basic/server.js +++ b/e2e/react-start/basic/server.js @@ -1,12 +1,12 @@ -import { toNodeHandler } from 'srvx/node' import fs from 'node:fs' import path from 'node:path' +import { toNodeHandler } from 'srvx/node' import express from 'express' import { createProxyMiddleware } from 'http-proxy-middleware' -const port = process.env.PORT || 3000 +const port = Number(process.env.PORT ?? 3000) -const startPort = process.env.START_PORT || 3001 +const startPort = Number(process.env.START_PORT ?? 0) const isSpaMode = process.env.MODE === 'spa' const isPrerender = process.env.MODE === 'prerender' @@ -49,13 +49,13 @@ export async function createStartServer() { return { app } } -export async function createSpaServer() { +export async function createSpaServer(backendPort) { const app = express() app.use( '/api', createProxyMiddleware({ - target: `http://localhost:${startPort}/api`, // Replace with your target server's URL + target: `http://localhost:${backendPort}/api`, // Replace with your target server's URL changeOrigin: false, // Needed for virtual hosted sites, }), ) @@ -63,7 +63,7 @@ export async function createSpaServer() { app.use( '/_serverFn', createProxyMiddleware({ - target: `http://localhost:${startPort}/_serverFn`, // Replace with your target server's URL + target: `http://localhost:${backendPort}/_serverFn`, // Replace with your target server's URL changeOrigin: false, // Needed for virtual hosted sites, }), ) @@ -71,31 +71,28 @@ export async function createSpaServer() { app.use(express.static(distClientDir)) app.get('/{*splat}', (req, res) => { - res.sendFile(path.resolve(distClientDir, 'index.html')) + res.sendFile('index.html', { root: distClientDir }) }) return { app } } -if (isSpaMode) { - createSpaServer().then(async ({ app }) => - app.listen(port, (error) => { - if (error) throw error - console.info(`Client Server: http://localhost:${port}`) - }), - ) - - createStartServer().then(async ({ app }) => - app.listen(startPort, (error) => { - if (error) throw error - console.info(`Start Server: http://localhost:${startPort}`) - }), - ) -} else { - createStartServer().then(async ({ app }) => - app.listen(port, (error) => { - if (error) throw error - console.info(`Start Server: http://localhost:${port}`) - }), - ) -} +// Bind the backend first so the SPA proxy receives the port actually held by it. +const { app: startApp } = await createStartServer() +const backend = startApp.listen(isSpaMode ? startPort : port, async (error) => { + if (error) { + throw error + } + const backendPort = backend.address().port + if (isSpaMode) { + const { app } = await createSpaServer(backendPort) + const frontend = app.listen(port, (frontendError) => { + if (frontendError) { + throw frontendError + } + console.info(`E2E app: http://localhost:${frontend.address().port}`) + }) + } else { + console.info(`E2E app: http://localhost:${backendPort}`) + } +}) diff --git a/e2e/react-start/basic/tests/redirect.spec.ts b/e2e/react-start/basic/tests/redirect.spec.ts index 14567d89ce..010ecec155 100644 --- a/e2e/react-start/basic/tests/redirect.spec.ts +++ b/e2e/react-start/basic/tests/redirect.spec.ts @@ -1,16 +1,13 @@ import queryString from 'node:querystring' import { expect } from '@playwright/test' -import { getTestServerPort, test } from '@tanstack/router-e2e-utils' +import { test } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' import type { Page } from '@playwright/test' -import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = await getTestServerPort( - process.env.E2E_PORT_KEY ?? packageJson.name, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` const POSTS_URL = `http://localhost:${PORT}/posts` diff --git a/e2e/react-start/basic/tests/utils/getE2EPortKey.ts b/e2e/react-start/basic/tests/utils/getE2EPortKey.ts deleted file mode 100644 index 48be6a9027..0000000000 --- a/e2e/react-start/basic/tests/utils/getE2EPortKey.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { getPackageName } from './getPackageName.ts' - -export function getE2EPortKey() { - return process.env.E2E_PORT_KEY ?? getPackageName() -} diff --git a/e2e/react-start/clerk-basic/package.json b/e2e/react-start/clerk-basic/package.json index 65f405eb69..7838b4cee1 100644 --- a/e2e/react-start/clerk-basic/package.json +++ b/e2e/react-start/clerk-basic/package.json @@ -8,7 +8,7 @@ "dev:e2e": "vite dev", "build": "exit 0; vite build", "start": "node .output/server/index.mjs", - "test:e2e": "exit 0; rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "exit 0; playwright test --project=chromium" }, "dependencies": { "@clerk/tanstack-react-start": "^0.19.0", diff --git a/e2e/react-start/clerk-basic/playwright.config.ts b/e2e/react-start/clerk-basic/playwright.config.ts index 18b8905468..82678ac00b 100644 --- a/e2e/react-start/clerk-basic/playwright.config.ts +++ b/e2e/react-start/clerk-basic/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/csp/package.json b/e2e/react-start/csp/package.json index bbe4df9bbc..341afdf406 100644 --- a/e2e/react-start/csp/package.json +++ b/e2e/react-start/csp/package.json @@ -8,7 +8,7 @@ "dev:e2e": "vite dev", "build": "vite build && tsc --noEmit", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/csp/playwright.config.ts b/e2e/react-start/csp/playwright.config.ts index 5f9de5709e..87b32e1f50 100644 --- a/e2e/react-start/csp/playwright.config.ts +++ b/e2e/react-start/csp/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/css-inline/playwright.config.ts b/e2e/react-start/css-inline/playwright.config.ts index b5d78f3608..78e7b75252 100644 --- a/e2e/react-start/css-inline/playwright.config.ts +++ b/e2e/react-start/css-inline/playwright.config.ts @@ -1,7 +1,5 @@ -import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' const inlineCssTransformAssets = @@ -18,15 +16,8 @@ const transformAssetsSuffix = isInlineCssTransformAssets : '' const distDir = process.env.E2E_DIST_DIR ?? `dist-${toolchain}${transformAssetsSuffix}-ssr` -const e2ePortKey = - process.env.E2E_PORT_KEY ?? - `${packageJson.name}-${toolchain}${transformAssetsSuffix}` -if (process.env.TEST_WORKER_INDEX === undefined) { - fs.rmSync(`port-${e2ePortKey}.txt`, { force: true }) -} - -const PORT = await getTestServerPort(e2ePortKey) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -40,8 +31,8 @@ export default defineConfig({ webServer: { command: `pnpm build:${toolchain} && pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { E2E_DIST_DIR: distDir, diff --git a/e2e/react-start/css-inline/server.js b/e2e/react-start/css-inline/server.js index fcdec3b888..27b2357284 100644 --- a/e2e/react-start/css-inline/server.js +++ b/e2e/react-start/css-inline/server.js @@ -3,7 +3,7 @@ import path from 'node:path' import express from 'express' import { toNodeHandler } from 'srvx/node' -const port = process.env.PORT || 3000 +const port = Number(process.env.PORT ?? 3000) const distDir = process.env.E2E_DIST_DIR || 'dist-vite-ssr' const distClientDir = path.resolve(distDir, 'client') @@ -37,8 +37,10 @@ async function createStartServer() { } createStartServer().then((app) => { - app.listen(port, (error) => { - if (error) throw error - console.info(`Start Server: http://localhost:${port}`) + const httpServer = app.listen(port, (error) => { + if (error) { + throw error + } + console.info(`E2E app: http://localhost:${httpServer.address().port}`) }) }) diff --git a/e2e/react-start/css-modules/package.json b/e2e/react-start/css-modules/package.json index 2591161d66..29f5b919ea 100644 --- a/e2e/react-start/css-modules/package.json +++ b/e2e/react-start/css-modules/package.json @@ -22,9 +22,9 @@ "test:e2e:prod:default": "MODE=prod playwright test --project=chromium", "test:e2e:prod": "pnpm run test:e2e:prod:default && pnpm run test:e2e:prod:css-code-split-false", "test:e2e:prod:css-code-split-false": "MODE=prod VITE_CSS_CODE_SPLIT=false playwright test tests/css.prod.spec.ts --project=chromium", - "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:dev && pnpm run test:e2e:prod", - "test:e2e:nitro": "rm -rf port*.txt; pnpm run test:e2e:dev:nitro", - "test:e2e:basepath": "rm -rf port*.txt; pnpm run test:e2e:dev:basepath", + "test:e2e": "pnpm run test:e2e:dev && pnpm run test:e2e:prod", + "test:e2e:nitro": "pnpm run test:e2e:dev:nitro", + "test:e2e:basepath": "pnpm run test:e2e:dev:basepath", "_test:e2e:cloudflare": "echo 'Cloudflare dev mode disabled - React duplication issues' && exit 0" }, "dependencies": { diff --git a/e2e/react-start/css-modules/playwright.config.ts b/e2e/react-start/css-modules/playwright.config.ts index a1cb566e5d..fa55e9d054 100644 --- a/e2e/react-start/css-modules/playwright.config.ts +++ b/e2e/react-start/css-modules/playwright.config.ts @@ -1,34 +1,35 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' const viteConfig = process.env.VITE_CONFIG // 'nitro' | 'basepath' | 'cloudflare' | undefined -const PORT = await getTestServerPort( - viteConfig ? `${packageJson.name}-${viteConfig}` : packageJson.name, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) // When using basepath config, the app is served at /my-app const basePath = viteConfig === 'basepath' ? '/my-app' : '' const baseURL = `http://localhost:${PORT}${basePath}` // Select the appropriate dev command based on VITE_CONFIG -const devCommand = viteConfig ? `pnpm dev:e2e:${viteConfig}` : 'pnpm dev:e2e' +const devCommand = viteConfig + ? `pnpm dev:e2e:${viteConfig}` + : 'pnpm dev:e2e --port 0' export default defineConfig({ testDir: './tests', workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + use: { baseURL, }, webServer: { command: isDev ? devCommand : `pnpm build && PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', diff --git a/e2e/react-start/css-modules/tests/setup/global.setup.ts b/e2e/react-start/css-modules/tests/setup/global.setup.ts new file mode 100644 index 0000000000..7c0fce762a --- /dev/null +++ b/e2e/react-start/css-modules/tests/setup/global.setup.ts @@ -0,0 +1,48 @@ +import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' + +export default async function setup() { + if (process.env.MODE !== 'dev') return + + const viteConfig = process.env.VITE_CONFIG // 'nitro' | 'basepath' | 'cloudflare' | undefined + const port = Number(process.env.E2E_APP_PORT ?? 0) + const basePath = viteConfig === 'basepath' ? '/my-app' : '' + const baseURL = `http://localhost:${port}${basePath}` + + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'global-styled', + warmup: async (page) => { + await page.goto(`${baseURL}/modules`, { waitUntil: 'domcontentloaded' }) + await page.getByTestId('module-card').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.goto(`${baseURL}/sass-mixin`, { + waitUntil: 'domcontentloaded', + }) + await page.getByTestId('mixin-styled').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.goto(`${baseURL}/quotes`, { waitUntil: 'domcontentloaded' }) + await page.getByTestId('quote-styled').waitFor({ state: 'visible' }) + await page.getByTestId('after-quote-styled').waitFor({ + state: 'visible', + }) + await page.waitForLoadState('networkidle') + + await page.goto(`${baseURL}/`, { waitUntil: 'domcontentloaded' }) + await page.getByTestId('global-styled').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.getByTestId('nav-modules').click() + await page.waitForURL('**/modules') + await page.getByTestId('module-card').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.getByTestId('nav-home').click() + await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) + await page.getByTestId('global-styled').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + }, + }) +} diff --git a/e2e/react-start/custom-basepath/express-server.ts b/e2e/react-start/custom-basepath/express-server.ts index 1884c5eb5a..b9bf393466 100644 --- a/e2e/react-start/custom-basepath/express-server.ts +++ b/e2e/react-start/custom-basepath/express-server.ts @@ -1,5 +1,6 @@ import express from 'express' import { toNodeHandler } from 'srvx/node' +import type { AddressInfo } from 'node:net' import type { NodeHttp1Handler } from 'srvx' const DEVELOPMENT = process.env.NODE_ENV === 'development' @@ -40,7 +41,11 @@ if (DEVELOPMENT) { }) } -app.listen(PORT, (error) => { - if (error) throw error - console.log(`Server is running on http://localhost:${PORT}`) +const httpServer = app.listen(PORT, (error) => { + if (error) { + throw error + } + console.log( + `E2E app: http://localhost:${(httpServer.address() as AddressInfo).port}`, + ) }) diff --git a/e2e/react-start/custom-basepath/package.json b/e2e/react-start/custom-basepath/package.json index f665ba0598..45d39c3bbf 100644 --- a/e2e/react-start/custom-basepath/package.json +++ b/e2e/react-start/custom-basepath/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "tsx express-server.ts", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/custom-basepath/playwright.config.ts b/e2e/react-start/custom-basepath/playwright.config.ts index 9f14b88896..e113ce64ad 100644 --- a/e2e/react-start/custom-basepath/playwright.config.ts +++ b/e2e/react-start/custom-basepath/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}/custom/basepath` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, diff --git a/e2e/react-start/custom-server-rsbuild/express-server.ts b/e2e/react-start/custom-server-rsbuild/express-server.ts index 23784f2efc..68537956b4 100644 --- a/e2e/react-start/custom-server-rsbuild/express-server.ts +++ b/e2e/react-start/custom-server-rsbuild/express-server.ts @@ -1,5 +1,6 @@ import express from 'express' import { toNodeHandler } from 'srvx/node' +import type { AddressInfo } from 'node:net' import type { NodeHttp1Handler } from 'srvx' const DEVELOPMENT = process.env.NODE_ENV === 'development' @@ -58,9 +59,13 @@ if (DEVELOPMENT) { }) const httpServer = app.listen(PORT, async (error) => { - if (error) throw error + if (error) { + throw error + } await devServer.afterListen() - console.log(`Server is running on http://localhost:${PORT}`) + console.log( + `E2E app: http://localhost:${(httpServer.address() as AddressInfo).port}`, + ) }) devServer.connectWebSocket({ server: httpServer }) } else { @@ -75,8 +80,12 @@ if (DEVELOPMENT) { next(error) } }) - app.listen(PORT, (error) => { - if (error) throw error - console.log(`Server is running on http://localhost:${PORT}`) + const httpServer = app.listen(PORT, (error) => { + if (error) { + throw error + } + console.log( + `E2E app: http://localhost:${(httpServer.address() as AddressInfo).port}`, + ) }) } diff --git a/e2e/react-start/custom-server-rsbuild/package.json b/e2e/react-start/custom-server-rsbuild/package.json index 865e424daa..de1a118d60 100644 --- a/e2e/react-start/custom-server-rsbuild/package.json +++ b/e2e/react-start/custom-server-rsbuild/package.json @@ -10,7 +10,7 @@ "start": "tsx express-server.ts", "test:e2e:dev": "cross-env MODE=dev playwright test --project=chromium", "test:e2e:prod": "cross-env MODE=prod playwright test --project=chromium", - "test:e2e": "rm -rf port*.txt && pnpm run test:e2e:dev && pnpm run test:e2e:prod" + "test:e2e": "pnpm run test:e2e:dev && pnpm run test:e2e:prod" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/custom-server-rsbuild/playwright.config.ts b/e2e/react-start/custom-server-rsbuild/playwright.config.ts index eb8b43f648..f0542500fd 100644 --- a/e2e/react-start/custom-server-rsbuild/playwright.config.ts +++ b/e2e/react-start/custom-server-rsbuild/playwright.config.ts @@ -1,11 +1,9 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' -const PORT = await getTestServerPort(`${packageJson.name}-${mode}`) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -15,8 +13,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: isDev ? 'pnpm dev:e2e' : 'pnpm build && pnpm start', - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: { stdout: /E2E app: http:\/\/localhost:(?\d+)/ }, + reuseExistingServer: false, stdout: 'pipe', env: { PORT: String(PORT), diff --git a/e2e/react-start/deferred-hydration/playwright.config.ts b/e2e/react-start/deferred-hydration/playwright.config.ts index 5c33cd28a6..d88c59fc9d 100644 --- a/e2e/react-start/deferred-hydration/playwright.config.ts +++ b/e2e/react-start/deferred-hydration/playwright.config.ts @@ -1,12 +1,9 @@ -import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' const distDir = process.env.E2E_DIST_DIR ?? `dist-${toolchain}-ssr` -const e2ePortKey = - process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` + const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' const serverEntryFile = toolchain === 'rsbuild' ? 'index.js' : 'server.js' @@ -14,22 +11,19 @@ const startCommand = `pnpm exec srvx --prod --dir=. -s ${distDir}/client --entry const devCommand = toolchain === 'rsbuild' ? 'pnpm dev:rsbuild' : 'pnpm dev:vite' -if (process.env.TEST_WORKER_INDEX === undefined) { - fs.rmSync(`port-${e2ePortKey}.txt`, { force: true }) -} - -const PORT = await getTestServerPort(e2ePortKey) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ testDir: './tests', workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', use: { baseURL }, webServer: { command: isDev ? `${devCommand} --port ${PORT}` : startCommand, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { E2E_DIST_DIR: distDir, @@ -38,7 +32,6 @@ export default defineConfig({ PORT: String(PORT), VITE_SERVER_PORT: String(PORT), E2E_TOOLCHAIN: toolchain, - E2E_PORT_KEY: e2ePortKey, }, }, projects: [ diff --git a/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts b/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts new file mode 100644 index 0000000000..704bbef3e2 --- /dev/null +++ b/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts @@ -0,0 +1,25 @@ +import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' + +export default async function setup() { + if (process.env.MODE !== 'dev') { + return + } + + const port = Number(process.env.E2E_APP_PORT ?? 0) + const baseURL = `http://localhost:${port}` + + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'home-heading', + warmup: async (page) => { + await page.goto(`${baseURL}/components`, { + waitUntil: 'domcontentloaded', + }) + await page.getByTestId('component-heading').waitFor({ + state: 'visible', + }) + await page.waitForLoadState('networkidle') + }, + }) +} diff --git a/e2e/react-start/dev-ssr-styles/package.json b/e2e/react-start/dev-ssr-styles/package.json index c9c14943d4..2c60f8576a 100644 --- a/e2e/react-start/dev-ssr-styles/package.json +++ b/e2e/react-start/dev-ssr-styles/package.json @@ -27,8 +27,8 @@ "test:e2e:dev:custom-basepath:bundled-dev:nitro": "MODE=dev SSR_STYLES=custom-basepath VITE_USE_NITRO=true E2E_VITE_BUNDLED_DEV=true playwright test --project=chromium", "test:e2e:bundled-dev": "pnpm run test:e2e:dev:bundled-dev && pnpm run test:e2e:dev:disabled:bundled-dev && pnpm run test:e2e:dev:custom-basepath:bundled-dev", "test:e2e:nitro:bundled-dev": "pnpm run test:e2e:dev:bundled-dev:nitro && pnpm run test:e2e:dev:disabled:bundled-dev:nitro && pnpm run test:e2e:dev:custom-basepath:bundled-dev:nitro", - "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:dev && pnpm run test:e2e:dev:disabled && pnpm run test:e2e:dev:custom-basepath && pnpm run test:e2e:bundled-dev", - "test:e2e:nitro": "rm -rf port*.txt; pnpm run test:e2e:dev:nitro && pnpm run test:e2e:dev:disabled:nitro && pnpm run test:e2e:dev:custom-basepath:nitro && pnpm run test:e2e:nitro:bundled-dev" + "test:e2e": "pnpm run test:e2e:dev && pnpm run test:e2e:dev:disabled && pnpm run test:e2e:dev:custom-basepath && pnpm run test:e2e:bundled-dev", + "test:e2e:nitro": "pnpm run test:e2e:dev:nitro && pnpm run test:e2e:dev:disabled:nitro && pnpm run test:e2e:dev:custom-basepath:nitro && pnpm run test:e2e:nitro:bundled-dev" }, "dependencies": { "@tanstack/react-router": "workspace:*", diff --git a/e2e/react-start/dev-ssr-styles/playwright.config.ts b/e2e/react-start/dev-ssr-styles/playwright.config.ts index 7f263574b6..e587ac574c 100644 --- a/e2e/react-start/dev-ssr-styles/playwright.config.ts +++ b/e2e/react-start/dev-ssr-styles/playwright.config.ts @@ -1,6 +1,5 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' import { ssrStylesMode, useNitro, viteBundledDev } from './env' const mode = process.env.MODE ?? 'prod' @@ -9,21 +8,8 @@ const isDev = mode === 'dev' // Build a unique port key per dimension combination (ssrStyles mode + nitro) // e.g. "...dev-ssr-styles", "...dev-ssr-styles-disabled", "...dev-ssr-styles-nitro", // "...dev-ssr-styles-disabled-nitro" -function getPortKey() { - let key = packageJson.name - if (ssrStylesMode !== 'default') { - key += `-${ssrStylesMode}` - } - if (useNitro) { - key += '-nitro' - } - if (viteBundledDev) { - key += '-bundled-dev' - } - return key -} -const PORT = await getTestServerPort(getPortKey()) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` // Select the appropriate dev command based on SSR_STYLES + VITE_USE_NITRO @@ -43,14 +29,16 @@ export default defineConfig({ workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + use: { baseURL, }, webServer: { command: isDev ? getDevCommand() : `pnpm build && PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', diff --git a/e2e/react-start/dev-ssr-styles/tests/setup/global.setup.ts b/e2e/react-start/dev-ssr-styles/tests/setup/global.setup.ts new file mode 100644 index 0000000000..4e560eea47 --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/tests/setup/global.setup.ts @@ -0,0 +1,14 @@ +import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' + +export default async function setup() { + if (process.env.MODE !== 'dev') return + + const port = Number(process.env.E2E_APP_PORT ?? 0) + const baseURL = `http://localhost:${port}` + + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'home-heading', + }) +} diff --git a/e2e/react-start/early-hints/package.json b/e2e/react-start/early-hints/package.json index 2945148950..bcccbab9a5 100644 --- a/e2e/react-start/early-hints/package.json +++ b/e2e/react-start/early-hints/package.json @@ -10,7 +10,7 @@ "preview": "vite preview", "gen-certs": "node --import tsx tests/gen-certs.ts", "start": "pnpm gen-certs && srvx --prod --tls --cert=tests/.tmp/tls/server.crt --key=tests/.tmp/tls/server.key -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/early-hints/playwright.config.ts b/e2e/react-start/early-hints/playwright.config.ts index a2435bcf7b..b3606d5586 100644 --- a/e2e/react-start/early-hints/playwright.config.ts +++ b/e2e/react-start/early-hints/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `https://localhost:${PORT}` export default defineConfig({ @@ -17,8 +16,8 @@ export default defineConfig({ webServer: { command: `pnpm build && pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', ignoreHTTPSErrors: true, env: { diff --git a/e2e/react-start/early-hints/tests/early-hints-protocol.spec.ts b/e2e/react-start/early-hints/tests/early-hints-protocol.spec.ts index df0984079e..661b988281 100644 --- a/e2e/react-start/early-hints/tests/early-hints-protocol.spec.ts +++ b/e2e/react-start/early-hints/tests/early-hints-protocol.spec.ts @@ -1,7 +1,5 @@ -import { expect, test } from '@playwright/test' import { connect } from 'node:http2' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } +import { expect, test } from '@playwright/test' import type { IncomingHttpHeaders } from 'node:http2' type Http2Response = { @@ -48,14 +46,14 @@ function linkHeader(headers: IncomingHttpHeaders): string { function earlyHintsLinkHeader(response: Http2Response): string { expect(response.earlyHints.length).toBe(1) - return linkHeader(response.earlyHints[0]!) + return linkHeader(response.earlyHints[0]) } test.describe('Early Hints - HTTP/2 Protocol', () => { let baseURL: string test.beforeAll(async () => { - const PORT = await getTestServerPort(packageJson.name) + const PORT = Number(process.env.E2E_APP_PORT ?? 0) baseURL = `https://localhost:${PORT}` }) @@ -137,7 +135,7 @@ test.describe('Early Hints - HTTP/2 Protocol', () => { expect(response.earlyHints.length).toBe(1) - const link = linkHeader(response.earlyHints[0]!) + const link = linkHeader(response.earlyHints[0]) expect(link).toContain('rel=modulepreload; as=script') expect(link).toContain('; rel=preconnect') diff --git a/e2e/react-start/hmr/playwright.config.ts b/e2e/react-start/hmr/playwright.config.ts index da4abe4bee..5840ec157a 100644 --- a/e2e/react-start/hmr/playwright.config.ts +++ b/e2e/react-start/hmr/playwright.config.ts @@ -1,13 +1,11 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' -const e2ePortKey = - process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` + const distDir = process.env.E2E_DIST_DIR ?? 'dist' const viteBundledDev = process.env.E2E_VITE_BUNDLED_DEV === 'true' -const PORT = await getTestServerPort(e2ePortKey) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` const devCommand = toolchain === 'rsbuild' ? 'pnpm dev:rsbuild' : 'pnpm dev:vite' @@ -17,21 +15,22 @@ export default defineConfig({ workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + use: { baseURL, }, webServer: { command: `${devCommand} --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', PORT: String(PORT), E2E_TOOLCHAIN: toolchain, E2E_DIST_DIR: distDir, - E2E_PORT_KEY: e2ePortKey, E2E_VITE_BUNDLED_DEV: String(viteBundledDev), }, }, diff --git a/e2e/react-start/hmr/tests/setup/global.setup.ts b/e2e/react-start/hmr/tests/setup/global.setup.ts new file mode 100644 index 0000000000..32207ab79f --- /dev/null +++ b/e2e/react-start/hmr/tests/setup/global.setup.ts @@ -0,0 +1,12 @@ +import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' + +export default async function setup() { + const port = Number(process.env.E2E_APP_PORT ?? 0) + const baseURL = `http://localhost:${port}` + + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'hydrated', + }) +} diff --git a/e2e/react-start/i18n-paraglide/package.json b/e2e/react-start/i18n-paraglide/package.json index 5b525891a6..584400d7a2 100644 --- a/e2e/react-start/i18n-paraglide/package.json +++ b/e2e/react-start/i18n-paraglide/package.json @@ -8,7 +8,7 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js", "build": "vite build && tsc --noEmit", "preview": "vite preview", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/i18n-paraglide/playwright.config.ts b/e2e/react-start/i18n-paraglide/playwright.config.ts index 38690f09d8..972522350e 100644 --- a/e2e/react-start/i18n-paraglide/playwright.config.ts +++ b/e2e/react-start/i18n-paraglide/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/import-protection-custom-config/package.json b/e2e/react-start/import-protection-custom-config/package.json index 25ff3f2738..59ac648651 100644 --- a/e2e/react-start/import-protection-custom-config/package.json +++ b/e2e/react-start/import-protection-custom-config/package.json @@ -8,8 +8,8 @@ "dev:e2e": "vite dev", "build": "vite build && tsc --noEmit", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e:mockMode": "rm -rf port*.txt; playwright test --project=chromium", - "test:e2e:errorMode": "rm -rf port*.txt; BEHAVIOR=error playwright test --project=chromium", + "test:e2e:mockMode": "playwright test --project=chromium", + "test:e2e:errorMode": "BEHAVIOR=error playwright test --project=chromium", "test:e2e": "pnpm run test:e2e:mockMode && pnpm run test:e2e:errorMode" }, "dependencies": { @@ -29,5 +29,19 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" + }, + "nx": { + "targets": { + "test:e2e": { + "outputs": [ + "{projectRoot}/dist", + "{projectRoot}/test-results", + "{projectRoot}/webserver-build.log", + "{projectRoot}/violations.*.json", + "{projectRoot}/error-build.log", + "{projectRoot}/error-*-result.json" + ] + } + } } } diff --git a/e2e/react-start/import-protection-custom-config/playwright.config.ts b/e2e/react-start/import-protection-custom-config/playwright.config.ts index 31a55ba3bc..ab90f2911f 100644 --- a/e2e/react-start/import-protection-custom-config/playwright.config.ts +++ b/e2e/react-start/import-protection-custom-config/playwright.config.ts @@ -1,9 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' +import { appServerReady } from '@tanstack/router-e2e-utils' import { isErrorMode } from './tests/utils/isErrorMode' -import packageJson from './package.json' with { type: 'json' } -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` console.log('running in error mode:', isErrorMode.toString()) @@ -27,8 +26,8 @@ export default defineConfig({ : { webServer: { command: `rm -f webserver-build.log violations.build.json violations.dev.json && VITE_SERVER_PORT=${PORT} pnpm build > webserver-build.log 2>&1 && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', cwd: import.meta.dirname, }, diff --git a/e2e/react-start/import-protection-custom-config/tests/error-mode.setup.ts b/e2e/react-start/import-protection-custom-config/tests/error-mode.setup.ts index 3e666ca1df..5032988d0c 100644 --- a/e2e/react-start/import-protection-custom-config/tests/error-mode.setup.ts +++ b/e2e/react-start/import-protection-custom-config/tests/error-mode.setup.ts @@ -1,14 +1,14 @@ +import { execSync, spawn } from 'node:child_process' import fs from 'node:fs' import path from 'node:path' -import { execSync, spawn } from 'node:child_process' -import { chromium } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } +import { stripVTControlCharacters } from 'node:util' +import { appServerReadyPattern } from '@tanstack/router-e2e-utils' +import { chromium, expect } from '@playwright/test' import type { FullConfig } from '@playwright/test' async function waitForHttpOk(url: string, timeoutMs: number): Promise { const start = Date.now() - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + while (true) { if (Date.now() - start > timeoutMs) { throw new Error(`Timed out waiting for ${url}`) @@ -84,8 +84,7 @@ function captureBuild(cwd: string): void { } async function captureDevErrors(cwd: string): Promise { - const port = await getTestServerPort(`${packageJson.name}_error_dev`) - const baseURL = `http://localhost:${port}` + const port = 0 const logChunks: Array = [] const child = spawn('pnpm', ['exec', 'vite', 'dev', '--port', String(port)], { @@ -99,10 +98,23 @@ async function captureDevErrors(cwd: string): Promise { stdio: ['ignore', 'pipe', 'pipe'], }) - child.stdout?.on('data', (d: Buffer) => logChunks.push(d.toString())) - child.stderr?.on('data', (d: Buffer) => logChunks.push(d.toString())) + child.stdout.on('data', (d: Buffer) => logChunks.push(d.toString())) + child.stderr.on('data', (d: Buffer) => logChunks.push(d.toString())) try { + await expect + .poll( + () => + appServerReadyPattern.exec( + stripVTControlCharacters(logChunks.join('')), + )?.groups?.E2E_APP_PORT, + { timeout: 30_000 }, + ) + .toBeTruthy() + const port = appServerReadyPattern.exec( + stripVTControlCharacters(logChunks.join('')), + )!.groups!.E2E_APP_PORT + const baseURL = `http://localhost:${port}` await waitForHttpOk(baseURL, 30_000) const browser = await chromium.launch() diff --git a/e2e/react-start/import-protection-custom-config/tests/violations.setup.ts b/e2e/react-start/import-protection-custom-config/tests/violations.setup.ts index c5187fe074..89c8bb2b9a 100644 --- a/e2e/react-start/import-protection-custom-config/tests/violations.setup.ts +++ b/e2e/react-start/import-protection-custom-config/tests/violations.setup.ts @@ -1,9 +1,9 @@ +import { spawn } from 'node:child_process' import fs from 'node:fs' import path from 'node:path' -import { spawn } from 'node:child_process' -import { chromium } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } +import { stripVTControlCharacters } from 'node:util' +import { chromium, expect } from '@playwright/test' +import { appServerReadyPattern } from '@tanstack/router-e2e-utils' import { extractViolationsFromLog } from './violations.utils' import type { FullConfig } from '@playwright/test' @@ -12,7 +12,6 @@ import type { Violation } from './violations.utils' async function waitForHttpOk(url: string, timeoutMs: number): Promise { const start = Date.now() - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition while (true) { if (Date.now() - start > timeoutMs) { throw new Error(`Timed out waiting for ${url}`) @@ -119,7 +118,6 @@ async function runDevPass( cwd: string, port: number, ): Promise> { - const baseURL = `http://localhost:${port}` const logChunks: Array = [] const child = startDevServer(cwd, port) @@ -127,6 +125,19 @@ async function runDevPass( child.stderr?.on('data', (d: Buffer) => logChunks.push(d.toString())) try { + await expect + .poll( + () => + appServerReadyPattern.exec( + stripVTControlCharacters(logChunks.join('')), + )?.groups?.E2E_APP_PORT, + { timeout: 30_000 }, + ) + .toBeTruthy() + const port = appServerReadyPattern.exec( + stripVTControlCharacters(logChunks.join('')), + )!.groups!.E2E_APP_PORT + const baseURL = `http://localhost:${port}` await waitForHttpOk(baseURL, 30_000) const browser = await chromium.launch() @@ -146,7 +157,7 @@ async function runDevPass( } async function captureDevViolations(cwd: string): Promise { - const port = await getTestServerPort(`${packageJson.name}_dev`) + const port = 0 const coldViolations = await runDevPass(cwd, port) diff --git a/e2e/react-start/import-protection/playwright.config.ts b/e2e/react-start/import-protection/playwright.config.ts index 778e865125..6a3df630c3 100644 --- a/e2e/react-start/import-protection/playwright.config.ts +++ b/e2e/react-start/import-protection/playwright.config.ts @@ -1,16 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' +import { appServerReady } from '@tanstack/router-e2e-utils' import { isErrorMode } from './tests/utils/isErrorMode' import { getViolationArtifactName } from './tests/violations.utils' -import packageJson from './package.json' with { type: 'json' } -const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' const viteBundledDev = process.env.E2E_VITE_BUNDLED_DEV === 'true' -const e2ePortKey = - process.env.E2E_PORT_KEY ?? - `${packageJson.name}-${toolchain}${viteBundledDev ? '-bundled-dev' : ''}` + const distDir = process.env.E2E_DIST_DIR ?? 'dist' -const PORT = await getTestServerPort(e2ePortKey) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` const violationArtifacts = [ getViolationArtifactName('build'), @@ -42,15 +38,14 @@ export default defineConfig({ : { webServer: { command: `rm -f webserver-dev.log ${violationArtifacts} && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', cwd: import.meta.dirname, env: { PORT: String(PORT), VITE_SERVER_PORT: String(PORT), E2E_DIST_DIR: distDir, - E2E_PORT_KEY: e2ePortKey, E2E_VITE_BUNDLED_DEV: String(viteBundledDev), }, }, diff --git a/e2e/react-start/import-protection/tests/error-mode.setup.ts b/e2e/react-start/import-protection/tests/error-mode.setup.ts index c844d59e73..e562128eea 100644 --- a/e2e/react-start/import-protection/tests/error-mode.setup.ts +++ b/e2e/react-start/import-protection/tests/error-mode.setup.ts @@ -1,9 +1,9 @@ +import { execSync, spawn } from 'node:child_process' import fs from 'node:fs' import path from 'node:path' -import { execSync, spawn } from 'node:child_process' -import { chromium } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } +import { stripVTControlCharacters } from 'node:util' +import { appServerReadyPattern } from '@tanstack/router-e2e-utils' +import { chromium, expect } from '@playwright/test' import type { FullConfig } from '@playwright/test' /** @@ -20,14 +20,10 @@ import type { FullConfig } from '@playwright/test' */ const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' -const viteBundledDev = process.env.E2E_VITE_BUNDLED_DEV === 'true' -const e2ePortKey = - process.env.E2E_PORT_KEY ?? - `${packageJson.name}-${toolchain}${viteBundledDev ? '-bundled-dev' : ''}` async function waitForHttpOk(url: string, timeoutMs: number): Promise { const start = Date.now() - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + while (true) { if (Date.now() - start > timeoutMs) { throw new Error(`Timed out waiting for ${url}`) @@ -122,8 +118,7 @@ async function captureDev(cwd: string): Promise { if (fs.existsSync(p)) fs.unlinkSync(p) } - const port = await getTestServerPort(`${e2ePortKey}-error-dev`) - const baseURL = `http://localhost:${port}` + const port = 0 const logFile = path.resolve(cwd, 'error-dev.log') const out = fs.createWriteStream(logFile) @@ -145,10 +140,28 @@ async function captureDev(cwd: string): Promise { stdio: ['ignore', 'pipe', 'pipe'], }) - child.stdout?.on('data', (d: Buffer) => out.write(d)) - child.stderr?.on('data', (d: Buffer) => out.write(d)) + const logChunks: Array = [] + const record = (data: Buffer) => { + logChunks.push(data.toString()) + out.write(data) + } + child.stdout.on('data', record) + child.stderr.on('data', record) try { + await expect + .poll( + () => + appServerReadyPattern.exec( + stripVTControlCharacters(logChunks.join('')), + )?.groups?.E2E_APP_PORT, + { timeout: 30_000 }, + ) + .toBeTruthy() + const port = appServerReadyPattern.exec( + stripVTControlCharacters(logChunks.join('')), + )!.groups!.E2E_APP_PORT + const baseURL = `http://localhost:${port}` await waitForHttpOk(baseURL, 30_000) const browser = await chromium.launch() diff --git a/e2e/react-start/import-protection/tests/violations.setup.ts b/e2e/react-start/import-protection/tests/violations.setup.ts index 2f863b398e..4077d7dd19 100644 --- a/e2e/react-start/import-protection/tests/violations.setup.ts +++ b/e2e/react-start/import-protection/tests/violations.setup.ts @@ -1,9 +1,9 @@ +import { spawn } from 'node:child_process' import fs from 'node:fs' import path from 'node:path' -import { spawn } from 'node:child_process' -import { chromium } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } +import { stripVTControlCharacters } from 'node:util' +import { chromium, expect } from '@playwright/test' +import { appServerReadyPattern } from '@tanstack/router-e2e-utils' import { extractViolationsFromLog, @@ -12,16 +12,11 @@ import { import type { FullConfig } from '@playwright/test' import type { Violation } from './violations.utils' -const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' const viteBundledDev = process.env.E2E_VITE_BUNDLED_DEV === 'true' -const e2ePortKey = - process.env.E2E_PORT_KEY ?? - `${packageJson.name}-${toolchain}${viteBundledDev ? '-bundled-dev' : ''}` async function waitForHttpOk(url: string, timeoutMs: number): Promise { const start = Date.now() - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition while (true) { if (Date.now() - start > timeoutMs) { throw new Error(`Timed out waiting for ${url}`) @@ -214,7 +209,6 @@ async function runDevPass( cwd: string, port: number, ): Promise> { - const baseURL = `http://localhost:${port}` const logChunks: Array = [] const child = startDevServer(cwd, port) @@ -222,6 +216,19 @@ async function runDevPass( child.stderr?.on('data', (d: Buffer) => logChunks.push(d.toString())) try { + await expect + .poll( + () => + appServerReadyPattern.exec( + stripVTControlCharacters(logChunks.join('')), + )?.groups?.E2E_APP_PORT, + { timeout: 30_000 }, + ) + .toBeTruthy() + const port = appServerReadyPattern.exec( + stripVTControlCharacters(logChunks.join('')), + )!.groups!.E2E_APP_PORT + const baseURL = `http://localhost:${port}` await waitForHttpOk(baseURL, 30_000) const browser = await chromium.launch() @@ -247,10 +254,7 @@ async function runDevPass( * modules are pre-transformed so resolveId/transform paths differ. */ async function captureDevViolations(cwd: string): Promise { - const coldViolations = await runDevPass( - cwd, - await getTestServerPort(`${e2ePortKey}-violations-cold`), - ) + const coldViolations = await runDevPass(cwd, 0) fs.writeFileSync( path.resolve(cwd, getViolationArtifactName('dev')), @@ -262,10 +266,7 @@ async function captureDevViolations(cwd: string): Promise { ) // Warm pass: the .vite cache from the cold run is still on disk. - const warmViolations = await runDevPass( - cwd, - await getTestServerPort(`${e2ePortKey}-violations-warm`), - ) + const warmViolations = await runDevPass(cwd, 0) fs.writeFileSync( path.resolve(cwd, getViolationArtifactName('dev.warm')), diff --git a/e2e/react-start/issue-8049/package.json b/e2e/react-start/issue-8049/package.json index d76b23fc3b..be848d434c 100644 --- a/e2e/react-start/issue-8049/package.json +++ b/e2e/react-start/issue-8049/package.json @@ -6,7 +6,7 @@ "build": "vite build && tsc --noEmit", "dev": "vite dev --port 3000", "dev:e2e": "vite dev", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/issue-8049/playwright.config.ts b/e2e/react-start/issue-8049/playwright.config.ts index 04fa904ba6..46bfbe552e 100644 --- a/e2e/react-start/issue-8049/playwright.config.ts +++ b/e2e/react-start/issue-8049/playwright.config.ts @@ -1,10 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const PORT = - Number(process.env.VITE_SERVER_PORT) || - (await getTestServerPort(packageJson.name)) + Number(process.env.VITE_SERVER_PORT) || Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -14,8 +12,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, projects: [ diff --git a/e2e/react-start/query-integration/package.json b/e2e/react-start/query-integration/package.json index 4ad1839537..694289ccc2 100644 --- a/e2e/react-start/query-integration/package.json +++ b/e2e/react-start/query-integration/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.90.0", diff --git a/e2e/react-start/query-integration/playwright.config.ts b/e2e/react-start/query-integration/playwright.config.ts index 4d86a1dbe7..82678ac00b 100644 --- a/e2e/react-start/query-integration/playwright.config.ts +++ b/e2e/react-start/query-integration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { derivePort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await derivePort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/root-document-hydration/package.json b/e2e/react-start/root-document-hydration/package.json index d69ddfc0bf..73aab62031 100644 --- a/e2e/react-start/root-document-hydration/package.json +++ b/e2e/react-start/root-document-hydration/package.json @@ -10,7 +10,7 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js", "test:e2e:dev": "MODE=dev playwright test --project=chromium", "test:e2e:prod": "MODE=prod playwright test --project=chromium", - "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:dev && pnpm run test:e2e:prod" + "test:e2e": "pnpm run test:e2e:dev && pnpm run test:e2e:prod" }, "dependencies": { "@tanstack/react-router": "workspace:*", diff --git a/e2e/react-start/root-document-hydration/playwright.config.ts b/e2e/react-start/root-document-hydration/playwright.config.ts index 18abea0ab1..13dda4e328 100644 --- a/e2e/react-start/root-document-hydration/playwright.config.ts +++ b/e2e/react-start/root-document-hydration/playwright.config.ts @@ -1,9 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const isDev = process.env.MODE === 'dev' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -16,9 +15,11 @@ export default defineConfig({ }, webServer: { - command: isDev ? 'pnpm dev:e2e' : `pnpm build && PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: isDev + ? 'pnpm dev:e2e --port 0' + : `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { PORT: String(PORT), diff --git a/e2e/react-start/rsbuild/package.json b/e2e/react-start/rsbuild/package.json index d0b7566489..8711d7a737 100644 --- a/e2e/react-start/rsbuild/package.json +++ b/e2e/react-start/rsbuild/package.json @@ -8,7 +8,7 @@ "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}-syntax-error-overlay.txt\"' && playwright test --project=chromium" + "test:e2e-full": "pnpm build && playwright test --project=chromium" }, "nx": { "metadata": { diff --git a/e2e/react-start/rsbuild/playwright.config.ts b/e2e/react-start/rsbuild/playwright.config.ts index 6e8f176361..e5c9004335 100644 --- a/e2e/react-start/rsbuild/playwright.config.ts +++ b/e2e/react-start/rsbuild/playwright.config.ts @@ -1,17 +1,4 @@ -import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import packageJson from './package.json' with { type: 'json' } - -const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name - -if (process.env.TEST_WORKER_INDEX === undefined) { - for (const portFile of [ - `port-${e2ePortKey}.txt`, - `port-${e2ePortKey}-syntax-error-overlay.txt`, - ]) { - fs.rmSync(portFile, { force: true }) - } -} export default defineConfig({ testDir: './tests', diff --git a/e2e/react-start/rsbuild/tests/error-overlay.spec.ts b/e2e/react-start/rsbuild/tests/error-overlay.spec.ts index 5d6497f740..d90647314a 100644 --- a/e2e/react-start/rsbuild/tests/error-overlay.spec.ts +++ b/e2e/react-start/rsbuild/tests/error-overlay.spec.ts @@ -1,12 +1,11 @@ +import { spawn } from 'node:child_process' import fs from 'node:fs' import path from 'node:path' -import { spawn } from 'node:child_process' +import { stripVTControlCharacters } from 'node:util' +import { appServerReadyPattern, test } from '@tanstack/router-e2e-utils' import { expect } from '@playwright/test' -import { getTestServerPort, test } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } import type { Page } from '@playwright/test' -const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name const fixtureRoot = path.resolve(import.meta.dirname, '..') const workspaceRoot = path.resolve(import.meta.dirname, '../../../..') const errorOverlaySelector = 'rsbuild-error-overlay' @@ -15,7 +14,7 @@ const syntaxErrorRoutePatch = '\nexport const broken = ;\n' const devServerTimeout = 30_000 class DevServer { - readonly url: string + url = '' private stopPromise: Promise | null = null private startupError: Error | null = null private readonly startupErrorPromise: Promise @@ -24,7 +23,16 @@ class DevServer { readonly port: number, private readonly childProcess: ReturnType, ) { - this.url = `http://localhost:${port}` + let log = '' + const captureAddress = (data: Buffer) => { + log += data.toString() + const match = appServerReadyPattern.exec(stripVTControlCharacters(log)) + if (match?.groups?.E2E_APP_PORT) { + this.url = `http://localhost:${match.groups.E2E_APP_PORT}` + } + } + this.childProcess.stdout?.on('data', captureAddress) + this.childProcess.stderr?.on('data', captureAddress) this.startupErrorPromise = new Promise((_, reject) => { this.childProcess.once('error', (error) => { this.startupError = error @@ -45,7 +53,7 @@ class DevServer { VITE_SERVER_PORT: String(port), VITE_NODE_ENV: 'test', }, - stdio: 'ignore', + stdio: ['ignore', 'pipe', 'pipe'], }), ) @@ -351,7 +359,7 @@ test('shows a module syntax error through the error overlay', async ({ }) => { const homeRouteFile = path.resolve(fixtureRoot, 'src/routes/index.tsx') const originalSource = await fs.promises.readFile(homeRouteFile, 'utf-8') - const port = await getTestServerPort(`${e2ePortKey}-syntax-error-overlay`) + const port = 0 await using devServer = await DevServer.start(port) try { diff --git a/e2e/react-start/rsc-deferred-hydration/playwright.config.ts b/e2e/react-start/rsc-deferred-hydration/playwright.config.ts index cbbc44cd92..f3a22f1fff 100644 --- a/e2e/react-start/rsc-deferred-hydration/playwright.config.ts +++ b/e2e/react-start/rsc-deferred-hydration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' @@ -11,11 +10,12 @@ export default defineConfig({ testDir: './tests', workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', use: { baseURL }, webServer: { - command: isDev ? 'pnpm dev:e2e' : 'pnpm build && pnpm start', - url: baseURL, - reuseExistingServer: !process.env.CI, + command: isDev ? 'pnpm dev:e2e --port 0' : 'pnpm build && pnpm start', + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', diff --git a/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts b/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts new file mode 100644 index 0000000000..40acaec113 --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts @@ -0,0 +1,20 @@ +import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' + +export default async function setup() { + if (process.env.MODE !== 'dev') return + + const port = Number(process.env.E2E_APP_PORT ?? 0) + const baseURL = `http://localhost:${port}` + + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'home-heading', + warmup: async (page) => { + for (const route of ['/server-client', '/composite', '/css']) { + await page.goto(`${baseURL}${route}`, { waitUntil: 'domcontentloaded' }) + await page.waitForLoadState('networkidle') + } + }, + }) +} diff --git a/e2e/react-start/rsc-query/package.json b/e2e/react-start/rsc-query/package.json index 24c7b488f6..48a7fcae1d 100644 --- a/e2e/react-start/rsc-query/package.json +++ b/e2e/react-start/rsc-query/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.90.0", diff --git a/e2e/react-start/rsc-query/playwright.config.ts b/e2e/react-start/rsc-query/playwright.config.ts index 9ce88b8a8f..235a59f889 100644 --- a/e2e/react-start/rsc-query/playwright.config.ts +++ b/e2e/react-start/rsc-query/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -16,9 +15,9 @@ export default defineConfig({ webServer: { // RSC production builds are not yet supported, use dev mode - command: `pnpm dev:e2e`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm dev:e2e --port 0`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', diff --git a/e2e/react-start/rsc-rsbuild/package.json b/e2e/react-start/rsc-rsbuild/package.json index e3800f291a..340d75b006 100644 --- a/e2e/react-start/rsc-rsbuild/package.json +++ b/e2e/react-start/rsc-rsbuild/package.json @@ -8,7 +8,7 @@ "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" + "test:e2e-full": "pnpm build && playwright test --project=chromium" }, "nx": { "metadata": { diff --git a/e2e/react-start/rsc-rsbuild/playwright.config.ts b/e2e/react-start/rsc-rsbuild/playwright.config.ts index 511813d8a9..dd356709b8 100644 --- a/e2e/react-start/rsc-rsbuild/playwright.config.ts +++ b/e2e/react-start/rsc-rsbuild/playwright.config.ts @@ -1,18 +1,9 @@ -import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -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`]) { - fs.rmSync(portFile, { force: true }) - } -} - -const PORT = await getTestServerPort(e2ePortKey) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -26,13 +17,12 @@ export default defineConfig({ webServer: { command: 'pnpm start', - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { PORT: String(PORT), E2E_DIST_DIR: distDir, - E2E_PORT_KEY: e2ePortKey, }, }, diff --git a/e2e/react-start/rsc/package.json b/e2e/react-start/rsc/package.json index 0e7414e2aa..4080fa83dc 100644 --- a/e2e/react-start/rsc/package.json +++ b/e2e/react-start/rsc/package.json @@ -13,7 +13,7 @@ "build:vite": "vite build && tsc --noEmit", "preview": "vite preview", "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" + "test:e2e-full": "pnpm build && playwright test --project=chromium" }, "nx": { "metadata": { diff --git a/e2e/react-start/rsc/playwright.config.ts b/e2e/react-start/rsc/playwright.config.ts index be6164cf97..6cbc07f75a 100644 --- a/e2e/react-start/rsc/playwright.config.ts +++ b/e2e/react-start/rsc/playwright.config.ts @@ -1,18 +1,9 @@ -import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -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`]) { - fs.rmSync(portFile, { force: true }) - } -} - -const PORT = await getTestServerPort(e2ePortKey) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -26,14 +17,13 @@ export default defineConfig({ webServer: { command: 'pnpm start', - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, PORT: String(PORT), E2E_DIST_DIR: distDir, - E2E_PORT_KEY: e2ePortKey, }, }, diff --git a/e2e/react-start/scroll-restoration/package.json b/e2e/react-start/scroll-restoration/package.json index 17bf2b2449..cd7c39ac39 100644 --- a/e2e/react-start/scroll-restoration/package.json +++ b/e2e/react-start/scroll-restoration/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/scroll-restoration/playwright.config.ts b/e2e/react-start/scroll-restoration/playwright.config.ts index eb6acc23a7..1862174905 100644 --- a/e2e/react-start/scroll-restoration/playwright.config.ts +++ b/e2e/react-start/scroll-restoration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, diff --git a/e2e/react-start/selective-ssr/package.json b/e2e/react-start/selective-ssr/package.json index 1eb903c183..110fb50dce 100644 --- a/e2e/react-start/selective-ssr/package.json +++ b/e2e/react-start/selective-ssr/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/selective-ssr/playwright.config.ts b/e2e/react-start/selective-ssr/playwright.config.ts index badd6db0eb..630989e41f 100644 --- a/e2e/react-start/selective-ssr/playwright.config.ts +++ b/e2e/react-start/selective-ssr/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/serialization-adapters/package.json b/e2e/react-start/serialization-adapters/package.json index 0e0d157733..b3596cd033 100644 --- a/e2e/react-start/serialization-adapters/package.json +++ b/e2e/react-start/serialization-adapters/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/serialization-adapters/playwright.config.ts b/e2e/react-start/serialization-adapters/playwright.config.ts index badd6db0eb..630989e41f 100644 --- a/e2e/react-start/serialization-adapters/playwright.config.ts +++ b/e2e/react-start/serialization-adapters/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/server-functions-global-middleware/package.json b/e2e/react-start/server-functions-global-middleware/package.json index 5898097c81..d2949965bb 100644 --- a/e2e/react-start/server-functions-global-middleware/package.json +++ b/e2e/react-start/server-functions-global-middleware/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/server-functions-global-middleware/playwright.config.ts b/e2e/react-start/server-functions-global-middleware/playwright.config.ts index 8330e023ee..7b9ac2ceb5 100644 --- a/e2e/react-start/server-functions-global-middleware/playwright.config.ts +++ b/e2e/react-start/server-functions-global-middleware/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -export const PORT = await getTestServerPort(packageJson.name) +export const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/server-functions/package.json b/e2e/react-start/server-functions/package.json index 390d417423..60e6aa1706 100644 --- a/e2e/react-start/server-functions/package.json +++ b/e2e/react-start/server-functions/package.json @@ -13,7 +13,7 @@ "build:rsbuild": "rsbuild build && tsc --noEmit", "preview": "vite preview", "start": "node server.js", - "test:e2e": "rm -rf port*.txt && pnpm build && playwright test --project=chromium && pnpm run test:e2e:rsbuild-cache", + "test:e2e": "pnpm build && playwright test --project=chromium && pnpm run test:e2e:rsbuild-cache", "test:e2e:rsbuild-cache": "playwright test -c playwright.rsbuild-cache.config.ts --project=chromium" }, "dependencies": { diff --git a/e2e/react-start/server-functions/playwright.config.ts b/e2e/react-start/server-functions/playwright.config.ts index d88e582e2f..33fe8c0572 100644 --- a/e2e/react-start/server-functions/playwright.config.ts +++ b/e2e/react-start/server-functions/playwright.config.ts @@ -1,11 +1,9 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name const distDir = process.env.E2E_DIST_DIR ?? 'dist' -export const PORT = await getTestServerPort(e2ePortKey) +export const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -25,14 +23,13 @@ export default defineConfig({ webServer: { command: `PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { PORT: String(PORT), VITE_SERVER_PORT: String(PORT), E2E_DIST_DIR: distDir, - E2E_PORT_KEY: e2ePortKey, }, }, diff --git a/e2e/react-start/server-functions/tests/server-functions.spec.ts b/e2e/react-start/server-functions/tests/server-functions.spec.ts index 5bb458d61c..f87e699330 100644 --- a/e2e/react-start/server-functions/tests/server-functions.spec.ts +++ b/e2e/react-start/server-functions/tests/server-functions.spec.ts @@ -1,11 +1,9 @@ import * as fs from 'node:fs' import { expect } from '@playwright/test' -import { getTestServerPort, test } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } +import { test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' -const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name -const PORT = await getTestServerPort(e2ePortKey) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) test('Server function URLs correctly include explicit ids', async ({ page, diff --git a/e2e/react-start/server-routes-global-middleware/package.json b/e2e/react-start/server-routes-global-middleware/package.json index 6887b19b5f..f835d043e8 100644 --- a/e2e/react-start/server-routes-global-middleware/package.json +++ b/e2e/react-start/server-routes-global-middleware/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/server-routes-global-middleware/playwright.config.ts b/e2e/react-start/server-routes-global-middleware/playwright.config.ts index 8330e023ee..7b9ac2ceb5 100644 --- a/e2e/react-start/server-routes-global-middleware/playwright.config.ts +++ b/e2e/react-start/server-routes-global-middleware/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -export const PORT = await getTestServerPort(packageJson.name) +export const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/server-routes/playwright.config.ts b/e2e/react-start/server-routes/playwright.config.ts index 8330e023ee..7b9ac2ceb5 100644 --- a/e2e/react-start/server-routes/playwright.config.ts +++ b/e2e/react-start/server-routes/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -export const PORT = await getTestServerPort(packageJson.name) +export const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/spa-mode/package.json b/e2e/react-start/spa-mode/package.json index 1810493b1a..5281364692 100644 --- a/e2e/react-start/spa-mode/package.json +++ b/e2e/react-start/spa-mode/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "npx serve dist/client", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/spa-mode/playwright.config.ts b/e2e/react-start/spa-mode/playwright.config.ts index badd6db0eb..630989e41f 100644 --- a/e2e/react-start/spa-mode/playwright.config.ts +++ b/e2e/react-start/spa-mode/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/split-base-and-basepath/package.json b/e2e/react-start/split-base-and-basepath/package.json index c0066b7aaf..5a973cb1c4 100644 --- a/e2e/react-start/split-base-and-basepath/package.json +++ b/e2e/react-start/split-base-and-basepath/package.json @@ -10,7 +10,7 @@ "start": "node prod-server.js", "test:e2e:dev": "MODE=dev playwright test --project=chromium", "test:e2e:prod": "playwright test --project=chromium", - "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:dev && pnpm run test:e2e:prod" + "test:e2e": "pnpm run test:e2e:dev && pnpm run test:e2e:prod" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/split-base-and-basepath/playwright.config.ts b/e2e/react-start/split-base-and-basepath/playwright.config.ts index 671f26464b..f0e25bb95a 100644 --- a/e2e/react-start/split-base-and-basepath/playwright.config.ts +++ b/e2e/react-start/split-base-and-basepath/playwright.config.ts @@ -1,11 +1,10 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -13,14 +12,18 @@ export default defineConfig({ workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + use: { baseURL, }, webServer: { - command: isDev ? `pnpm dev:e2e` : `pnpm build && PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: isDev + ? `pnpm dev:e2e --port 0` + : `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { PORT: String(PORT), diff --git a/e2e/react-start/split-base-and-basepath/prod-server.js b/e2e/react-start/split-base-and-basepath/prod-server.js index 72114a1d40..58421125cf 100644 --- a/e2e/react-start/split-base-and-basepath/prod-server.js +++ b/e2e/react-start/split-base-and-basepath/prod-server.js @@ -20,7 +20,9 @@ app.use(async (req, res, next) => { } }) -app.listen(PORT, (error) => { - if (error) throw error - console.log(`Server is running on http://localhost:${PORT}`) +const httpServer = app.listen(PORT, (error) => { + if (error) { + throw error + } + console.log(`E2E app: http://localhost:${httpServer.address().port}`) }) diff --git a/e2e/react-start/split-base-and-basepath/tests/setup/global.setup.ts b/e2e/react-start/split-base-and-basepath/tests/setup/global.setup.ts new file mode 100644 index 0000000000..9fc3ddc286 --- /dev/null +++ b/e2e/react-start/split-base-and-basepath/tests/setup/global.setup.ts @@ -0,0 +1,25 @@ +import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' + +export default async function setup() { + if (process.env.MODE !== 'dev') return + + const port = Number(process.env.E2E_APP_PORT ?? 0) + const baseURL = `http://localhost:${port}` + + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'home-heading', + warmup: async (page) => { + await page.getByTestId('link-about').click() + await page.waitForURL('**/about') + await page.getByTestId('about-heading').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.getByTestId('link-home').click() + await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) + await page.getByTestId('home-heading').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + }, + }) +} diff --git a/e2e/react-start/start-manifest/playwright.config.ts b/e2e/react-start/start-manifest/playwright.config.ts index 9e72f6160b..333ada654d 100644 --- a/e2e/react-start/start-manifest/playwright.config.ts +++ b/e2e/react-start/start-manifest/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -16,8 +15,8 @@ export default defineConfig({ webServer: { command: `PORT=${PORT} pnpm build && PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/static-server-functions/package.json b/e2e/react-start/static-server-functions/package.json index 6aa146fc59..3e16293058 100644 --- a/e2e/react-start/static-server-functions/package.json +++ b/e2e/react-start/static-server-functions/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "node .output/server/index.mjs", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:*", @@ -29,5 +29,14 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" + }, + "nx": { + "targets": { + "test:e2e": { + "dependsOn": [ + "build" + ] + } + } } } diff --git a/e2e/react-start/static-server-functions/playwright.config.ts b/e2e/react-start/static-server-functions/playwright.config.ts index b9f835c16a..08416e4d53 100644 --- a/e2e/react-start/static-server-functions/playwright.config.ts +++ b/e2e/react-start/static-server-functions/playwright.config.ts @@ -1,8 +1,6 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } -const PORT = await getTestServerPort(packageJson.name) +const PORT = 3000 const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -15,9 +13,9 @@ export default defineConfig({ }, webServer: { - command: `pnpm build && PORT=${PORT} pnpm start`, + command: `PORT=${PORT} pnpm start`, url: baseURL, - reuseExistingServer: !process.env.CI, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/streaming-ssr/package.json b/e2e/react-start/streaming-ssr/package.json index fcf78262d5..3e85f5e78c 100644 --- a/e2e/react-start/streaming-ssr/package.json +++ b/e2e/react-start/streaming-ssr/package.json @@ -9,8 +9,8 @@ "build": "vite build && tsc --noEmit", "start": "pnpx srvx --prod -s ../client dist/server/server.js", "preview": "vite preview", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium", - "test:e2e:preview": "rm -rf port*.txt; MODE=preview playwright test preview-streaming.spec.ts --project=chromium" + "test:e2e": "playwright test --project=chromium", + "test:e2e:preview": "MODE=preview playwright test preview-streaming.spec.ts --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.80.7", diff --git a/e2e/react-start/streaming-ssr/playwright.config.ts b/e2e/react-start/streaming-ssr/playwright.config.ts index 052ebe879d..c2f3b67a0c 100644 --- a/e2e/react-start/streaming-ssr/playwright.config.ts +++ b/e2e/react-start/streaming-ssr/playwright.config.ts @@ -1,12 +1,9 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const isPreview = process.env.MODE === 'preview' -const PORT = await getTestServerPort( - `${packageJson.name}${isPreview ? '_preview' : ''}`, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` const ssrCommand = `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start` @@ -28,8 +25,8 @@ export default defineConfig({ webServer: { command: isPreview ? previewCommand : ssrCommand, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/react-start/transform-asset-urls/package.json b/e2e/react-start/transform-asset-urls/package.json index 95e39e459b..3bb8550995 100644 --- a/e2e/react-start/transform-asset-urls/package.json +++ b/e2e/react-start/transform-asset-urls/package.json @@ -16,19 +16,19 @@ "manual:both:options": "TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform pnpm manual:both", "manual:both:options:transform": "TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform pnpm manual:both", "manual:both:options:createTransform": "TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform pnpm manual:both", - "test:e2e:string": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=string playwright test --project=chromium", - "test:e2e:function": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=function playwright test --project=chromium", - "test:e2e:options": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform playwright test --project=chromium", - "test:e2e:options:transform": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform playwright test --project=chromium", - "test:e2e:options:createTransform": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform playwright test --project=chromium", - "test:e2e:options:transform:cache-true:warmup-true": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", - "test:e2e:options:transform:cache-true:warmup-false": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", - "test:e2e:options:transform:cache-false:warmup-true": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", - "test:e2e:options:transform:cache-false:warmup-false": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", - "test:e2e:options:createTransform:cache-true:warmup-true": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", - "test:e2e:options:createTransform:cache-true:warmup-false": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", - "test:e2e:options:createTransform:cache-false:warmup-true": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", - "test:e2e:options:createTransform:cache-false:warmup-false": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", + "test:e2e:string": "rm -rf dist; TRANSFORM_ASSETS_MODE=string playwright test --project=chromium", + "test:e2e:function": "rm -rf dist; TRANSFORM_ASSETS_MODE=function playwright test --project=chromium", + "test:e2e:options": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform playwright test --project=chromium", + "test:e2e:options:transform": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform playwright test --project=chromium", + "test:e2e:options:createTransform": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform playwright test --project=chromium", + "test:e2e:options:transform:cache-true:warmup-true": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", + "test:e2e:options:transform:cache-true:warmup-false": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", + "test:e2e:options:transform:cache-false:warmup-true": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", + "test:e2e:options:transform:cache-false:warmup-false": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", + "test:e2e:options:createTransform:cache-true:warmup-true": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", + "test:e2e:options:createTransform:cache-true:warmup-false": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", + "test:e2e:options:createTransform:cache-false:warmup-true": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", + "test:e2e:options:createTransform:cache-false:warmup-false": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", "test:e2e:options:matrix": "pnpm test:e2e:options:transform:cache-true:warmup-true && pnpm test:e2e:options:transform:cache-true:warmup-false && pnpm test:e2e:options:transform:cache-false:warmup-true && pnpm test:e2e:options:transform:cache-false:warmup-false && pnpm test:e2e:options:createTransform:cache-true:warmup-true && pnpm test:e2e:options:createTransform:cache-true:warmup-false && pnpm test:e2e:options:createTransform:cache-false:warmup-true && pnpm test:e2e:options:createTransform:cache-false:warmup-false", "test:e2e": "pnpm test:e2e:string && pnpm test:e2e:function && pnpm test:e2e:options:matrix" }, diff --git a/e2e/react-start/transform-asset-urls/playwright.config.ts b/e2e/react-start/transform-asset-urls/playwright.config.ts index bbef6838fe..209a7e0596 100644 --- a/e2e/react-start/transform-asset-urls/playwright.config.ts +++ b/e2e/react-start/transform-asset-urls/playwright.config.ts @@ -1,12 +1,10 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const APP_PORT = await getTestServerPort(packageJson.name) -const CDN_PORT = await getTestServerPort(`${packageJson.name}_cdn`) +const APP_PORT = Number(process.env.E2E_APP_PORT ?? 0) +const CDN_PORT = Number(process.env.E2E_CDN_PORT ?? 0) const baseURL = `http://localhost:${APP_PORT}` -const cdnOrigin = `http://localhost:${CDN_PORT}` const transformMode = process.env.TRANSFORM_ASSETS_MODE || 'string' const optionsKind = process.env.TRANSFORM_ASSETS_OPTIONS_KIND || 'createTransform' @@ -26,8 +24,11 @@ export default defineConfig({ { // CDN server — serves built client assets on a separate port with CORS command: `node tests/cdn-server.mjs`, - url: `http://localhost:${CDN_PORT}/health`, - reuseExistingServer: !process.env.CI, + wait: { + stdout: + /CDN Server: (?http:\/\/localhost:(?\d+))/, + }, + reuseExistingServer: false, stdout: 'pipe', env: { CDN_PORT: String(CDN_PORT), @@ -37,12 +38,11 @@ export default defineConfig({ // App server — builds the project then starts the srvx server // with CDN_ORIGIN so that transformAssets rewrites manifest URLs command: `pnpm build && pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { PORT: String(APP_PORT), - CDN_ORIGIN: cdnOrigin, TRANSFORM_ASSETS_MODE: transformMode, TRANSFORM_ASSETS_OPTIONS_KIND: optionsKind, TRANSFORM_ASSETS_OPTIONS_CACHE: optionsCache, diff --git a/e2e/react-start/transform-asset-urls/tests/cdn-server.mjs b/e2e/react-start/transform-asset-urls/tests/cdn-server.mjs index ea9bf62cd0..280c626867 100644 --- a/e2e/react-start/transform-asset-urls/tests/cdn-server.mjs +++ b/e2e/react-start/transform-asset-urls/tests/cdn-server.mjs @@ -3,7 +3,7 @@ import path from 'node:path' import { fileURLToPath } from 'node:url' const __dirname = path.dirname(fileURLToPath(import.meta.url)) -const port = process.env.CDN_PORT || 3002 +const port = Number(process.env.CDN_PORT ?? 0) const app = express() @@ -36,7 +36,7 @@ app.use((req, res, next) => { app.use(express.static(path.resolve(__dirname, '..', 'dist', 'client'))) -app.listen(port, (error) => { +const server = app.listen(port, (error) => { if (error) throw error - console.info(`CDN Server: http://localhost:${port}`) + console.info(`CDN Server: http://localhost:${server.address().port}`) }) diff --git a/e2e/react-start/virtual-routes/package.json b/e2e/react-start/virtual-routes/package.json index 9648dd2c99..0c44d745f8 100644 --- a/e2e/react-start/virtual-routes/package.json +++ b/e2e/react-start/virtual-routes/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/virtual-routes/playwright.config.ts b/e2e/react-start/virtual-routes/playwright.config.ts index 76044a35d4..1862174905 100644 --- a/e2e/react-start/virtual-routes/playwright.config.ts +++ b/e2e/react-start/virtual-routes/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, diff --git a/e2e/react-start/website/package.json b/e2e/react-start/website/package.json index 4c8461a3b5..97f3e5bd11 100644 --- a/e2e/react-start/website/package.json +++ b/e2e/react-start/website/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/website/playwright.config.ts b/e2e/react-start/website/playwright.config.ts index 18b8905468..82678ac00b 100644 --- a/e2e/react-start/website/playwright.config.ts +++ b/e2e/react-start/website/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/basepath-file-based/package.json b/e2e/solid-router/basepath-file-based/package.json index 4b27235857..bc54799989 100644 --- a/e2e/solid-router/basepath-file-based/package.json +++ b/e2e/solid-router/basepath-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-router/basepath-file-based/playwright.config.ts b/e2e/solid-router/basepath-file-based/playwright.config.ts index be44f419e9..4eead86444 100644 --- a/e2e/solid-router/basepath-file-based/playwright.config.ts +++ b/e2e/solid-router/basepath-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/basic-esbuild-file-based/package.json b/e2e/solid-router/basic-esbuild-file-based/package.json index d3b10307d2..e2448db01b 100644 --- a/e2e/solid-router/basic-esbuild-file-based/package.json +++ b/e2e/solid-router/basic-esbuild-file-based/package.json @@ -7,7 +7,7 @@ "build": "esbuild src/main.tsx --jsx=preserve --jsx-import-source=solid-js --bundle --outfile=dist/main.js && tsc --noEmit", "serve": "esbuild src/main.tsx --jsx=preserve --jsx-import-source=solid-js --bundle --outfile=dist/main.js --servedir=.", "start": "dev", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/router-plugin": "workspace:^", diff --git a/e2e/solid-router/basic-esbuild-file-based/playwright.config.ts b/e2e/solid-router/basic-esbuild-file-based/playwright.config.ts index a0e9c0f041..972dd66d72 100644 --- a/e2e/solid-router/basic-esbuild-file-based/playwright.config.ts +++ b/e2e/solid-router/basic-esbuild-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `pnpm run build && pnpm run serve --serve=${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/basic-file-based-code-splitting/package.json b/e2e/solid-router/basic-file-based-code-splitting/package.json index daf7e5d998..bb4cc2291e 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/package.json +++ b/e2e/solid-router/basic-file-based-code-splitting/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/solid-router/basic-file-based-code-splitting/playwright.config.ts b/e2e/solid-router/basic-file-based-code-splitting/playwright.config.ts index 6976028d7a..4eead86444 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/playwright.config.ts +++ b/e2e/solid-router/basic-file-based-code-splitting/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/basic-file-based/package.json b/e2e/solid-router/basic-file-based/package.json index 140e763f43..bb882e2786 100644 --- a/e2e/solid-router/basic-file-based/package.json +++ b/e2e/solid-router/basic-file-based/package.json @@ -9,7 +9,7 @@ "preview": "vite preview", "start": "vite", "test:e2e": "pnpm run test:e2e:default", - "test:e2e:default": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e:default": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/solid-router/basic-file-based/playwright.config.ts b/e2e/solid-router/basic-file-based/playwright.config.ts index fe3edefe3a..ea3ef9ffec 100644 --- a/e2e/solid-router/basic-file-based/playwright.config.ts +++ b/e2e/solid-router/basic-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` const command = `pnpm build && pnpm preview --host 0.0.0.0 --port ${PORT}` @@ -24,14 +23,12 @@ export default defineConfig({ webServer: { command, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { MODE: process.env.MODE || '', VITE_MODE: process.env.MODE || '', - VITE_NODE_ENV: 'test', - VITE_SERVER_PORT: String(PORT), PORT: String(PORT), }, }, diff --git a/e2e/solid-router/basic-file-based/tests/redirect.spec.ts b/e2e/solid-router/basic-file-based/tests/redirect.spec.ts index ce09189036..c3604ccb92 100644 --- a/e2e/solid-router/basic-file-based/tests/redirect.spec.ts +++ b/e2e/solid-router/basic-file-based/tests/redirect.spec.ts @@ -1,15 +1,12 @@ import queryString from 'node:querystring' import { expect } from '@playwright/test' -import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' +import { apiTest as test } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' -import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = await getTestServerPort( - process.env.E2E_PORT_KEY ?? packageJson.name, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` test.describe('redirects', () => { diff --git a/e2e/solid-router/basic-file-based/tests/relative.spec.ts b/e2e/solid-router/basic-file-based/tests/relative.spec.ts index 7aa5f0b84b..f62c248680 100644 --- a/e2e/solid-router/basic-file-based/tests/relative.spec.ts +++ b/e2e/solid-router/basic-file-based/tests/relative.spec.ts @@ -1,14 +1,11 @@ import { expect } from '@playwright/test' -import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' +import { apiTest as test } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' -import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = await getTestServerPort( - process.env.E2E_PORT_KEY ?? packageJson.name, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) test.describe('relative_routing', () => { const internalNavigationTestMatrix = combinate({ diff --git a/e2e/solid-router/basic-scroll-restoration/package.json b/e2e/solid-router/basic-scroll-restoration/package.json index 8e93ddfc72..e2b945cb6a 100644 --- a/e2e/solid-router/basic-scroll-restoration/package.json +++ b/e2e/solid-router/basic-scroll-restoration/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/solid-router/basic-scroll-restoration/playwright.config.ts b/e2e/solid-router/basic-scroll-restoration/playwright.config.ts index 0c5cee43e4..6a684ac89e 100644 --- a/e2e/solid-router/basic-scroll-restoration/playwright.config.ts +++ b/e2e/solid-router/basic-scroll-restoration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/basic-solid-query-file-based/package.json b/e2e/solid-router/basic-solid-query-file-based/package.json index 1a5c393d1a..5243275066 100644 --- a/e2e/solid-router/basic-solid-query-file-based/package.json +++ b/e2e/solid-router/basic-solid-query-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/solid-router/basic-solid-query-file-based/playwright.config.ts b/e2e/solid-router/basic-solid-query-file-based/playwright.config.ts index 6976028d7a..4eead86444 100644 --- a/e2e/solid-router/basic-solid-query-file-based/playwright.config.ts +++ b/e2e/solid-router/basic-solid-query-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/basic-solid-query/package.json b/e2e/solid-router/basic-solid-query/package.json index 93469e3699..1efe55fa60 100644 --- a/e2e/solid-router/basic-solid-query/package.json +++ b/e2e/solid-router/basic-solid-query/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/solid-router/basic-solid-query/playwright.config.ts b/e2e/solid-router/basic-solid-query/playwright.config.ts index aecc8fd69b..e7b8439dba 100644 --- a/e2e/solid-router/basic-solid-query/playwright.config.ts +++ b/e2e/solid-router/basic-solid-query/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/basic-virtual-file-based/package.json b/e2e/solid-router/basic-virtual-file-based/package.json index 9e7dafd46a..4f188d9262 100644 --- a/e2e/solid-router/basic-virtual-file-based/package.json +++ b/e2e/solid-router/basic-virtual-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/solid-router/basic-virtual-file-based/playwright.config.ts b/e2e/solid-router/basic-virtual-file-based/playwright.config.ts index 6976028d7a..4eead86444 100644 --- a/e2e/solid-router/basic-virtual-file-based/playwright.config.ts +++ b/e2e/solid-router/basic-virtual-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json b/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json index 6a8b6de158..7a29e6576a 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/solid-router/basic-virtual-named-export-config-file-based/playwright.config.ts index 6976028d7a..4eead86444 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/basic/package.json b/e2e/solid-router/basic/package.json index 33479274b6..29f10e19ff 100644 --- a/e2e/solid-router/basic/package.json +++ b/e2e/solid-router/basic/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/solid-router/basic/playwright.config.ts b/e2e/solid-router/basic/playwright.config.ts index 6976028d7a..4eead86444 100644 --- a/e2e/solid-router/basic/playwright.config.ts +++ b/e2e/solid-router/basic/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/basic/tests/app.spec.ts b/e2e/solid-router/basic/tests/app.spec.ts index 5038f79098..9c0a6b6901 100644 --- a/e2e/solid-router/basic/tests/app.spec.ts +++ b/e2e/solid-router/basic/tests/app.spec.ts @@ -1,10 +1,7 @@ import { expect } from '@playwright/test' -import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } +import { apiTest as test } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort( - process.env.E2E_PORT_KEY ?? packageJson.name, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/solid-router/generator-cli-only/package.json b/e2e/solid-router/generator-cli-only/package.json index 64e98187d6..55fd448971 100644 --- a/e2e/solid-router/generator-cli-only/package.json +++ b/e2e/solid-router/generator-cli-only/package.json @@ -8,7 +8,7 @@ "build": "tsr generate && vite build && tsc --noEmit", "preview": "vite preview", "start": "tsr generate && vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/solid-router/generator-cli-only/playwright.config.ts b/e2e/solid-router/generator-cli-only/playwright.config.ts index be44f419e9..4eead86444 100644 --- a/e2e/solid-router/generator-cli-only/playwright.config.ts +++ b/e2e/solid-router/generator-cli-only/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/js-only-file-based/package.json b/e2e/solid-router/js-only-file-based/package.json index 8b3cc0b83b..3704edb6f9 100644 --- a/e2e/solid-router/js-only-file-based/package.json +++ b/e2e/solid-router/js-only-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/solid-router/js-only-file-based/playwright.config.ts b/e2e/solid-router/js-only-file-based/playwright.config.ts index ccf3853685..0925936d55 100644 --- a/e2e/solid-router/js-only-file-based/playwright.config.ts +++ b/e2e/solid-router/js-only-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/rspack-basic-file-based/package.json b/e2e/solid-router/rspack-basic-file-based/package.json index 23842edeaa..020bcb9ff6 100644 --- a/e2e/solid-router/rspack-basic-file-based/package.json +++ b/e2e/solid-router/rspack-basic-file-based/package.json @@ -7,7 +7,7 @@ "build": "rsbuild build && tsc --noEmit", "preview": "rsbuild preview", "start": "rsbuild preview", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-router/rspack-basic-file-based/playwright.config.ts b/e2e/solid-router/rspack-basic-file-based/playwright.config.ts index 025582e53e..4eead86444 100644 --- a/e2e/solid-router/rspack-basic-file-based/playwright.config.ts +++ b/e2e/solid-router/rspack-basic-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json index f5e36a5ab5..a89a44deb7 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json @@ -7,7 +7,7 @@ "build": "rsbuild build && tsc --noEmit", "preview": "rsbuild preview", "start": "rsbuild preview", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts index e66d2ff339..1c1d021f2f 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm start --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/package.json b/e2e/solid-router/scroll-restoration-sandbox-vite/package.json index 128b4c0790..5c62ab950a 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/package.json +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/package.json @@ -11,7 +11,7 @@ "start": "vite", "test:e2e:browser": "VITE_APP_HISTORY=browser playwright test --config=playwright.browser.config.ts --project=chromium", "test:e2e:hash": "VITE_APP_HISTORY=hash playwright test --config=playwright.hash.config.ts --project=chromium", - "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:browser && pnpm run test:e2e:hash" + "test:e2e": "pnpm run test:e2e:browser && pnpm run test:e2e:hash" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts b/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts index 0617259e4f..e2681daea5 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts @@ -1,13 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { - getTestServerPort, - resolveRuntimeSuffix, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort( - packageJson.name + `-${resolveRuntimeSuffix('browser')}`, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -24,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `VITE_APP_HISTORY=browser pnpm build && VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts b/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts index 9fa1623c08..445616b9bd 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts @@ -1,13 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { - getTestServerPort, - resolveRuntimeSuffix, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort( - packageJson.name + `-${resolveRuntimeSuffix('hash')}`, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -24,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/sentry-integration/package.json b/e2e/solid-router/sentry-integration/package.json index 04f36db588..83c9c7a087 100644 --- a/e2e/solid-router/sentry-integration/package.json +++ b/e2e/solid-router/sentry-integration/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@sentry/solid": "^10.32.0", diff --git a/e2e/solid-router/sentry-integration/playwright.config.ts b/e2e/solid-router/sentry-integration/playwright.config.ts index 0c5cee43e4..6a684ac89e 100644 --- a/e2e/solid-router/sentry-integration/playwright.config.ts +++ b/e2e/solid-router/sentry-integration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-router/view-transitions/package.json b/e2e/solid-router/view-transitions/package.json index c0b7d2e383..5fc632c172 100644 --- a/e2e/solid-router/view-transitions/package.json +++ b/e2e/solid-router/view-transitions/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/solid-router/view-transitions/playwright.config.ts b/e2e/solid-router/view-transitions/playwright.config.ts index e7e4795203..4eead86444 100644 --- a/e2e/solid-router/view-transitions/playwright.config.ts +++ b/e2e/solid-router/view-transitions/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-start/basic-auth/package.json b/e2e/solid-start/basic-auth/package.json index 789c3bc582..2d4ddaf972 100644 --- a/e2e/solid-start/basic-auth/package.json +++ b/e2e/solid-start/basic-auth/package.json @@ -10,7 +10,7 @@ "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", "prisma-generate": "prisma generate", - "test:e2e": "rm -rf port*.txt; mkdir -p .tmp; rm -f .tmp/dev.db .tmp/dev.db-journal .tmp/dev.db-wal .tmp/dev.db-shm; export DATABASE_URL=file:./.tmp/dev.db; pnpm run prisma-generate && pnpm exec prisma migrate deploy && playwright test --project=chromium" + "test:e2e": "mkdir -p .tmp; rm -f .tmp/dev.db .tmp/dev.db-journal .tmp/dev.db-wal .tmp/dev.db-shm; export DATABASE_URL=file:./.tmp/dev.db; pnpm run prisma-generate && pnpm exec prisma migrate deploy && playwright test --project=chromium" }, "dependencies": { "@libsql/client": "^0.15.15", diff --git a/e2e/solid-start/basic-auth/playwright.config.ts b/e2e/solid-start/basic-auth/playwright.config.ts index d8ab0dd8cc..4d5ea2e9f2 100644 --- a/e2e/solid-start/basic-auth/playwright.config.ts +++ b/e2e/solid-start/basic-auth/playwright.config.ts @@ -1,14 +1,13 @@ -import { fileURLToPath } from 'node:url' import path from 'node:path' +import { fileURLToPath } from 'node:url' import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' // Ensure port file is written next to this config, even if Playwright loads it // from a different working directory. process.chdir(path.dirname(fileURLToPath(import.meta.url))) -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -26,8 +25,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-start/basic-cloudflare/package.json b/e2e/solid-start/basic-cloudflare/package.json index c9d4f6b244..3f30314728 100644 --- a/e2e/solid-start/basic-cloudflare/package.json +++ b/e2e/solid-start/basic-cloudflare/package.json @@ -10,7 +10,7 @@ "preview": "vite preview", "cf-typegen": "wrangler types", "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-start/basic-cloudflare/playwright.config.ts b/e2e/solid-start/basic-cloudflare/playwright.config.ts index 99b9f3460a..0925936d55 100644 --- a/e2e/solid-start/basic-cloudflare/playwright.config.ts +++ b/e2e/solid-start/basic-cloudflare/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-start/basic-solid-query/package.json b/e2e/solid-start/basic-solid-query/package.json index 0522bd3808..167bc4a314 100644 --- a/e2e/solid-start/basic-solid-query/package.json +++ b/e2e/solid-start/basic-solid-query/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-query": "^5.90.9", diff --git a/e2e/solid-start/basic-solid-query/playwright.config.ts b/e2e/solid-start/basic-solid-query/playwright.config.ts index d31cc03c2e..0618b7272a 100644 --- a/e2e/solid-start/basic-solid-query/playwright.config.ts +++ b/e2e/solid-start/basic-solid-query/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` @@ -17,9 +16,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, diff --git a/e2e/solid-start/basic-solid-query/src/utils/users.tsx b/e2e/solid-start/basic-solid-query/src/utils/users.tsx index 52d659b001..e7fc1a5de4 100644 --- a/e2e/solid-start/basic-solid-query/src/utils/users.tsx +++ b/e2e/solid-start/basic-solid-query/src/utils/users.tsx @@ -1,4 +1,6 @@ import { queryOptions } from '@tanstack/solid-query' +import { createIsomorphicFn } from '@tanstack/solid-start' +import { getRequestUrl } from '@tanstack/solid-start/server' import axios from 'redaxios' export type User = { @@ -7,17 +9,16 @@ export type User = { email: string } -const PORT = - import.meta.env.VITE_SERVER_PORT || process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` +const getOrigin = createIsomorphicFn() + .server(() => getRequestUrl().origin) + .client(() => window.location.origin) export const usersQueryOptions = () => queryOptions({ queryKey: ['users'], queryFn: () => axios - .get>(DEPLOY_URL + '/api/users') + .get>(getOrigin() + '/api/users') .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch users') @@ -29,7 +30,7 @@ export const userQueryOptions = (id: string) => queryKey: ['users', id], queryFn: () => axios - .get(DEPLOY_URL + '/api/users/' + id) + .get(getOrigin() + '/api/users/' + id) .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch user') diff --git a/e2e/solid-start/basic-tsr-config/package.json b/e2e/solid-start/basic-tsr-config/package.json index 44321e96a1..bb8ed5f7bc 100644 --- a/e2e/solid-start/basic-tsr-config/package.json +++ b/e2e/solid-start/basic-tsr-config/package.json @@ -8,7 +8,7 @@ "dev:e2e": "vite dev", "build": "rimraf ./count.txt && vite build && tsc --noEmit", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-start/basic-tsr-config/playwright.config.ts b/e2e/solid-start/basic-tsr-config/playwright.config.ts index f6dd61ba6c..e6b92ce385 100644 --- a/e2e/solid-start/basic-tsr-config/playwright.config.ts +++ b/e2e/solid-start/basic-tsr-config/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-start/basic/playwright.config.ts b/e2e/solid-start/basic/playwright.config.ts index 165bd03ce1..9322874f3a 100644 --- a/e2e/solid-start/basic/playwright.config.ts +++ b/e2e/solid-start/basic/playwright.config.ts @@ -1,23 +1,11 @@ -import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const mode = process.env.MODE ?? 'ssr' -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}_start.txt`, - ]) { - fs.rmSync(portFile, { force: true }) - } -} - -const PORT = await getTestServerPort(e2ePortKey) -const START_PORT = await getTestServerPort(`${e2ePortKey}_start`) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` const commandByMode = mode === 'preview' @@ -35,18 +23,15 @@ export default defineConfig({ webServer: { command: commandByMode, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, MODE: mode, - VITE_NODE_ENV: 'test', - VITE_SERVER_PORT: String(PORT), - START_PORT: String(START_PORT), + START_PORT: '0', PORT: String(PORT), E2E_DIST_DIR: distDir, - E2E_PORT_KEY: e2ePortKey, }, }, diff --git a/e2e/solid-start/basic/server.js b/e2e/solid-start/basic/server.js index 69c1e4ca91..3e1ddab400 100644 --- a/e2e/solid-start/basic/server.js +++ b/e2e/solid-start/basic/server.js @@ -1,12 +1,12 @@ -import { toNodeHandler } from 'srvx/node' import fs from 'node:fs' import path from 'node:path' +import { toNodeHandler } from 'srvx/node' import express from 'express' import { createProxyMiddleware } from 'http-proxy-middleware' -const port = process.env.PORT || 3000 +const port = Number(process.env.PORT ?? 3000) -const startPort = process.env.START_PORT || 3001 +const startPort = Number(process.env.START_PORT ?? 0) const isSpaMode = process.env.MODE === 'spa' const isPrerender = process.env.MODE === 'prerender' @@ -49,13 +49,13 @@ export async function createStartServer() { return { app } } -export async function createSpaServer() { +export async function createSpaServer(backendPort) { const app = express() app.use( '/api', createProxyMiddleware({ - target: `http://localhost:${startPort}/api`, // Replace with your target server's URL + target: `http://localhost:${backendPort}/api`, // Replace with your target server's URL changeOrigin: false, // Needed for virtual hosted sites, }), ) @@ -63,7 +63,7 @@ export async function createSpaServer() { app.use( '/_serverFn', createProxyMiddleware({ - target: `http://localhost:${startPort}/_serverFn`, // Replace with your target server's URL + target: `http://localhost:${backendPort}/_serverFn`, // Replace with your target server's URL changeOrigin: false, // Needed for virtual hosted sites, }), ) @@ -71,31 +71,28 @@ export async function createSpaServer() { app.use(express.static(distClientDir)) app.get('/{*splat}', (req, res) => { - res.sendFile(path.resolve(distClientDir, 'index.html')) + res.sendFile('index.html', { root: distClientDir }) }) return { app } } -if (isSpaMode) { - createSpaServer().then(async ({ app }) => - app.listen(port, (error) => { - if (error) throw error - console.info(`Client Server: http://localhost:${port}`) - }), - ) - - createStartServer().then(async ({ app }) => - app.listen(startPort, (error) => { - if (error) throw error - console.info(`Start Server: http://localhost:${startPort}`) - }), - ) -} else { - createStartServer().then(async ({ app }) => - app.listen(port, (error) => { - if (error) throw error - console.info(`Start Server: http://localhost:${port}`) - }), - ) -} +// Bind the backend first so the SPA proxy receives the port actually held by it. +const { app: startApp } = await createStartServer() +const backend = startApp.listen(isSpaMode ? startPort : port, async (error) => { + if (error) { + throw error + } + const backendPort = backend.address().port + if (isSpaMode) { + const { app } = await createSpaServer(backendPort) + const frontend = app.listen(port, (frontendError) => { + if (frontendError) { + throw frontendError + } + console.info(`E2E app: http://localhost:${frontend.address().port}`) + }) + } else { + console.info(`E2E app: http://localhost:${backendPort}`) + } +}) diff --git a/e2e/solid-start/basic/tests/redirect.spec.ts b/e2e/solid-start/basic/tests/redirect.spec.ts index c78124abe8..8e6ceba5b9 100644 --- a/e2e/solid-start/basic/tests/redirect.spec.ts +++ b/e2e/solid-start/basic/tests/redirect.spec.ts @@ -1,16 +1,13 @@ import queryString from 'node:querystring' import { expect } from '@playwright/test' -import { getTestServerPort, test } from '@tanstack/router-e2e-utils' +import { test } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' import type { Page } from '@playwright/test' -import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = await getTestServerPort( - process.env.E2E_PORT_KEY ?? packageJson.name, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` const POSTS_URL = `http://localhost:${PORT}/posts` diff --git a/e2e/solid-start/basic/tests/utils/getE2EPortKey.ts b/e2e/solid-start/basic/tests/utils/getE2EPortKey.ts deleted file mode 100644 index 48be6a9027..0000000000 --- a/e2e/solid-start/basic/tests/utils/getE2EPortKey.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { getPackageName } from './getPackageName.ts' - -export function getE2EPortKey() { - return process.env.E2E_PORT_KEY ?? getPackageName() -} diff --git a/e2e/solid-start/csp/package.json b/e2e/solid-start/csp/package.json index 9e288ba0ef..46263c78ee 100644 --- a/e2e/solid-start/csp/package.json +++ b/e2e/solid-start/csp/package.json @@ -8,7 +8,7 @@ "dev:e2e": "vite dev", "build": "vite build && tsc --noEmit", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-start/csp/playwright.config.ts b/e2e/solid-start/csp/playwright.config.ts index 5f9de5709e..87b32e1f50 100644 --- a/e2e/solid-start/csp/playwright.config.ts +++ b/e2e/solid-start/csp/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-start/css-modules/package.json b/e2e/solid-start/css-modules/package.json index d996409200..98bcb0a108 100644 --- a/e2e/solid-start/css-modules/package.json +++ b/e2e/solid-start/css-modules/package.json @@ -11,7 +11,7 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js", "test:e2e:dev": "MODE=dev playwright test --project=chromium", "test:e2e:prod": "playwright test --project=chromium", - "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:dev" + "test:e2e": "pnpm run test:e2e:dev" }, "dependencies": { "@tanstack/solid-router": "workspace:*", diff --git a/e2e/solid-start/css-modules/playwright.config.ts b/e2e/solid-start/css-modules/playwright.config.ts index fd9ace2034..a50ac5ae63 100644 --- a/e2e/solid-start/css-modules/playwright.config.ts +++ b/e2e/solid-start/css-modules/playwright.config.ts @@ -1,10 +1,9 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -12,14 +11,18 @@ export default defineConfig({ workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + use: { baseURL, }, webServer: { - command: isDev ? `pnpm dev:e2e` : `pnpm build && PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: isDev + ? `pnpm dev:e2e --port 0` + : `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', diff --git a/e2e/solid-start/css-modules/tests/setup/global.setup.ts b/e2e/solid-start/css-modules/tests/setup/global.setup.ts new file mode 100644 index 0000000000..17be637f77 --- /dev/null +++ b/e2e/solid-start/css-modules/tests/setup/global.setup.ts @@ -0,0 +1,39 @@ +import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' + +export default async function setup() { + if (process.env.MODE !== 'dev') return + + const port = Number(process.env.E2E_APP_PORT ?? 0) + const baseURL = `http://localhost:${port}` + + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'global-styled', + warmup: async (page) => { + await page.goto(`${baseURL}/modules`, { waitUntil: 'domcontentloaded' }) + await page.getByTestId('module-card').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.goto(`${baseURL}/sass-mixin`, { + waitUntil: 'domcontentloaded', + }) + await page.getByTestId('mixin-styled').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.goto(`${baseURL}/`, { waitUntil: 'domcontentloaded' }) + await page.getByTestId('global-styled').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.getByTestId('nav-modules').click() + await page.waitForURL('**/modules') + await page.getByTestId('module-card').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.getByTestId('nav-home').click() + await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) + await page.getByTestId('global-styled').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + }, + }) +} diff --git a/e2e/solid-start/custom-basepath/express-server.ts b/e2e/solid-start/custom-basepath/express-server.ts index 1884c5eb5a..b9bf393466 100644 --- a/e2e/solid-start/custom-basepath/express-server.ts +++ b/e2e/solid-start/custom-basepath/express-server.ts @@ -1,5 +1,6 @@ import express from 'express' import { toNodeHandler } from 'srvx/node' +import type { AddressInfo } from 'node:net' import type { NodeHttp1Handler } from 'srvx' const DEVELOPMENT = process.env.NODE_ENV === 'development' @@ -40,7 +41,11 @@ if (DEVELOPMENT) { }) } -app.listen(PORT, (error) => { - if (error) throw error - console.log(`Server is running on http://localhost:${PORT}`) +const httpServer = app.listen(PORT, (error) => { + if (error) { + throw error + } + console.log( + `E2E app: http://localhost:${(httpServer.address() as AddressInfo).port}`, + ) }) diff --git a/e2e/solid-start/custom-basepath/package.json b/e2e/solid-start/custom-basepath/package.json index 0ce43d152d..ccd5861e04 100644 --- a/e2e/solid-start/custom-basepath/package.json +++ b/e2e/solid-start/custom-basepath/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "tsx express-server.ts", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-start/custom-basepath/playwright.config.ts b/e2e/solid-start/custom-basepath/playwright.config.ts index 9f14b88896..e113ce64ad 100644 --- a/e2e/solid-start/custom-basepath/playwright.config.ts +++ b/e2e/solid-start/custom-basepath/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}/custom/basepath` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, diff --git a/e2e/solid-start/deferred-hydration/playwright.config.ts b/e2e/solid-start/deferred-hydration/playwright.config.ts index ea9e73a856..4b7fbc6a9c 100644 --- a/e2e/solid-start/deferred-hydration/playwright.config.ts +++ b/e2e/solid-start/deferred-hydration/playwright.config.ts @@ -1,20 +1,13 @@ -import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' const distDir = process.env.E2E_DIST_DIR ?? `dist-${toolchain}-ssr` -const e2ePortKey = - process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` + const serverEntryFile = toolchain === 'rsbuild' ? 'index.js' : 'server.js' const startCommand = `pnpm exec srvx --prod --dir=. -s ${distDir}/client --entry ${distDir}/server/${serverEntryFile}` -if (process.env.TEST_WORKER_INDEX === undefined) { - fs.rmSync(`port-${e2ePortKey}.txt`, { force: true }) -} - -const PORT = await getTestServerPort(e2ePortKey) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -24,8 +17,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: startCommand, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { E2E_DIST_DIR: distDir, diff --git a/e2e/solid-start/query-integration/package.json b/e2e/solid-start/query-integration/package.json index 549d47f77e..336804c46e 100644 --- a/e2e/solid-start/query-integration/package.json +++ b/e2e/solid-start/query-integration/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-query": "^5.90.9", diff --git a/e2e/solid-start/query-integration/playwright.config.ts b/e2e/solid-start/query-integration/playwright.config.ts index 26bd8d37b2..1381ce6cde 100644 --- a/e2e/solid-start/query-integration/playwright.config.ts +++ b/e2e/solid-start/query-integration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` @@ -17,9 +16,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-start/scroll-restoration/package.json b/e2e/solid-start/scroll-restoration/package.json index 5cc24ac11a..461a26f77c 100644 --- a/e2e/solid-start/scroll-restoration/package.json +++ b/e2e/solid-start/scroll-restoration/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-start/scroll-restoration/playwright.config.ts b/e2e/solid-start/scroll-restoration/playwright.config.ts index 76044a35d4..1862174905 100644 --- a/e2e/solid-start/scroll-restoration/playwright.config.ts +++ b/e2e/solid-start/scroll-restoration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, diff --git a/e2e/solid-start/selective-ssr/dev-server.ts b/e2e/solid-start/selective-ssr/dev-server.ts index 519075f261..f1805a544b 100644 --- a/e2e/solid-start/selective-ssr/dev-server.ts +++ b/e2e/solid-start/selective-ssr/dev-server.ts @@ -1,5 +1,2 @@ -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } - -export const devPort = await getTestServerPort(`${packageJson.name}-dev`) +export const devPort = Number(process.env.E2E_DEV_PORT ?? 0) export const devBaseURL = `http://localhost:${devPort}` diff --git a/e2e/solid-start/selective-ssr/package.json b/e2e/solid-start/selective-ssr/package.json index 3b52d572e1..695f516172 100644 --- a/e2e/solid-start/selective-ssr/package.json +++ b/e2e/solid-start/selective-ssr/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-start/selective-ssr/playwright.config.ts b/e2e/solid-start/selective-ssr/playwright.config.ts index 09e5c50410..3da1e2eba4 100644 --- a/e2e/solid-start/selective-ssr/playwright.config.ts +++ b/e2e/solid-start/selective-ssr/playwright.config.ts @@ -1,9 +1,11 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } -import { devBaseURL, devPort } from './dev-server' +import { + appServerReady, + appServerReadyPattern, +} from '@tanstack/router-e2e-utils' +import { devPort } from './dev-server' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -22,14 +24,18 @@ export default defineConfig({ webServer: [ { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, { command: `NODE_ENV=development VITE_SERVER_PORT=${devPort} pnpm dev:e2e --host localhost --port ${devPort} --strictPort`, - url: devBaseURL, - reuseExistingServer: !process.env.CI, + wait: { + stdout: new RegExp( + appServerReadyPattern.source.replace('E2E_APP_PORT', 'E2E_DEV_PORT'), + ), + }, + reuseExistingServer: false, stdout: 'pipe', timeout: 90_000, }, diff --git a/e2e/solid-start/serialization-adapters/package.json b/e2e/solid-start/serialization-adapters/package.json index 8945c6ddab..8d950fb451 100644 --- a/e2e/solid-start/serialization-adapters/package.json +++ b/e2e/solid-start/serialization-adapters/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-start/serialization-adapters/playwright.config.ts b/e2e/solid-start/serialization-adapters/playwright.config.ts index badd6db0eb..630989e41f 100644 --- a/e2e/solid-start/serialization-adapters/playwright.config.ts +++ b/e2e/solid-start/serialization-adapters/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-start/server-functions/package.json b/e2e/solid-start/server-functions/package.json index 3ce529dda8..3667ccaf4b 100644 --- a/e2e/solid-start/server-functions/package.json +++ b/e2e/solid-start/server-functions/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-query": "^5.90.9", diff --git a/e2e/solid-start/server-functions/playwright.config.ts b/e2e/solid-start/server-functions/playwright.config.ts index cb1da03b94..48e14683f4 100644 --- a/e2e/solid-start/server-functions/playwright.config.ts +++ b/e2e/solid-start/server-functions/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -export const PORT = await getTestServerPort(packageJson.name) +export const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-start/server-routes/playwright.config.ts b/e2e/solid-start/server-routes/playwright.config.ts index cb1da03b94..48e14683f4 100644 --- a/e2e/solid-start/server-routes/playwright.config.ts +++ b/e2e/solid-start/server-routes/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -export const PORT = await getTestServerPort(packageJson.name) +export const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-start/solid-query-layout-suspense/package.json b/e2e/solid-start/solid-query-layout-suspense/package.json index 2dc7b98bff..67be48d92e 100644 --- a/e2e/solid-start/solid-query-layout-suspense/package.json +++ b/e2e/solid-start/solid-query-layout-suspense/package.json @@ -7,7 +7,7 @@ "dev:e2e": "vite dev --port $PORT", "build": "vite build && tsc --noEmit", "start": "node .output/server/index.mjs", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-query": "^5.90.9", diff --git a/e2e/solid-start/solid-query-layout-suspense/playwright.config.ts b/e2e/solid-start/solid-query-layout-suspense/playwright.config.ts index e7e18e60a7..9a8034c86c 100644 --- a/e2e/solid-start/solid-query-layout-suspense/playwright.config.ts +++ b/e2e/solid-start/solid-query-layout-suspense/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -11,9 +10,9 @@ export default defineConfig({ reporter: [['line']], use: { baseURL }, webServer: { - command: `PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm dev:e2e`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port 0`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, projects: [ diff --git a/e2e/solid-start/spa-mode/package.json b/e2e/solid-start/spa-mode/package.json index 8089ac1c64..614f19dba0 100644 --- a/e2e/solid-start/spa-mode/package.json +++ b/e2e/solid-start/spa-mode/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "npx serve dist/client", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-start/spa-mode/playwright.config.ts b/e2e/solid-start/spa-mode/playwright.config.ts index badd6db0eb..630989e41f 100644 --- a/e2e/solid-start/spa-mode/playwright.config.ts +++ b/e2e/solid-start/spa-mode/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-start/start-manifest/playwright.config.ts b/e2e/solid-start/start-manifest/playwright.config.ts index b9f835c16a..653e08253f 100644 --- a/e2e/solid-start/start-manifest/playwright.config.ts +++ b/e2e/solid-start/start-manifest/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -16,8 +15,8 @@ export default defineConfig({ webServer: { command: `pnpm build && PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/solid-start/virtual-routes/package.json b/e2e/solid-start/virtual-routes/package.json index 537d212ed0..1639f85394 100644 --- a/e2e/solid-start/virtual-routes/package.json +++ b/e2e/solid-start/virtual-routes/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-start/virtual-routes/playwright.config.ts b/e2e/solid-start/virtual-routes/playwright.config.ts index 76044a35d4..1862174905 100644 --- a/e2e/solid-start/virtual-routes/playwright.config.ts +++ b/e2e/solid-start/virtual-routes/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, diff --git a/e2e/solid-start/website/package.json b/e2e/solid-start/website/package.json index 4a75a19622..22b223318b 100644 --- a/e2e/solid-start/website/package.json +++ b/e2e/solid-start/website/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", diff --git a/e2e/solid-start/website/playwright.config.ts b/e2e/solid-start/website/playwright.config.ts index f6dd61ba6c..e6b92ce385 100644 --- a/e2e/solid-start/website/playwright.config.ts +++ b/e2e/solid-start/website/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/basepath-file-based/package.json b/e2e/vue-router/basepath-file-based/package.json index f39c09dda9..3af9176e83 100644 --- a/e2e/vue-router/basepath-file-based/package.json +++ b/e2e/vue-router/basepath-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basepath-file-based/playwright.config.ts b/e2e/vue-router/basepath-file-based/playwright.config.ts index be44f419e9..4eead86444 100644 --- a/e2e/vue-router/basepath-file-based/playwright.config.ts +++ b/e2e/vue-router/basepath-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-esbuild-file-based/package.json b/e2e/vue-router/basic-esbuild-file-based/package.json index 7eec606557..a51cf9149c 100644 --- a/e2e/vue-router/basic-esbuild-file-based/package.json +++ b/e2e/vue-router/basic-esbuild-file-based/package.json @@ -7,7 +7,7 @@ "build": "node src/esbuild.run.js build && vue-tsc --noEmit", "preview": "node src/esbuild.run.js preview", "start": "pnpm dev", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/router-plugin": "workspace:^", diff --git a/e2e/vue-router/basic-esbuild-file-based/playwright.config.ts b/e2e/vue-router/basic-esbuild-file-based/playwright.config.ts index 6976028d7a..9d9c8d49a3 100644 --- a/e2e/vue-router/basic-esbuild-file-based/playwright.config.ts +++ b/e2e/vue-router/basic-esbuild-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-esbuild-file-based/src/esbuild.run.js b/e2e/vue-router/basic-esbuild-file-based/src/esbuild.run.js index 19e882c1a9..0ab294f2bf 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/esbuild.run.js +++ b/e2e/vue-router/basic-esbuild-file-based/src/esbuild.run.js @@ -1,8 +1,7 @@ -import * as esbuild from 'esbuild' import http from 'node:http' -import { createReadStream } from 'node:fs' -import { promises as fs } from 'node:fs' +import { createReadStream, promises as fs } from 'node:fs' import path from 'node:path' +import * as esbuild from 'esbuild' import esbuildConfig from './esbuild.config.js' const args = process.argv.slice(2) @@ -18,7 +17,7 @@ function getPort() { const fromArg = getArgValue('--port') const fromEnv = process.env.VITE_SERVER_PORT const port = Number(fromArg ?? fromEnv ?? 5601) - if (!Number.isFinite(port) || port <= 0) { + if (!Number.isFinite(port) || port < 0) { throw new Error(`Invalid port: ${String(fromArg ?? fromEnv)}`) } return port @@ -138,7 +137,7 @@ function startStaticServer({ port }) { return new Promise((resolve) => { server.listen(port, () => { - console.log(`http://localhost:${port}`) + console.log(`E2E app: http://localhost:${server.address().port}`) resolve(server) }) }) diff --git a/e2e/vue-router/basic-file-based-jsx/package.json b/e2e/vue-router/basic-file-based-jsx/package.json index 0cdca0cd87..9ab7f21e82 100644 --- a/e2e/vue-router/basic-file-based-jsx/package.json +++ b/e2e/vue-router/basic-file-based-jsx/package.json @@ -8,7 +8,7 @@ "build": "vite build && vue-tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-file-based-jsx/playwright.config.ts b/e2e/vue-router/basic-file-based-jsx/playwright.config.ts index 6976028d7a..4eead86444 100644 --- a/e2e/vue-router/basic-file-based-jsx/playwright.config.ts +++ b/e2e/vue-router/basic-file-based-jsx/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-file-based-sfc/package.json b/e2e/vue-router/basic-file-based-sfc/package.json index c3e7d69bfa..e6ffa156f9 100644 --- a/e2e/vue-router/basic-file-based-sfc/package.json +++ b/e2e/vue-router/basic-file-based-sfc/package.json @@ -8,7 +8,7 @@ "build": "vite build && vue-tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-file-based-sfc/playwright.config.ts b/e2e/vue-router/basic-file-based-sfc/playwright.config.ts index 6976028d7a..4eead86444 100644 --- a/e2e/vue-router/basic-file-based-sfc/playwright.config.ts +++ b/e2e/vue-router/basic-file-based-sfc/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-scroll-restoration/package.json b/e2e/vue-router/basic-scroll-restoration/package.json index 965a59aa79..f4616a5651 100644 --- a/e2e/vue-router/basic-scroll-restoration/package.json +++ b/e2e/vue-router/basic-scroll-restoration/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-scroll-restoration/playwright.config.ts b/e2e/vue-router/basic-scroll-restoration/playwright.config.ts index 0c5cee43e4..6a684ac89e 100644 --- a/e2e/vue-router/basic-scroll-restoration/playwright.config.ts +++ b/e2e/vue-router/basic-scroll-restoration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-virtual-file-based/package.json b/e2e/vue-router/basic-virtual-file-based/package.json index 374ea348e2..3701c2254c 100644 --- a/e2e/vue-router/basic-virtual-file-based/package.json +++ b/e2e/vue-router/basic-virtual-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-virtual-file-based/playwright.config.ts b/e2e/vue-router/basic-virtual-file-based/playwright.config.ts index 6976028d7a..4eead86444 100644 --- a/e2e/vue-router/basic-virtual-file-based/playwright.config.ts +++ b/e2e/vue-router/basic-virtual-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/package.json b/e2e/vue-router/basic-virtual-named-export-config-file-based/package.json index 2e368cbd72..d3a69ed573 100644 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/package.json +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/vue-router/basic-virtual-named-export-config-file-based/playwright.config.ts index 6976028d7a..4eead86444 100644 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-vue-query-file-based/package.json b/e2e/vue-router/basic-vue-query-file-based/package.json index 9b2e3cca0d..3b4422d8d8 100644 --- a/e2e/vue-router/basic-vue-query-file-based/package.json +++ b/e2e/vue-router/basic-vue-query-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && vue-tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-vue-query-file-based/playwright.config.ts b/e2e/vue-router/basic-vue-query-file-based/playwright.config.ts index af35a4f8ba..fbda9bd451 100644 --- a/e2e/vue-router/basic-vue-query-file-based/playwright.config.ts +++ b/e2e/vue-router/basic-vue-query-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-vue-query-file-based/tsconfig.json b/e2e/vue-router/basic-vue-query-file-based/tsconfig.json index 123a2f4122..28889522fc 100644 --- a/e2e/vue-router/basic-vue-query-file-based/tsconfig.json +++ b/e2e/vue-router/basic-vue-query-file-based/tsconfig.json @@ -10,7 +10,7 @@ "skipLibCheck": true, "noEmit": true, "resolveJsonModule": true, - "types": ["vite/client"] + "types": ["vite/client", "node"] }, "include": ["src", "tests"], "exclude": ["node_modules", "dist"] diff --git a/e2e/vue-router/basic-vue-query/package.json b/e2e/vue-router/basic-vue-query/package.json index ba3f4295d5..68f1a8c9ea 100644 --- a/e2e/vue-router/basic-vue-query/package.json +++ b/e2e/vue-router/basic-vue-query/package.json @@ -8,7 +8,7 @@ "build": "vite build && vue-tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-vue-query/playwright.config.ts b/e2e/vue-router/basic-vue-query/playwright.config.ts index 6976028d7a..4eead86444 100644 --- a/e2e/vue-router/basic-vue-query/playwright.config.ts +++ b/e2e/vue-router/basic-vue-query/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic/package.json b/e2e/vue-router/basic/package.json index e1b7f0ae1a..1b57dae772 100644 --- a/e2e/vue-router/basic/package.json +++ b/e2e/vue-router/basic/package.json @@ -8,7 +8,7 @@ "build": "vite build && vue-tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic/playwright.config.ts b/e2e/vue-router/basic/playwright.config.ts index 6976028d7a..4eead86444 100644 --- a/e2e/vue-router/basic/playwright.config.ts +++ b/e2e/vue-router/basic/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic/tests/app.spec.ts b/e2e/vue-router/basic/tests/app.spec.ts index 5038f79098..9c0a6b6901 100644 --- a/e2e/vue-router/basic/tests/app.spec.ts +++ b/e2e/vue-router/basic/tests/app.spec.ts @@ -1,10 +1,7 @@ import { expect } from '@playwright/test' -import { apiTest as test, getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from '../package.json' with { type: 'json' } +import { apiTest as test } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort( - process.env.E2E_PORT_KEY ?? packageJson.name, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/generator-cli-only/package.json b/e2e/vue-router/generator-cli-only/package.json index 53e2cc1366..f9324643ac 100644 --- a/e2e/vue-router/generator-cli-only/package.json +++ b/e2e/vue-router/generator-cli-only/package.json @@ -8,7 +8,7 @@ "build": "tsr generate && vite build && tsc --noEmit", "preview": "vite preview", "start": "tsr generate && vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/generator-cli-only/playwright.config.ts b/e2e/vue-router/generator-cli-only/playwright.config.ts index be44f419e9..4eead86444 100644 --- a/e2e/vue-router/generator-cli-only/playwright.config.ts +++ b/e2e/vue-router/generator-cli-only/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/js-only-file-based/package.json b/e2e/vue-router/js-only-file-based/package.json index 0ac86a7a56..cda098978c 100644 --- a/e2e/vue-router/js-only-file-based/package.json +++ b/e2e/vue-router/js-only-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/js-only-file-based/playwright.config.ts b/e2e/vue-router/js-only-file-based/playwright.config.ts index ccf3853685..0925936d55 100644 --- a/e2e/vue-router/js-only-file-based/playwright.config.ts +++ b/e2e/vue-router/js-only-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/rspack-basic-file-based/package.json b/e2e/vue-router/rspack-basic-file-based/package.json index 449511d8fd..b420125e51 100644 --- a/e2e/vue-router/rspack-basic-file-based/package.json +++ b/e2e/vue-router/rspack-basic-file-based/package.json @@ -7,7 +7,7 @@ "build": "rsbuild build && tsc --noEmit", "preview": "rsbuild preview", "start": "rsbuild preview", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", diff --git a/e2e/vue-router/rspack-basic-file-based/playwright.config.ts b/e2e/vue-router/rspack-basic-file-based/playwright.config.ts index 025582e53e..4eead86444 100644 --- a/e2e/vue-router/rspack-basic-file-based/playwright.config.ts +++ b/e2e/vue-router/rspack-basic-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json index 944210cd10..f1259e5e7a 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json @@ -7,7 +7,7 @@ "build": "rsbuild build && tsc --noEmit", "preview": "rsbuild preview", "start": "rsbuild preview", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts index e66d2ff339..1c1d021f2f 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `PUBLIC_NODE_ENV="test" PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm start --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/package.json b/e2e/vue-router/scroll-restoration-sandbox-vite/package.json index f735fce364..58a099f74f 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/package.json +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/package.json @@ -11,7 +11,7 @@ "start": "vite", "test:e2e:browser": "VITE_APP_HISTORY=browser playwright test --config=playwright.browser.config.ts --project=chromium", "test:e2e:hash": "VITE_APP_HISTORY=hash playwright test --config=playwright.hash.config.ts --project=chromium", - "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:browser && pnpm run test:e2e:hash" + "test:e2e": "pnpm run test:e2e:browser && pnpm run test:e2e:hash" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts b/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts index 0617259e4f..e2681daea5 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts @@ -1,13 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { - getTestServerPort, - resolveRuntimeSuffix, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort( - packageJson.name + `-${resolveRuntimeSuffix('browser')}`, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -24,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `VITE_APP_HISTORY=browser pnpm build && VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts b/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts index 9fa1623c08..445616b9bd 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts @@ -1,13 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { - getTestServerPort, - resolveRuntimeSuffix, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort( - packageJson.name + `-${resolveRuntimeSuffix('hash')}`, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -24,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/sentry-integration/package.json b/e2e/vue-router/sentry-integration/package.json index 344a338a27..045ddd99be 100644 --- a/e2e/vue-router/sentry-integration/package.json +++ b/e2e/vue-router/sentry-integration/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@sentry/vue": "^10.32.0", diff --git a/e2e/vue-router/sentry-integration/playwright.config.ts b/e2e/vue-router/sentry-integration/playwright.config.ts index 0c5cee43e4..6a684ac89e 100644 --- a/e2e/vue-router/sentry-integration/playwright.config.ts +++ b/e2e/vue-router/sentry-integration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-router/view-transitions/package.json b/e2e/vue-router/view-transitions/package.json index 5466ded0ed..21a0f1d8a0 100644 --- a/e2e/vue-router/view-transitions/package.json +++ b/e2e/vue-router/view-transitions/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/view-transitions/playwright.config.ts b/e2e/vue-router/view-transitions/playwright.config.ts index e7e4795203..4eead86444 100644 --- a/e2e/vue-router/view-transitions/playwright.config.ts +++ b/e2e/vue-router/view-transitions/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,9 +18,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && pnpm preview --port ${PORT}`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-start/basic-auth/package.json b/e2e/vue-start/basic-auth/package.json index 0c22edfc4c..8f92b3563b 100644 --- a/e2e/vue-start/basic-auth/package.json +++ b/e2e/vue-start/basic-auth/package.json @@ -10,7 +10,7 @@ "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", "prisma-generate": "prisma generate", - "test:e2e": "rm -rf port*.txt; mkdir -p .tmp; rm -f .tmp/dev.db .tmp/dev.db-journal .tmp/dev.db-wal .tmp/dev.db-shm; export DATABASE_URL=file:./.tmp/dev.db; pnpm run prisma-generate && pnpm exec prisma migrate deploy && playwright test --project=chromium" + "test:e2e": "mkdir -p .tmp; rm -f .tmp/dev.db .tmp/dev.db-journal .tmp/dev.db-wal .tmp/dev.db-shm; export DATABASE_URL=file:./.tmp/dev.db; pnpm run prisma-generate && pnpm exec prisma migrate deploy && playwright test --project=chromium" }, "dependencies": { "@libsql/client": "^0.15.15", diff --git a/e2e/vue-start/basic-auth/playwright.config.ts b/e2e/vue-start/basic-auth/playwright.config.ts index 18b8905468..82678ac00b 100644 --- a/e2e/vue-start/basic-auth/playwright.config.ts +++ b/e2e/vue-start/basic-auth/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-start/basic-cloudflare/package.json b/e2e/vue-start/basic-cloudflare/package.json index 612a6b8d19..d14c2683a1 100644 --- a/e2e/vue-start/basic-cloudflare/package.json +++ b/e2e/vue-start/basic-cloudflare/package.json @@ -10,7 +10,7 @@ "preview": "vite preview", "cf-typegen": "wrangler types", "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", diff --git a/e2e/vue-start/basic-cloudflare/playwright.config.ts b/e2e/vue-start/basic-cloudflare/playwright.config.ts index 99b9f3460a..0925936d55 100644 --- a/e2e/vue-start/basic-cloudflare/playwright.config.ts +++ b/e2e/vue-start/basic-cloudflare/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `pnpm build && pnpm preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-start/basic-tsr-config/package.json b/e2e/vue-start/basic-tsr-config/package.json index 9884efa343..6f50cc6314 100644 --- a/e2e/vue-start/basic-tsr-config/package.json +++ b/e2e/vue-start/basic-tsr-config/package.json @@ -8,7 +8,7 @@ "dev:e2e": "vite dev", "build": "rimraf ./count.txt && vite build && tsc --noEmit", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", diff --git a/e2e/vue-start/basic-tsr-config/playwright.config.ts b/e2e/vue-start/basic-tsr-config/playwright.config.ts index f6dd61ba6c..e6b92ce385 100644 --- a/e2e/vue-start/basic-tsr-config/playwright.config.ts +++ b/e2e/vue-start/basic-tsr-config/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-start/basic-vue-query/package.json b/e2e/vue-start/basic-vue-query/package.json index 1003bd2e27..09e60b66f7 100644 --- a/e2e/vue-start/basic-vue-query/package.json +++ b/e2e/vue-start/basic-vue-query/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-query": "^5.92.1", diff --git a/e2e/vue-start/basic-vue-query/playwright.config.ts b/e2e/vue-start/basic-vue-query/playwright.config.ts index d31cc03c2e..0618b7272a 100644 --- a/e2e/vue-start/basic-vue-query/playwright.config.ts +++ b/e2e/vue-start/basic-vue-query/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` @@ -17,9 +16,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, diff --git a/e2e/vue-start/basic-vue-query/src/utils/users.tsx b/e2e/vue-start/basic-vue-query/src/utils/users.tsx index 29bf08c315..fe7a902fa2 100644 --- a/e2e/vue-start/basic-vue-query/src/utils/users.tsx +++ b/e2e/vue-start/basic-vue-query/src/utils/users.tsx @@ -1,4 +1,6 @@ import { queryOptions } from '@tanstack/vue-query' +import { createIsomorphicFn } from '@tanstack/vue-start' +import { getRequestUrl } from '@tanstack/vue-start/server' import axios from 'redaxios' export type User = { @@ -7,17 +9,16 @@ export type User = { email: string } -const PORT = - import.meta.env.VITE_SERVER_PORT || process.env.VITE_SERVER_PORT || 3000 - -export const DEPLOY_URL = `http://localhost:${PORT}` +const getOrigin = createIsomorphicFn() + .server(() => getRequestUrl().origin) + .client(() => window.location.origin) export const usersQueryOptions = () => queryOptions({ queryKey: ['users'], queryFn: () => axios - .get>(DEPLOY_URL + '/api/users') + .get>(getOrigin() + '/api/users') .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch users') @@ -29,7 +30,7 @@ export const userQueryOptions = (id: string) => queryKey: ['users', id], queryFn: () => axios - .get(DEPLOY_URL + '/api/users/' + id) + .get(getOrigin() + '/api/users/' + id) .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch user') diff --git a/e2e/vue-start/basic/playwright.config.ts b/e2e/vue-start/basic/playwright.config.ts index 165bd03ce1..9322874f3a 100644 --- a/e2e/vue-start/basic/playwright.config.ts +++ b/e2e/vue-start/basic/playwright.config.ts @@ -1,23 +1,11 @@ -import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const mode = process.env.MODE ?? 'ssr' -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}_start.txt`, - ]) { - fs.rmSync(portFile, { force: true }) - } -} - -const PORT = await getTestServerPort(e2ePortKey) -const START_PORT = await getTestServerPort(`${e2ePortKey}_start`) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` const commandByMode = mode === 'preview' @@ -35,18 +23,15 @@ export default defineConfig({ webServer: { command: commandByMode, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, MODE: mode, - VITE_NODE_ENV: 'test', - VITE_SERVER_PORT: String(PORT), - START_PORT: String(START_PORT), + START_PORT: '0', PORT: String(PORT), E2E_DIST_DIR: distDir, - E2E_PORT_KEY: e2ePortKey, }, }, diff --git a/e2e/vue-start/basic/server.js b/e2e/vue-start/basic/server.js index 69c1e4ca91..3e1ddab400 100644 --- a/e2e/vue-start/basic/server.js +++ b/e2e/vue-start/basic/server.js @@ -1,12 +1,12 @@ -import { toNodeHandler } from 'srvx/node' import fs from 'node:fs' import path from 'node:path' +import { toNodeHandler } from 'srvx/node' import express from 'express' import { createProxyMiddleware } from 'http-proxy-middleware' -const port = process.env.PORT || 3000 +const port = Number(process.env.PORT ?? 3000) -const startPort = process.env.START_PORT || 3001 +const startPort = Number(process.env.START_PORT ?? 0) const isSpaMode = process.env.MODE === 'spa' const isPrerender = process.env.MODE === 'prerender' @@ -49,13 +49,13 @@ export async function createStartServer() { return { app } } -export async function createSpaServer() { +export async function createSpaServer(backendPort) { const app = express() app.use( '/api', createProxyMiddleware({ - target: `http://localhost:${startPort}/api`, // Replace with your target server's URL + target: `http://localhost:${backendPort}/api`, // Replace with your target server's URL changeOrigin: false, // Needed for virtual hosted sites, }), ) @@ -63,7 +63,7 @@ export async function createSpaServer() { app.use( '/_serverFn', createProxyMiddleware({ - target: `http://localhost:${startPort}/_serverFn`, // Replace with your target server's URL + target: `http://localhost:${backendPort}/_serverFn`, // Replace with your target server's URL changeOrigin: false, // Needed for virtual hosted sites, }), ) @@ -71,31 +71,28 @@ export async function createSpaServer() { app.use(express.static(distClientDir)) app.get('/{*splat}', (req, res) => { - res.sendFile(path.resolve(distClientDir, 'index.html')) + res.sendFile('index.html', { root: distClientDir }) }) return { app } } -if (isSpaMode) { - createSpaServer().then(async ({ app }) => - app.listen(port, (error) => { - if (error) throw error - console.info(`Client Server: http://localhost:${port}`) - }), - ) - - createStartServer().then(async ({ app }) => - app.listen(startPort, (error) => { - if (error) throw error - console.info(`Start Server: http://localhost:${startPort}`) - }), - ) -} else { - createStartServer().then(async ({ app }) => - app.listen(port, (error) => { - if (error) throw error - console.info(`Start Server: http://localhost:${port}`) - }), - ) -} +// Bind the backend first so the SPA proxy receives the port actually held by it. +const { app: startApp } = await createStartServer() +const backend = startApp.listen(isSpaMode ? startPort : port, async (error) => { + if (error) { + throw error + } + const backendPort = backend.address().port + if (isSpaMode) { + const { app } = await createSpaServer(backendPort) + const frontend = app.listen(port, (frontendError) => { + if (frontendError) { + throw frontendError + } + console.info(`E2E app: http://localhost:${frontend.address().port}`) + }) + } else { + console.info(`E2E app: http://localhost:${backendPort}`) + } +}) diff --git a/e2e/vue-start/basic/tests/redirect.spec.ts b/e2e/vue-start/basic/tests/redirect.spec.ts index c78124abe8..8e6ceba5b9 100644 --- a/e2e/vue-start/basic/tests/redirect.spec.ts +++ b/e2e/vue-start/basic/tests/redirect.spec.ts @@ -1,16 +1,13 @@ import queryString from 'node:querystring' import { expect } from '@playwright/test' -import { getTestServerPort, test } from '@tanstack/router-e2e-utils' +import { test } from '@tanstack/router-e2e-utils' import combinateImport from 'combinate' import type { Page } from '@playwright/test' -import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = await getTestServerPort( - process.env.E2E_PORT_KEY ?? packageJson.name, -) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` const POSTS_URL = `http://localhost:${PORT}/posts` diff --git a/e2e/vue-start/basic/tests/utils/getE2EPortKey.ts b/e2e/vue-start/basic/tests/utils/getE2EPortKey.ts deleted file mode 100644 index 48be6a9027..0000000000 --- a/e2e/vue-start/basic/tests/utils/getE2EPortKey.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { getPackageName } from './getPackageName.ts' - -export function getE2EPortKey() { - return process.env.E2E_PORT_KEY ?? getPackageName() -} diff --git a/e2e/vue-start/css-modules/package.json b/e2e/vue-start/css-modules/package.json index c739f09ea0..507264b72d 100644 --- a/e2e/vue-start/css-modules/package.json +++ b/e2e/vue-start/css-modules/package.json @@ -11,7 +11,7 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js", "test:e2e:dev": "MODE=dev playwright test --project=chromium", "test:e2e:prod": "playwright test --project=chromium", - "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:dev" + "test:e2e": "pnpm run test:e2e:dev" }, "dependencies": { "@tanstack/vue-router": "workspace:*", diff --git a/e2e/vue-start/css-modules/playwright.config.ts b/e2e/vue-start/css-modules/playwright.config.ts index fd9ace2034..a50ac5ae63 100644 --- a/e2e/vue-start/css-modules/playwright.config.ts +++ b/e2e/vue-start/css-modules/playwright.config.ts @@ -1,10 +1,9 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -12,14 +11,18 @@ export default defineConfig({ workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + use: { baseURL, }, webServer: { - command: isDev ? `pnpm dev:e2e` : `pnpm build && PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: isDev + ? `pnpm dev:e2e --port 0` + : `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', diff --git a/e2e/vue-start/css-modules/tests/setup/global.setup.ts b/e2e/vue-start/css-modules/tests/setup/global.setup.ts new file mode 100644 index 0000000000..17be637f77 --- /dev/null +++ b/e2e/vue-start/css-modules/tests/setup/global.setup.ts @@ -0,0 +1,39 @@ +import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' + +export default async function setup() { + if (process.env.MODE !== 'dev') return + + const port = Number(process.env.E2E_APP_PORT ?? 0) + const baseURL = `http://localhost:${port}` + + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'global-styled', + warmup: async (page) => { + await page.goto(`${baseURL}/modules`, { waitUntil: 'domcontentloaded' }) + await page.getByTestId('module-card').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.goto(`${baseURL}/sass-mixin`, { + waitUntil: 'domcontentloaded', + }) + await page.getByTestId('mixin-styled').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.goto(`${baseURL}/`, { waitUntil: 'domcontentloaded' }) + await page.getByTestId('global-styled').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.getByTestId('nav-modules').click() + await page.waitForURL('**/modules') + await page.getByTestId('module-card').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + + await page.getByTestId('nav-home').click() + await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) + await page.getByTestId('global-styled').waitFor({ state: 'visible' }) + await page.waitForLoadState('networkidle') + }, + }) +} diff --git a/e2e/vue-start/custom-basepath/express-server.ts b/e2e/vue-start/custom-basepath/express-server.ts index 1884c5eb5a..b9bf393466 100644 --- a/e2e/vue-start/custom-basepath/express-server.ts +++ b/e2e/vue-start/custom-basepath/express-server.ts @@ -1,5 +1,6 @@ import express from 'express' import { toNodeHandler } from 'srvx/node' +import type { AddressInfo } from 'node:net' import type { NodeHttp1Handler } from 'srvx' const DEVELOPMENT = process.env.NODE_ENV === 'development' @@ -40,7 +41,11 @@ if (DEVELOPMENT) { }) } -app.listen(PORT, (error) => { - if (error) throw error - console.log(`Server is running on http://localhost:${PORT}`) +const httpServer = app.listen(PORT, (error) => { + if (error) { + throw error + } + console.log( + `E2E app: http://localhost:${(httpServer.address() as AddressInfo).port}`, + ) }) diff --git a/e2e/vue-start/custom-basepath/package.json b/e2e/vue-start/custom-basepath/package.json index afc7d13c25..5b8b98a8ce 100644 --- a/e2e/vue-start/custom-basepath/package.json +++ b/e2e/vue-start/custom-basepath/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "tsx express-server.ts", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", diff --git a/e2e/vue-start/custom-basepath/playwright.config.ts b/e2e/vue-start/custom-basepath/playwright.config.ts index 9f14b88896..e113ce64ad 100644 --- a/e2e/vue-start/custom-basepath/playwright.config.ts +++ b/e2e/vue-start/custom-basepath/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}/custom/basepath` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, diff --git a/e2e/vue-start/query-integration/package.json b/e2e/vue-start/query-integration/package.json index a3b775e0eb..617ce4f430 100644 --- a/e2e/vue-start/query-integration/package.json +++ b/e2e/vue-start/query-integration/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-query": "^5.90.0", diff --git a/e2e/vue-start/query-integration/playwright.config.ts b/e2e/vue-start/query-integration/playwright.config.ts index 4d86a1dbe7..82678ac00b 100644 --- a/e2e/vue-start/query-integration/playwright.config.ts +++ b/e2e/vue-start/query-integration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { derivePort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await derivePort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-start/scroll-restoration/package.json b/e2e/vue-start/scroll-restoration/package.json index 21a4fbff8d..7024b2827e 100644 --- a/e2e/vue-start/scroll-restoration/package.json +++ b/e2e/vue-start/scroll-restoration/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", diff --git a/e2e/vue-start/scroll-restoration/playwright.config.ts b/e2e/vue-start/scroll-restoration/playwright.config.ts index 76044a35d4..1862174905 100644 --- a/e2e/vue-start/scroll-restoration/playwright.config.ts +++ b/e2e/vue-start/scroll-restoration/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, diff --git a/e2e/vue-start/selective-ssr/package.json b/e2e/vue-start/selective-ssr/package.json index 7ffcaae743..1da6f8de30 100644 --- a/e2e/vue-start/selective-ssr/package.json +++ b/e2e/vue-start/selective-ssr/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", diff --git a/e2e/vue-start/selective-ssr/playwright.config.ts b/e2e/vue-start/selective-ssr/playwright.config.ts index badd6db0eb..630989e41f 100644 --- a/e2e/vue-start/selective-ssr/playwright.config.ts +++ b/e2e/vue-start/selective-ssr/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-start/serialization-adapters/package.json b/e2e/vue-start/serialization-adapters/package.json index c5b80bdced..5434dd0e78 100644 --- a/e2e/vue-start/serialization-adapters/package.json +++ b/e2e/vue-start/serialization-adapters/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", diff --git a/e2e/vue-start/serialization-adapters/playwright.config.ts b/e2e/vue-start/serialization-adapters/playwright.config.ts index badd6db0eb..630989e41f 100644 --- a/e2e/vue-start/serialization-adapters/playwright.config.ts +++ b/e2e/vue-start/serialization-adapters/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-start/server-functions/package.json b/e2e/vue-start/server-functions/package.json index 3bf9ba33a8..deffebabd7 100644 --- a/e2e/vue-start/server-functions/package.json +++ b/e2e/vue-start/server-functions/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-query": "^5.90.9", diff --git a/e2e/vue-start/server-functions/playwright.config.ts b/e2e/vue-start/server-functions/playwright.config.ts index cb1da03b94..48e14683f4 100644 --- a/e2e/vue-start/server-functions/playwright.config.ts +++ b/e2e/vue-start/server-functions/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -export const PORT = await getTestServerPort(packageJson.name) +export const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-start/server-routes/playwright.config.ts b/e2e/vue-start/server-routes/playwright.config.ts index cb1da03b94..48e14683f4 100644 --- a/e2e/vue-start/server-routes/playwright.config.ts +++ b/e2e/vue-start/server-routes/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -export const PORT = await getTestServerPort(packageJson.name) +export const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-start/spa-mode/package.json b/e2e/vue-start/spa-mode/package.json index b33ed9c859..c4270cfccd 100644 --- a/e2e/vue-start/spa-mode/package.json +++ b/e2e/vue-start/spa-mode/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "npx serve dist/client", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", diff --git a/e2e/vue-start/spa-mode/playwright.config.ts b/e2e/vue-start/spa-mode/playwright.config.ts index badd6db0eb..630989e41f 100644 --- a/e2e/vue-start/spa-mode/playwright.config.ts +++ b/e2e/vue-start/spa-mode/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -20,8 +19,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-start/start-manifest/playwright.config.ts b/e2e/vue-start/start-manifest/playwright.config.ts index b9f835c16a..653e08253f 100644 --- a/e2e/vue-start/start-manifest/playwright.config.ts +++ b/e2e/vue-start/start-manifest/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -16,8 +15,8 @@ export default defineConfig({ webServer: { command: `pnpm build && PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/e2e/vue-start/virtual-routes/package.json b/e2e/vue-start/virtual-routes/package.json index 3697e87e52..19cd20ff42 100644 --- a/e2e/vue-start/virtual-routes/package.json +++ b/e2e/vue-start/virtual-routes/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/virtual-file-routes": "workspace:^", diff --git a/e2e/vue-start/virtual-routes/playwright.config.ts b/e2e/vue-start/virtual-routes/playwright.config.ts index 76044a35d4..1862174905 100644 --- a/e2e/vue-start/virtual-routes/playwright.config.ts +++ b/e2e/vue-start/virtual-routes/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -20,9 +19,9 @@ export default defineConfig({ }, webServer: { - command: `VITE_NODE_ENV="test" pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + command: `pnpm build && PORT=${PORT} pnpm start`, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', env: { NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, diff --git a/e2e/vue-start/website/package.json b/e2e/vue-start/website/package.json index 5e92c93769..ccb03ae8f0 100644 --- a/e2e/vue-start/website/package.json +++ b/e2e/vue-start/website/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", diff --git a/e2e/vue-start/website/playwright.config.ts b/e2e/vue-start/website/playwright.config.ts index f6dd61ba6c..e6b92ce385 100644 --- a/e2e/vue-start/website/playwright.config.ts +++ b/e2e/vue-start/website/playwright.config.ts @@ -1,8 +1,7 @@ import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const PORT = await getTestServerPort(packageJson.name) +const PORT = Number(process.env.E2E_APP_PORT ?? 0) const baseURL = `http://localhost:${PORT}` /** @@ -21,8 +20,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - url: baseURL, - reuseExistingServer: !process.env.CI, + wait: appServerReady, + reuseExistingServer: false, stdout: 'pipe', }, diff --git a/nx.json b/nx.json index 26bc04d6ee..00c528aa46 100644 --- a/nx.json +++ b/nx.json @@ -63,11 +63,7 @@ "cache": true, "dependsOn": ["^build", "test:e2e--*"], "inputs": ["default", "^production", "dependentTaskOutputs"], - "outputs": [ - "{projectRoot}/dist", - "{projectRoot}/port-*.txt", - "{projectRoot}/test-results" - ], + "outputs": ["{projectRoot}/dist", "{projectRoot}/test-results"], "parallelism": false }, "test:e2e:nitro": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 65aed76f9d..8272a3d5a4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -576,9 +576,6 @@ importers: '@msw/playwright': specifier: 0.6.7 version: 0.6.7(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2)) - get-port-please: - specifier: ^3.2.0 - version: 3.2.0 msw: specifier: 2.15.0 version: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) diff --git a/scripts/nx/playwright-plugin.md b/scripts/nx/playwright-plugin.md index 668210cf99..665e58be4d 100644 --- a/scripts/nx/playwright-plugin.md +++ b/scripts/nx/playwright-plugin.md @@ -45,7 +45,7 @@ Supported toolchains: For each `{ toolchain, mode }` entry, the plugin generates: -- `build:e2e---` +- `build::` - `test:e2e---` If `shards > 1`, it also generates: @@ -59,7 +59,7 @@ Finally, it generates: ## 3. Environment variables injected by inferred targets -Each inferred `build:e2e:*` and `test:e2e:*` target sets: +Each inferred `build::` and `test:e2e---` target sets: - `MODE=` - `TOOLCHAIN=` @@ -67,25 +67,23 @@ Each inferred `build:e2e:*` and `test:e2e:*` target sets: - `E2E_DIST=dist--` - `E2E_DIST_DIR=dist--` -Each inferred `test:e2e:*` target also sets: - -- `E2E_PORT_KEY=--` -- For shard targets: `E2E_PORT_KEY=---shard--of-` - ## 4. Build behavior and webServer command -Each inferred e2e target depends on the inferred `build:e2e---` -target, which runs: +Each inferred e2e target depends on the inferred `build::` +target. It runs `vite build && tsc --noEmit` or +`rsbuild build && tsc --noEmit`, selecting the toolchain explicitly. Ordinary +package build scripts do not need to know about E2E mocking. -```sh -vite build && tsc --noEmit -``` - -with the mode/toolchain env above. - -This command is intentionally fixed (it does not call `pnpm build`). This avoids -accidentally selecting the wrong build path in projects that include multiple -toolchains. +The React, Solid, and Vue basic examples preload the same MSW handlers in +Nx prerender builds (through mode metadata) and Playwright application servers +with Node's native option: +`NODE_OPTIONS='--import=@tanstack/router-e2e-utils/mock-api'`. +The handlers return canned posts and users at `https://jsonplaceholder.typicode.com` inside +each Node process, including prerendering. No API listener or fixture port is +needed. Playwright starts only the application server. A cached build uses the +same URL when started by a fresh process with the preload enabled. Ordinary +`pnpm dev`, builds, and standalone servers use the public API without MSW. +Application code uses the public URL in both cases; test setup enables mocking. The inferred build target uses standard production inputs and explicit mode- specific outputs (`dist--`). Mode env values are passed through @@ -99,7 +97,7 @@ Good: ```ts webServer: { command: `PORT=${PORT} pnpm start`, - url: baseURL, + wait: appServerReady, } ``` @@ -110,7 +108,7 @@ const distDir = process.env.E2E_DIST_DIR ?? 'dist' webServer: { command: `pnpm preview --outDir ${distDir} --port ${PORT}`, - url: baseURL, + wait: appServerReady, } ``` @@ -119,61 +117,50 @@ Avoid: ```ts webServer: { command: `MODE=spa pnpm build && PORT=${PORT} pnpm start`, - url: baseURL, + wait: appServerReady, } ``` -## 5. Use `E2E_PORT_KEY` for all server ports +## 5. Let each server bind its own port -If your setup uses `getTestServerPort`, use -`process.env.E2E_PORT_KEY` first. +Use port `0` in server commands. The OS chooses a free port while binding the +listening socket. Do not reserve ports, write port files, or restore ports from +Nx outputs. + +Playwright's `webServer.wait` captures the address printed after listening. +It exports named capture groups to subsequent servers and test workers. The +shared `appServerReady` pattern captures `E2E_APP_PORT`; configs read that value +when reloaded in workers to configure `use.baseURL`. ```ts -import { getTestServerPort } from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } +import { appServerReady } from '@tanstack/router-e2e-utils' -const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name -const PORT = await getTestServerPort(e2ePortKey) +const baseURL = `http://localhost:${process.env.E2E_APP_PORT ?? 0}` + +// Inside defineConfig: +use: { baseURL }, +webServer: { + command: 'pnpm preview --port 0', + wait: appServerReady, + reuseExistingServer: false, +}, ``` -Dummy server setup/teardown should use the same key: +Canned posts/users requests use `https://jsonplaceholder.typicode.com`. Node builds and +servers preload `@tanstack/router-e2e-utils/mock-api` through `NODE_OPTIONS`. +Browser API suites import `apiTest as test` from the E2E utilities. That fixture +uses the official MSW Playwright adapter with the same handlers. Opt in only +where the API is needed: Playwright routing disables the browser HTTP cache. -```ts +External-navigation tests use another hostname on the existing app listener, +with a static HTML asset when the test needs a distinct destination document. +No API server, fixture-port environment variable, or build launcher is needed. -``` +Custom servers must print their actual `server.address().port`, not the +requested port. SPA servers bind their backend first and use its actual port +for proxying. Playwright owns server shutdown. -## 6. Clean stale port files once per Playwright run - -If the project allocates ports through `@tanstack/router-e2e-utils`, clean stale -`port-*.txt` files before resolving the port. - -Important: do this only in the main Playwright config load. Playwright loads the -config more than once, and unconditional cleanup can remap the port after the -web server has already started. - -```ts -import fs from 'node:fs' -import packageJson from './package.json' with { type: 'json' } - -const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name - -if (process.env.TEST_WORKER_INDEX === undefined) { - for (const portFile of [ - `port-${e2ePortKey}.txt`, - `port-${e2ePortKey}_start.txt`, - `port-${e2ePortKey}-external.txt`, - ]) { - fs.rmSync(portFile, { force: true }) - } -} -``` - -Include the `*_start` file only if your test setup allocates a separate -`START_PORT` key. - -Avoid broad cleanup such as `rm -rf port*.txt` in shared shard runs. - -## 7. Run inferred targets +## 6. Run inferred targets Examples: @@ -199,21 +186,3 @@ If `playwrightModes` is not configured, the plugin still supports: This generates legacy shard targets under `test:e2e--shard-...` plus a parent `test:e2e` target. - -## Mock API and standalone development - -Applications use `https://jsonplaceholder.typicode.com` directly. Ordinary dev, -build, and start commands reach the public API. E2E browser suites opt into -`apiTest` from the private E2E utilities, which installs the shared MSW handlers -through the official Playwright adapter. Routing disables the browser HTTP cache; -suites without API requests keep the ordinary Playwright fixture. - -Start application servers preload `@tanstack/router-e2e-utils/mock-api` through -Playwright's `webServer.env.NODE_OPTIONS`. Prerender modes set the same Node -preload in their Nx mode metadata, so cached builds and fresh servers use the -same URL without an API listener or fixture port. Other origins pass through; -unmatched requests to the API origin fail through a final MSW handler. - -External navigation uses `localhost` and `127.0.0.1` on the same application -listener, with a static destination document where needed. The application port -allocator is independent of API mocking and is removed in the next stack PR. diff --git a/scripts/nx/playwright-plugin.ts b/scripts/nx/playwright-plugin.ts index cf1219571d..ce80933064 100644 --- a/scripts/nx/playwright-plugin.ts +++ b/scripts/nx/playwright-plugin.ts @@ -69,7 +69,6 @@ function createNodesInternal( const { targets, targetGroupEntries } = buildShardedTargets( root, - packageName, projectConfiguration.nx.metadata.playwrightShards, ) // Project configuration to be merged into the rest of the Nx configuration @@ -130,11 +129,10 @@ function captureCommandOutput(command: string, outputFile?: string): string { function getTestOutputs( modeKey: string, - portKey: string, + taskKey: string, ): TargetConfiguration['outputs'] { return [ - `{projectRoot}/port-${portKey}*.txt`, - `{projectRoot}/test-results/${portKey}`, + `{projectRoot}/test-results/${taskKey}`, `{projectRoot}/violations.${modeKey}.*.json`, ] } @@ -263,7 +261,7 @@ function buildModeTargets( const shardCount = modeMetadata.shards ?? 1 const distDir = `dist-${modeMetadata.toolchain}-${modeMetadata.mode}${variantPathSuffix}` const modeKey = `${modeMetadata.toolchain}-${modeMetadata.mode}${variantPathSuffix}` - const modeEnv = { + const modeEnv: Record = { ...modeMetadata.env, MODE: modeMetadata.mode, TOOLCHAIN: modeMetadata.toolchain, @@ -273,7 +271,7 @@ function buildModeTargets( E2E_DIST_DIR: distDir, } const buildLog = modeEnv.E2E_BUILD_LOG - const modePortKey = `${packageName}-${modeKey}-e2e` + const modeTaskKey = `${packageName}-${modeKey}-e2e` const modeDescription = `${modeMetadata.toolchain}/${modeMetadata.mode}${modeMetadata.name ? `/${modeMetadata.name}` : ''}` const modeShardTargets: Array = [] @@ -306,17 +304,14 @@ function buildModeTargets( targets[modeTargetName] = { executor: 'nx:run-commands', options: { - command: `playwright test --project=chromium --output=test-results/${modePortKey}`, + command: `playwright test --project=chromium --output=test-results/${modeTaskKey}`, cwd: projectRoot, - env: { - ...modeEnv, - E2E_PORT_KEY: modePortKey, - }, + env: modeEnv, }, parallelism: false, cache: true, inputs: TEST_INPUTS, - outputs: getTestOutputs(modeKey, modePortKey), + outputs: getTestOutputs(modeKey, modeTaskKey), dependsOn: [buildTargetName], metadata: { technologies: ['playwright'], @@ -327,22 +322,19 @@ function buildModeTargets( } else { for (let shardIndex = 1; shardIndex <= shardCount; shardIndex++) { const shardTargetName = `${modeTargetName}${MODE_TARGET_SEPARATOR}shard-${shardIndex}-of-${shardCount}` - const shardPortKey = `${modePortKey}-shard-${shardIndex}-of-${shardCount}` + const shardTaskKey = `${modeTaskKey}-shard-${shardIndex}-of-${shardCount}` targets[shardTargetName] = { executor: 'nx:run-commands', options: { - command: `playwright test --project=chromium --shard=${shardIndex}/${shardCount} --output=test-results/${shardPortKey}`, + command: `playwright test --project=chromium --shard=${shardIndex}/${shardCount} --output=test-results/${shardTaskKey}`, cwd: projectRoot, - env: { - ...modeEnv, - E2E_PORT_KEY: shardPortKey, - }, + env: modeEnv, }, parallelism: false, cache: true, inputs: TEST_INPUTS, - outputs: getTestOutputs(modeKey, shardPortKey), + outputs: getTestOutputs(modeKey, shardTaskKey), dependsOn: [buildTargetName], metadata: { technologies: ['playwright'], @@ -403,7 +395,6 @@ function buildModeTargets( function buildShardedTargets( projectRoot: string, - packageName: string, shardCount: number, ): { targets: Record @@ -415,16 +406,12 @@ function buildShardedTargets( // Create individual shard targets for (let shardIndex = 1; shardIndex <= shardCount; shardIndex++) { const shardTargetName = `${CI_TARGET_NAME}--shard-${shardIndex}-of-${shardCount}` - const e2ePortKey = `${packageName}-shard-${shardIndex}-of-${shardCount}` targets[shardTargetName] = { executor: 'nx:run-commands', options: { command: `playwright test --project=chromium --shard=${shardIndex}/${shardCount}`, cwd: projectRoot, - env: { - E2E_PORT_KEY: e2ePortKey, - }, }, parallelism: false, cache: true, From 5facdbfe3decefa39d5ea3f668060f380a5bd0de Mon Sep 17 00:00:00 2001 From: Flo Date: Mon, 14 Sep 2026 10:54:23 +0200 Subject: [PATCH 031/175] test: fix Nx sandbox violations in CI tasks (#8400) * test: declare remaining Nx sandbox inputs and outputs * test: declare the ESLint Start build configuration input * test: match generated route fixtures in Nx outputs * ci: apply automated fixes * test: keep mutable fixtures out of Nx cache replay * test: declare inputs found in the latest Nx sandbox audit --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- .nx/workflows/sandboxing-config.yaml | 115 ++++++++++++++++++ .../client-nav/link-performance/project.json | 23 +++- e2e/react-router/i18n-paraglide/package.json | 18 +++ .../package.json | 10 ++ .../tsconfig.json | 2 +- e2e/react-start/basic-cloudflare/package.json | 10 ++ e2e/react-start/css-inline/package.json | 42 ++++++- .../deferred-hydration/package.json | 6 + e2e/react-start/early-hints/package.json | 10 ++ e2e/react-start/i18n-paraglide/package.json | 18 +++ .../rsc-deferred-hydration/package.json | 8 ++ e2e/react-start/start-manifest/package.json | 6 +- .../package.json | 10 ++ .../tsconfig.json | 2 +- e2e/solid-start/basic-auth/package.json | 11 ++ e2e/solid-start/basic-cloudflare/package.json | 10 ++ .../deferred-hydration/package.json | 6 + .../package.json | 10 ++ .../tsconfig.json | 2 +- e2e/vue-start/basic-auth/package.json | 11 ++ e2e/vue-start/basic-cloudflare/package.json | 10 ++ examples/react/i18n-paraglide/package.json | 11 ++ .../packages/app/package.json | 6 + .../packages/app/tsconfig.json | 3 +- .../packages/app/package.json | 6 + .../packages/app/tsconfig.json | 3 +- .../packages/app/package.json | 6 + .../packages/app/tsconfig.json | 3 +- .../react/start-i18n-paraglide/package.json | 11 ++ .../react/start-next-migration/package.json | 11 ++ .../react/start-supabase-basic/.gitignore | 5 +- examples/solid/i18n-paraglide/package.json | 11 ++ .../solid/start-i18n-paraglide/package.json | 11 ++ nx.json | 6 +- packages/eslint-plugin-router/package.json | 10 ++ packages/eslint-plugin-start/package.json | 10 ++ packages/router-generator/package.json | 11 ++ 37 files changed, 451 insertions(+), 13 deletions(-) diff --git a/.nx/workflows/sandboxing-config.yaml b/.nx/workflows/sandboxing-config.yaml index 4fa2634bc3..c6f527f6b2 100644 --- a/.nx/workflows/sandboxing-config.yaml +++ b/.nx/workflows/sandboxing-config.yaml @@ -7,3 +7,118 @@ task-exclusions: - target: test:build exclude-reads: - LICENSE + # HMR tests edit these inputs in place and restore their original contents. + # Keep them out of cached outputs so cache replay never overwrites source. + - project: tanstack-react-start-e2e-deferred-hydration + target: test:e2e + exclude-writes: + - e2e/react-start/deferred-hydration/src/routes/components.tsx + - project: tanstack-react-start-e2e-hmr + target: test:e2e + exclude-writes: &hmr-source-writes + - e2e/react-start/hmr/src/components/AliasedRouteImportChildPanel.tsx + - e2e/react-start/hmr/src/components/AliasedRouteImportParentPanel.tsx + - e2e/react-start/hmr/src/hmr/server-fn-hmr-factory.ts + - e2e/react-start/hmr/src/routes/__root.tsx + - e2e/react-start/hmr/src/routes/child.tsx + - e2e/react-start/hmr/src/routes/component-hmr-inline-error-split.tsx + - e2e/react-start/hmr/src/routes/component-hmr-inline-nosplit.tsx + - e2e/react-start/hmr/src/routes/component-hmr-inline-split.tsx + - e2e/react-start/hmr/src/routes/component-hmr-lowercase-named-split.tsx + - e2e/react-start/hmr/src/routes/component-hmr-named-error-split.tsx + - e2e/react-start/hmr/src/routes/component-hmr-named-nosplit.tsx + - e2e/react-start/hmr/src/routes/component-hmr-named-split.tsx + - e2e/react-start/hmr/src/routes/index.tsx + - e2e/react-start/hmr/src/routes/inputs.tsx + - project: tanstack-react-start-e2e-hmr + target: test:e2e--vite-ssr + exclude-writes: *hmr-source-writes + - project: tanstack-react-start-e2e-hmr + target: test:e2e--vite-ssr--bundled-dev + exclude-writes: *hmr-source-writes + - project: tanstack-react-start-e2e-hmr + target: test:e2e--rsbuild-ssr + exclude-writes: *hmr-source-writes + - project: tanstack-react-start-e2e-rsbuild + target: test:e2e--rsbuild-ssr + exclude-writes: + - e2e/react-start/rsbuild/src/routes/index.tsx + - project: tanstack-react-start-e2e-server-functions + target: test:e2e + exclude-writes: + - e2e/react-start/server-functions/src/routes/consistent.tsx + # Scaffolding tests deliberately populate tracked empty route fixtures. + - project: '@tanstack/router-generator' + target: test:unit + exclude-writes: + - packages/router-generator/tests/generator/custom-scaffolding/routes/__root.tsx + - packages/router-generator/tests/generator/custom-scaffolding/routes/api/bar.tsx + - packages/router-generator/tests/generator/custom-scaffolding/routes/foo.lazy.tsx + - packages/router-generator/tests/generator/custom-scaffolding/routes/index.tsx + # These reads are of scratch files created by the same test invocation. + - project: tanstack-solid-start-e2e-basic-auth + target: test:e2e + exclude-reads: + - e2e/solid-start/basic-auth/.tmp/dev.db + - project: tanstack-vue-start-e2e-basic-auth + target: test:e2e + exclude-reads: + - e2e/vue-start/basic-auth/.tmp/dev.db + - project: '@tanstack/router-generator' + target: test:unit + exclude-reads: + - packages/router-generator/tests/generator/file-modification/routes/[(]test[)]/initiallyEmpty.tsx + - packages/router-generator/tests/generator/file-modification/routes/[(]test[)]/initiallyEmpty.lazy.tsx + # Mutable counters are scratch state, not artifacts to replay from cache. + - project: tanstack-react-start-e2e-basic-tsr-config + target: test:e2e + exclude-reads: + - e2e/react-start/basic-tsr-config/count.txt + exclude-writes: + - e2e/react-start/basic-tsr-config/count.txt + - project: tanstack-solid-start-e2e-basic-tsr-config + target: test:e2e + exclude-reads: + - e2e/solid-start/basic-tsr-config/count.txt + exclude-writes: + - e2e/solid-start/basic-tsr-config/count.txt + - project: tanstack-vue-start-e2e-basic-tsr-config + target: test:e2e + exclude-reads: + - e2e/vue-start/basic-tsr-config/count.txt + exclude-writes: + - e2e/vue-start/basic-tsr-config/count.txt + # Paraglide downloads compiler plugins from the URLs in settings.json. + # Ignore warm-cache reads; the settings remain inputs and cache files outputs. + - project: tanstack-react-start-e2e-i18n-paraglide + target: build + exclude-reads: + - e2e/react-start/i18n-paraglide/project.inlang/cache/plugins/* + - project: tanstack-router-e2e-react-i18n-paraglide + target: build + exclude-reads: + - e2e/react-router/i18n-paraglide/project.inlang/cache/plugins/* + - project: tanstack-react-start-e2e-i18n-paraglide + target: test:e2e + exclude-reads: + - e2e/react-start/i18n-paraglide/project.inlang/cache/plugins/* + - project: tanstack-router-e2e-react-i18n-paraglide + target: test:e2e + exclude-reads: + - e2e/react-router/i18n-paraglide/project.inlang/cache/plugins/* + - project: tanstack-router-i18n-paraglide + target: build + exclude-reads: + - examples/react/i18n-paraglide/project.inlang/cache/plugins/* + - project: tanstack-start-i18n-paraglide + target: build + exclude-reads: + - examples/react/start-i18n-paraglide/project.inlang/cache/plugins/* + - project: tanstack-router-solid-i18n-paraglide + target: build + exclude-reads: + - examples/solid/i18n-paraglide/project.inlang/cache/plugins/* + - project: tanstack-solid-start-i18n-paraglide + target: build + exclude-reads: + - examples/solid/start-i18n-paraglide/project.inlang/cache/plugins/* diff --git a/benchmarks/client-nav/link-performance/project.json b/benchmarks/client-nav/link-performance/project.json index 548a92c872..899f013818 100644 --- a/benchmarks/client-nav/link-performance/project.json +++ b/benchmarks/client-nav/link-performance/project.json @@ -59,7 +59,19 @@ }, "test:unit": { "executor": "nx:run-commands", - "dependsOn": [], + "inputs": [ + "...", + "{workspaceRoot}/benchmarks/client-nav/scenarios/harness.ts", + "{workspaceRoot}/benchmarks/client-nav/scenarios/links/shared.ts", + "{workspaceRoot}/benchmarks/client-nav/setup-helpers.ts", + "{workspaceRoot}/benchmarks/client-nav/tsconfig.json" + ], + "dependsOn": [ + { + "projects": ["@tanstack/history"], + "target": "build" + } + ], "options": { "command": "vitest run --config ./link-performance/vitest.config.ts", "cwd": "benchmarks/client-nav" @@ -67,6 +79,15 @@ }, "test:types": { "executor": "nx:run-commands", + "inputs": [ + "...", + "{workspaceRoot}/benchmarks/client-nav/jsdom.ts", + "{workspaceRoot}/benchmarks/client-nav/scenarios/harness.ts", + "{workspaceRoot}/benchmarks/client-nav/scenarios/links/shared.ts", + "{workspaceRoot}/benchmarks/client-nav/setup-helpers.ts", + "{workspaceRoot}/benchmarks/client-nav/tsconfig.json", + "{workspaceRoot}/benchmarks/client-nav/vitest.setup.ts" + ], "dependsOn": [ { "projects": ["@tanstack/react-router"], diff --git a/e2e/react-router/i18n-paraglide/package.json b/e2e/react-router/i18n-paraglide/package.json index 450af0c8ef..d1af160f10 100644 --- a/e2e/react-router/i18n-paraglide/package.json +++ b/e2e/react-router/i18n-paraglide/package.json @@ -29,5 +29,23 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" + }, + "nx": { + "targets": { + "build": { + "outputs": [ + "...", + "{projectRoot}/src/paraglide", + "{projectRoot}/project.inlang/cache" + ] + }, + "test:e2e": { + "outputs": [ + "...", + "{projectRoot}/src/paraglide", + "{projectRoot}/project.inlang/cache" + ] + } + } } } diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/package.json b/e2e/react-router/scroll-restoration-sandbox-vite/package.json index 56bd2f80df..51e9e70cc5 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/package.json +++ b/e2e/react-router/scroll-restoration-sandbox-vite/package.json @@ -31,5 +31,15 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "vite": "^8.0.14" + }, + "nx": { + "targets": { + "test:e2e": { + "outputs": [ + "...", + "{projectRoot}/dist-hash" + ] + } + } } } diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/tsconfig.json b/e2e/react-router/scroll-restoration-sandbox-vite/tsconfig.json index f33b5a7aa3..5d58406b2e 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/tsconfig.json +++ b/e2e/react-router/scroll-restoration-sandbox-vite/tsconfig.json @@ -11,5 +11,5 @@ "allowJs": true, "types": ["vite/client", "node"] }, - "exclude": ["node_modules", "dist"] + "exclude": ["node_modules", "dist", "dist-hash"] } diff --git a/e2e/react-start/basic-cloudflare/package.json b/e2e/react-start/basic-cloudflare/package.json index 52f9be934d..b9b8031ac4 100644 --- a/e2e/react-start/basic-cloudflare/package.json +++ b/e2e/react-start/basic-cloudflare/package.json @@ -33,5 +33,15 @@ "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", "wrangler": "^4.74.0" + }, + "nx": { + "targets": { + "test:e2e": { + "outputs": [ + "...", + "{projectRoot}/.wrangler/deploy" + ] + } + } } } diff --git a/e2e/react-start/css-inline/package.json b/e2e/react-start/css-inline/package.json index 7d9c0520fc..02371eab4e 100644 --- a/e2e/react-start/css-inline/package.json +++ b/e2e/react-start/css-inline/package.json @@ -38,7 +38,47 @@ "nx": { "targets": { "test:e2e": { - "parallelism": false + "parallelism": false, + "outputs": [ + "...", + "{projectRoot}/dist-vite-ssr", + "{projectRoot}/dist-vite-ssr-transform-assets", + "{projectRoot}/dist-vite-transform-assets-ssr", + "{projectRoot}/dist-rsbuild-ssr", + "{projectRoot}/dist-rsbuild-ssr-transform-assets", + "{projectRoot}/dist-rsbuild-transform-assets-ssr" + ] + }, + "build": { + "outputs": [ + "...", + "{projectRoot}/dist-vite-ssr", + "{projectRoot}/dist-rsbuild-ssr" + ] + }, + "test:e2e--vite-ssr": { + "outputs": [ + "...", + "{projectRoot}/dist-vite-ssr" + ] + }, + "test:e2e--vite-ssr--transform-assets": { + "outputs": [ + "...", + "{projectRoot}/dist-vite-ssr-transform-assets" + ] + }, + "test:e2e--rsbuild-ssr": { + "outputs": [ + "...", + "{projectRoot}/dist-rsbuild-ssr" + ] + }, + "test:e2e--rsbuild-ssr--transform-assets": { + "outputs": [ + "...", + "{projectRoot}/dist-rsbuild-ssr-transform-assets" + ] } }, "metadata": { diff --git a/e2e/react-start/deferred-hydration/package.json b/e2e/react-start/deferred-hydration/package.json index fb8a99c8e3..b5a8a85a09 100644 --- a/e2e/react-start/deferred-hydration/package.json +++ b/e2e/react-start/deferred-hydration/package.json @@ -42,6 +42,12 @@ "targets": { "test:e2e": { "parallelism": false + }, + "build": { + "outputs": [ + "...", + "{projectRoot}/dist-vite-ssr" + ] } }, "metadata": { diff --git a/e2e/react-start/early-hints/package.json b/e2e/react-start/early-hints/package.json index bcccbab9a5..f8a72a7aa7 100644 --- a/e2e/react-start/early-hints/package.json +++ b/e2e/react-start/early-hints/package.json @@ -32,5 +32,15 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" + }, + "nx": { + "targets": { + "test:e2e": { + "outputs": [ + "...", + "{projectRoot}/tests/.tmp/tls" + ] + } + } } } diff --git a/e2e/react-start/i18n-paraglide/package.json b/e2e/react-start/i18n-paraglide/package.json index 584400d7a2..ca65ead76d 100644 --- a/e2e/react-start/i18n-paraglide/package.json +++ b/e2e/react-start/i18n-paraglide/package.json @@ -30,5 +30,23 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" + }, + "nx": { + "targets": { + "build": { + "outputs": [ + "...", + "{projectRoot}/src/paraglide", + "{projectRoot}/project.inlang/cache" + ] + }, + "test:e2e": { + "outputs": [ + "...", + "{projectRoot}/src/paraglide", + "{projectRoot}/project.inlang/cache" + ] + } + } } } diff --git a/e2e/react-start/rsc-deferred-hydration/package.json b/e2e/react-start/rsc-deferred-hydration/package.json index 434cabb24b..63036900c4 100644 --- a/e2e/react-start/rsc-deferred-hydration/package.json +++ b/e2e/react-start/rsc-deferred-hydration/package.json @@ -22,6 +22,14 @@ "shards": 1 } ] + }, + "targets": { + "test:e2e--vite-ssr": { + "outputs": [ + "...", + "{projectRoot}/dist-vite-ssr" + ] + } } }, "dependencies": { diff --git a/e2e/react-start/start-manifest/package.json b/e2e/react-start/start-manifest/package.json index 939882a346..aca05beb9d 100644 --- a/e2e/react-start/start-manifest/package.json +++ b/e2e/react-start/start-manifest/package.json @@ -29,7 +29,11 @@ "nx": { "targets": { "test:e2e": { - "parallelism": false + "parallelism": false, + "outputs": [ + "...", + "{projectRoot}/.output" + ] } } } diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/package.json b/e2e/solid-router/scroll-restoration-sandbox-vite/package.json index 5c62ab950a..cd816f7e09 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/package.json +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/package.json @@ -28,5 +28,15 @@ "@tanstack/router-e2e-utils": "workspace:^", "vite": "^8.0.14", "vite-plugin-solid": "^2.11.11" + }, + "nx": { + "targets": { + "test:e2e": { + "outputs": [ + "...", + "{projectRoot}/dist-hash" + ] + } + } } } diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/tsconfig.json b/e2e/solid-router/scroll-restoration-sandbox-vite/tsconfig.json index a16f70ed34..ae3b435a85 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/tsconfig.json +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/tsconfig.json @@ -12,5 +12,5 @@ "allowJs": true, "types": ["vite/client", "node"] }, - "exclude": ["node_modules", "dist"] + "exclude": ["node_modules", "dist", "dist-hash"] } diff --git a/e2e/solid-start/basic-auth/package.json b/e2e/solid-start/basic-auth/package.json index 2d4ddaf972..b6853ca410 100644 --- a/e2e/solid-start/basic-auth/package.json +++ b/e2e/solid-start/basic-auth/package.json @@ -36,5 +36,16 @@ "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", "vite-plugin-solid": "^2.11.11" + }, + "nx": { + "targets": { + "test:e2e": { + "outputs": [ + "...", + "{projectRoot}/.tmp", + "{projectRoot}/src/prisma-generated" + ] + } + } } } diff --git a/e2e/solid-start/basic-cloudflare/package.json b/e2e/solid-start/basic-cloudflare/package.json index 3f30314728..f1c823b3a9 100644 --- a/e2e/solid-start/basic-cloudflare/package.json +++ b/e2e/solid-start/basic-cloudflare/package.json @@ -30,5 +30,15 @@ "vite": "^8.0.14", "vite-plugin-solid": "^2.11.11", "wrangler": "^4.74.0" + }, + "nx": { + "targets": { + "test:e2e": { + "outputs": [ + "...", + "{projectRoot}/.wrangler/deploy" + ] + } + } } } diff --git a/e2e/solid-start/deferred-hydration/package.json b/e2e/solid-start/deferred-hydration/package.json index 0b272e838a..b1cb6cce3b 100644 --- a/e2e/solid-start/deferred-hydration/package.json +++ b/e2e/solid-start/deferred-hydration/package.json @@ -38,6 +38,12 @@ "targets": { "test:e2e": { "parallelism": false + }, + "build": { + "outputs": [ + "...", + "{projectRoot}/dist-vite-ssr" + ] } }, "metadata": { diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/package.json b/e2e/vue-router/scroll-restoration-sandbox-vite/package.json index 58a099f74f..d071ee546a 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/package.json +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/package.json @@ -31,5 +31,15 @@ "typescript": "~5.8.3", "vite": "^8.0.14", "vue-tsc": "^3.3.8" + }, + "nx": { + "targets": { + "test:e2e": { + "outputs": [ + "...", + "{projectRoot}/dist-hash" + ] + } + } } } diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/tsconfig.json b/e2e/vue-router/scroll-restoration-sandbox-vite/tsconfig.json index 3e5b04987f..b47cca9589 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/tsconfig.json +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/tsconfig.json @@ -12,5 +12,5 @@ "allowJs": true, "types": ["vite/client", "node"] }, - "exclude": ["node_modules", "dist"] + "exclude": ["node_modules", "dist", "dist-hash"] } diff --git a/e2e/vue-start/basic-auth/package.json b/e2e/vue-start/basic-auth/package.json index 8f92b3563b..a0b52a5af0 100644 --- a/e2e/vue-start/basic-auth/package.json +++ b/e2e/vue-start/basic-auth/package.json @@ -37,5 +37,16 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" + }, + "nx": { + "targets": { + "test:e2e": { + "outputs": [ + "...", + "{projectRoot}/.tmp", + "{projectRoot}/src/prisma-generated" + ] + } + } } } diff --git a/e2e/vue-start/basic-cloudflare/package.json b/e2e/vue-start/basic-cloudflare/package.json index d14c2683a1..5ab77db8fc 100644 --- a/e2e/vue-start/basic-cloudflare/package.json +++ b/e2e/vue-start/basic-cloudflare/package.json @@ -31,5 +31,15 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "wrangler": "^4.74.0" + }, + "nx": { + "targets": { + "test:e2e": { + "outputs": [ + "...", + "{projectRoot}/.wrangler/deploy" + ] + } + } } } diff --git a/examples/react/i18n-paraglide/package.json b/examples/react/i18n-paraglide/package.json index 3c2f03e0b4..3d8418ca8d 100644 --- a/examples/react/i18n-paraglide/package.json +++ b/examples/react/i18n-paraglide/package.json @@ -26,5 +26,16 @@ "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", "@inlang/paraglide-js": "^2.4.0" + }, + "nx": { + "targets": { + "build": { + "outputs": [ + "...", + "{projectRoot}/src/paraglide", + "{projectRoot}/project.inlang/cache" + ] + } + } } } diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index 5818e84c1a..59b68d58f0 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -33,6 +33,12 @@ "dependsOn": [ "^build" ] + }, + "build": { + "inputs": [ + "...", + "{workspaceRoot}/examples/react/router-monorepo-react-query/.gitignore" + ] } } } diff --git a/examples/react/router-monorepo-react-query/packages/app/tsconfig.json b/examples/react/router-monorepo-react-query/packages/app/tsconfig.json index ce3a7d2339..196cb055a9 100644 --- a/examples/react/router-monorepo-react-query/packages/app/tsconfig.json +++ b/examples/react/router-monorepo-react-query/packages/app/tsconfig.json @@ -8,5 +8,6 @@ "module": "ESNext", "lib": ["DOM", "DOM.Iterable", "ES2022"], "skipLibCheck": true - } + }, + "exclude": ["node_modules", "dist"] } diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index 1f16998e3d..48d2ae7206 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -32,6 +32,12 @@ "dependsOn": [ "^build" ] + }, + "build": { + "inputs": [ + "...", + "{workspaceRoot}/examples/react/router-monorepo-simple-lazy/.gitignore" + ] } } } diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/tsconfig.json b/examples/react/router-monorepo-simple-lazy/packages/app/tsconfig.json index ce3a7d2339..196cb055a9 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/tsconfig.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/tsconfig.json @@ -8,5 +8,6 @@ "module": "ESNext", "lib": ["DOM", "DOM.Iterable", "ES2022"], "skipLibCheck": true - } + }, + "exclude": ["node_modules", "dist"] } diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index 7f5183d633..30f39f4a52 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -32,6 +32,12 @@ "dependsOn": [ "^build" ] + }, + "build": { + "inputs": [ + "...", + "{workspaceRoot}/examples/react/router-monorepo-simple/.gitignore" + ] } } } diff --git a/examples/react/router-monorepo-simple/packages/app/tsconfig.json b/examples/react/router-monorepo-simple/packages/app/tsconfig.json index ce3a7d2339..196cb055a9 100644 --- a/examples/react/router-monorepo-simple/packages/app/tsconfig.json +++ b/examples/react/router-monorepo-simple/packages/app/tsconfig.json @@ -8,5 +8,6 @@ "module": "ESNext", "lib": ["DOM", "DOM.Iterable", "ES2022"], "skipLibCheck": true - } + }, + "exclude": ["node_modules", "dist"] } diff --git a/examples/react/start-i18n-paraglide/package.json b/examples/react/start-i18n-paraglide/package.json index 3639e8879b..b46904a044 100644 --- a/examples/react/start-i18n-paraglide/package.json +++ b/examples/react/start-i18n-paraglide/package.json @@ -27,5 +27,16 @@ "@tailwindcss/vite": "^4.2.2", "tailwindcss": "^4.2.2", "@inlang/paraglide-js": "^2.4.0" + }, + "nx": { + "targets": { + "build": { + "outputs": [ + "...", + "{projectRoot}/src/paraglide", + "{projectRoot}/project.inlang/cache" + ] + } + } } } diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json index a238ee3c9d..555b3cc4a5 100644 --- a/examples/react/start-next-migration/package.json +++ b/examples/react/start-next-migration/package.json @@ -28,5 +28,16 @@ "nitro": "^3.0.260311-beta", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" + }, + "nx": { + "targets": { + "test:e2e": { + "outputs": [ + "...", + "{projectRoot}/next-app/.next", + "{projectRoot}/next-app/next-env.d.ts" + ] + } + } } } diff --git a/examples/react/start-supabase-basic/.gitignore b/examples/react/start-supabase-basic/.gitignore index 8293849e8d..372dc30373 100644 --- a/examples/react/start-supabase-basic/.gitignore +++ b/examples/react/start-supabase-basic/.gitignore @@ -1,12 +1,11 @@ node_modules -# Keep environment variables out of version control -!.env package-lock.json yarn.lock .DS_Store .cache -.env +# The checked-in .env contains public demo values used by the build. +!.env .vercel .output /build/ diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json index 3ad847bfef..e36ed66b71 100644 --- a/examples/solid/i18n-paraglide/package.json +++ b/examples/solid/i18n-paraglide/package.json @@ -23,5 +23,16 @@ "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", "@inlang/paraglide-js": "^2.4.0" + }, + "nx": { + "targets": { + "build": { + "outputs": [ + "...", + "{projectRoot}/src/paraglide", + "{projectRoot}/project.inlang/cache" + ] + } + } } } diff --git a/examples/solid/start-i18n-paraglide/package.json b/examples/solid/start-i18n-paraglide/package.json index 83f56793c6..2703603a77 100644 --- a/examples/solid/start-i18n-paraglide/package.json +++ b/examples/solid/start-i18n-paraglide/package.json @@ -24,5 +24,16 @@ "@tailwindcss/vite": "^4.2.2", "tailwindcss": "^4.2.2", "@inlang/paraglide-js": "^2.4.0" + }, + "nx": { + "targets": { + "build": { + "outputs": [ + "...", + "{projectRoot}/src/paraglide", + "{projectRoot}/project.inlang/cache" + ] + } + } } } diff --git a/nx.json b/nx.json index 00c528aa46..b73eed0d92 100644 --- a/nx.json +++ b/nx.json @@ -62,7 +62,7 @@ "test:e2e": { "cache": true, "dependsOn": ["^build", "test:e2e--*"], - "inputs": ["default", "^production", "dependentTaskOutputs"], + "inputs": ["buildProduction", "^production", "dependentTaskOutputs"], "outputs": ["{projectRoot}/dist", "{projectRoot}/test-results"], "parallelism": false }, @@ -117,6 +117,10 @@ "^production", "{workspaceRoot}/benchmarks/ssr/bench-utils.ts", "{workspaceRoot}/benchmarks/cpu-simulation.ts", + "{workspaceRoot}/benchmarks/ssr/scenarios/*/*.ts", + "{workspaceRoot}/benchmarks/memory/*.ts", + "{workspaceRoot}/benchmarks/memory/server/*.ts", + "{workspaceRoot}/benchmarks/memory/server/scenarios/*/*.ts", "dependentTaskOutputs" ] }, diff --git a/packages/eslint-plugin-router/package.json b/packages/eslint-plugin-router/package.json index 3270c14221..9be54c220e 100644 --- a/packages/eslint-plugin-router/package.json +++ b/packages/eslint-plugin-router/package.json @@ -67,5 +67,15 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0" + }, + "nx": { + "targets": { + "build": { + "inputs": [ + "...", + "{workspaceRoot}/eslint.config.js" + ] + } + } } } diff --git a/packages/eslint-plugin-start/package.json b/packages/eslint-plugin-start/package.json index b90642f1c4..803264ed10 100644 --- a/packages/eslint-plugin-start/package.json +++ b/packages/eslint-plugin-start/package.json @@ -68,5 +68,15 @@ "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.7.0" + }, + "nx": { + "targets": { + "build": { + "inputs": [ + "...", + "{workspaceRoot}/eslint.config.js" + ] + } + } } } diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index 85a3dedc8d..cc1e7e937a 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -85,5 +85,16 @@ "@arethetypeswrong/cli": "catalog:", "publint": "catalog:", "rimraf": "catalog:" + }, + "nx": { + "targets": { + "test:unit": { + "outputs": [ + "...", + "{projectRoot}/tests/generator/*/routeTree.gen.{ts,js}", + "{projectRoot}/tests/generator/file-modification/routes/*/*.tsx" + ] + } + } } } From a768f66c2f51f9d947c2d84be8d0f758c94bcb8d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 14 Sep 2026 11:40:25 +0200 Subject: [PATCH 032/175] ci: Version Packages (#8413) ci: changeset release Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/rsbuild-watch-predicate.md | 6 - examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- .../react/start-basic-authjs/package.json | 2 +- .../react/start-basic-cloudflare/package.json | 2 +- .../start-basic-react-query/package.json | 2 +- .../react/start-basic-rsbuild/package.json | 2 +- .../react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-bun/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- .../react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- .../react/start-i18n-paraglide/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- .../react/start-next-migration/package.json | 2 +- examples/react/start-rscs/package.json | 2 +- .../package.json | 2 +- .../react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/solid/start-basic-auth/package.json | 2 +- .../solid/start-basic-authjs/package.json | 2 +- .../solid/start-basic-cloudflare/package.json | 2 +- .../solid/start-basic-netlify/package.json | 2 +- examples/solid/start-basic-nitro/package.json | 2 +- .../start-basic-solid-query/package.json | 2 +- .../solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- examples/solid/start-bun/package.json | 2 +- .../start-convex-better-auth/package.json | 2 +- examples/solid/start-counter/package.json | 2 +- .../solid/start-i18n-paraglide/package.json | 2 +- examples/solid/start-large/package.json | 2 +- .../package.json | 2 +- .../solid/start-supabase-basic/package.json | 2 +- examples/solid/start-tailwind-v4/package.json | 2 +- packages/react-start-rsc/CHANGELOG.md | 7 + packages/react-start-rsc/package.json | 2 +- packages/react-start/CHANGELOG.md | 8 + packages/react-start/package.json | 2 +- packages/solid-start/CHANGELOG.md | 9 + packages/solid-start/package.json | 2 +- packages/start-plugin-core/CHANGELOG.md | 6 + packages/start-plugin-core/package.json | 2 +- packages/vue-start/CHANGELOG.md | 7 + packages/vue-start/package.json | 2 +- pnpm-lock.yaml | 441 +++++++++--------- 50 files changed, 301 insertions(+), 269 deletions(-) delete mode 100644 .changeset/rsbuild-watch-predicate.md diff --git a/.changeset/rsbuild-watch-predicate.md b/.changeset/rsbuild-watch-predicate.md deleted file mode 100644 index e04c675f46..0000000000 --- a/.changeset/rsbuild-watch-predicate.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/start-plugin-core': patch -'@tanstack/solid-start': patch ---- - -Support Rsbuild 2.2: preserve function-based Rspack watch exclusions and regular-expression flags when adding monorepo build-output exclusions, and leave string-valued Babel loader options intact in the Solid Start plugin. diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index a528ec5a6c..7387f2f81c 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "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 d6f4054ce1..3ebdfea8fb 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index 715c156f56..2f8d5c5a53 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "react": "^19.0.0", "react-dom": "^19.0.0", "start-authjs": "^1.0.0", diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index 466b468b98..23cc832a27 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index fef333212d..e49dc35098 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -16,7 +16,7 @@ "@tanstack/react-router": "^1.170.36", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json index 1cfacf4077..af408e6903 100644 --- a/examples/react/start-basic-rsbuild/package.json +++ b/examples/react/start-basic-rsbuild/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/react-router": "^1.170.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "react": "^19.2.3", "react-dom": "^19.2.3", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 602e643840..aa98bad5a5 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "@tanstack/start-static-server-functions": "^1.167.35", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 4edee9969a..4e73291b60 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index 6ef0e1b34b..76b524debe 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -18,7 +18,7 @@ "@tanstack/react-router": "^1.170.36", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "@tanstack/router-plugin": "^1.168.38", "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 ddaabd339e..8c17e2a7f3 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index d14fa92189..6ce30a0a58 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.36", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index b2937e7a70..5aa90e9340 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "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 b46904a044..1368d0c89c 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "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 2049355af1..4f3ea23814 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -15,7 +15,7 @@ "@tanstack/react-query": "^5.102.0", "@tanstack/react-router": "^1.170.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "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 5ea77d0de8..f7c6bcceaf 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json index 555b3cc4a5..259503e488 100644 --- a/examples/react/start-next-migration/package.json +++ b/examples/react/start-next-migration/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@tanstack/react-router": "^1.170.36", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "iron-session": "^9.0.0", "next": "16.3.4", "react": "^19.2.3", diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index dd6f244e3c..8169d7156f 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "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 c9c1fdf5eb..79f8acc4ff 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "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 c73970f2d1..4774854ae3 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 7a249f70e8..4988843252 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "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 8ea0303532..7d3769d0a2 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -15,7 +15,7 @@ "@tanstack/react-router": "^1.170.36", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index dd9381ad1c..e52ab1509a 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.36", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.53", + "@tanstack/react-start": "^1.168.54", "@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 b1d4ad59a6..aa7e3998e0 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index c0883ba560..e6a4f1a0e8 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "solid-js": "^1.9.10", "start-authjs": "^1.0.0", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json index 596dc0ad0b..7d3bba186e 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json index 8b09eb5781..56aef360a6 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json index 336affdf26..c91ef0bfe1 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json index f1d0592ce6..c72911dfc8 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.34", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 80cf4b5e24..06bab8a845 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "@tanstack/start-static-server-functions": "^1.167.35", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index c98eae7f5c..ae0e3daf6e 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index e1112c36a5..3cc8e583db 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -18,7 +18,7 @@ "@tanstack/solid-router": "^1.170.34", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "@tanstack/router-plugin": "^1.168.38", "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 4c0548c222..ec8a5998ca 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "better-auth": "^1.6.19", "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 35c81204d9..ff92f0130a 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "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 2703603a77..27517b36df 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index e2f24a1efb..bab05bec5e 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "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 b260672cd9..84a0ea1118 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "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 3e54b8d7ab..f520d8d742 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "solid-js": "^1.9.9", "redaxios": "^0.5.1" }, diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json index 9713054dea..d7b080de6d 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.34", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.51", + "@tanstack/solid-start": "^1.168.52", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index f74930517b..4640ec1267 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/react-start-rsc +## 0.1.53 + +### Patch Changes + +- Updated dependencies [[`ab99818`](https://github.com/TanStack/router/commit/ab99818225835a1553a9f3513cd2093ff1b257be)]: + - @tanstack/start-plugin-core@1.171.44 + ## 0.1.52 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index 3d3b57778d..ca30689e2f 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.52", + "version": "0.1.53", "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 2ad111c7ca..d72a86f0f5 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,5 +1,13 @@ # @tanstack/react-start +## 1.168.54 + +### Patch Changes + +- Updated dependencies [[`ab99818`](https://github.com/TanStack/router/commit/ab99818225835a1553a9f3513cd2093ff1b257be)]: + - @tanstack/start-plugin-core@1.171.44 + - @tanstack/react-start-rsc@0.1.53 + ## 1.168.53 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 65af849c6b..7e951bfd76 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.168.53", + "version": "1.168.54", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/CHANGELOG.md b/packages/solid-start/CHANGELOG.md index d6df6fd469..fa598628aa 100644 --- a/packages/solid-start/CHANGELOG.md +++ b/packages/solid-start/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start +## 1.168.52 + +### Patch Changes + +- [#8397](https://github.com/TanStack/router/pull/8397) [`ab99818`](https://github.com/TanStack/router/commit/ab99818225835a1553a9f3513cd2093ff1b257be) - Support Rsbuild 2.2: preserve function-based Rspack watch exclusions and regular-expression flags when adding monorepo build-output exclusions, and leave string-valued Babel loader options intact in the Solid Start plugin. + +- Updated dependencies [[`ab99818`](https://github.com/TanStack/router/commit/ab99818225835a1553a9f3513cd2093ff1b257be)]: + - @tanstack/start-plugin-core@1.171.44 + ## 1.168.51 ### Patch Changes diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 88a09b5d45..799b9757f9 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.168.51", + "version": "1.168.52", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/CHANGELOG.md b/packages/start-plugin-core/CHANGELOG.md index 51ad0f7ac2..f5431fae57 100644 --- a/packages/start-plugin-core/CHANGELOG.md +++ b/packages/start-plugin-core/CHANGELOG.md @@ -1,5 +1,11 @@ # @tanstack/start-plugin-core +## 1.171.44 + +### Patch Changes + +- [#8397](https://github.com/TanStack/router/pull/8397) [`ab99818`](https://github.com/TanStack/router/commit/ab99818225835a1553a9f3513cd2093ff1b257be) - Support Rsbuild 2.2: preserve function-based Rspack watch exclusions and regular-expression flags when adding monorepo build-output exclusions, and leave string-valued Babel loader options intact in the Solid Start plugin. + ## 1.171.43 ### Patch Changes diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 72ef829bcf..f89e1c8202 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.43", + "version": "1.171.44", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start/CHANGELOG.md b/packages/vue-start/CHANGELOG.md index ea8cbca12c..985c5f8c07 100644 --- a/packages/vue-start/CHANGELOG.md +++ b/packages/vue-start/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/vue-start +## 1.168.51 + +### Patch Changes + +- Updated dependencies [[`ab99818`](https://github.com/TanStack/router/commit/ab99818225835a1553a9f3513cd2093ff1b257be)]: + - @tanstack/start-plugin-core@1.171.44 + ## 1.168.50 ### Patch Changes diff --git a/packages/vue-start/package.json b/packages/vue-start/package.json index 90a7bd7f2f..08a9a2a031 100644 --- a/packages/vue-start/package.json +++ b/packages/vue-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start", - "version": "1.168.50", + "version": "1.168.51", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8272a3d5a4..c501951239 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18166,16 +18166,38 @@ packages: resolution: {integrity: sha512-cvz/C1rF5WBxzHbEoiBoI6Sz6q6M+TdxfWkEGBYTD77opY8i8WN01prUWXEM87GPF4SZcyIySez9U0Ccm12oFQ==} engines: {node: '>=18.0.0'} + '@inquirer/ansi@2.0.8': + resolution: {integrity: sha512-WpQM+Ti6Z40EFwwt+uL2p4UabT+W179zHp6HhLVOzfbwnVn05IPO/eXIZXGNqcT1jbQ15SujNLzQ39k4QPPxBQ==} + engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + '@inquirer/confirm@5.1.4': resolution: {integrity: sha512-EsiT7K4beM5fN5Mz6j866EFA9+v9d5o9VUra3hrg8zY4GHmCS8b616FErbdo5eyKoVotBQkHzMIeeKYsKDStDw==} engines: {node: '>=18'} peerDependencies: '@types/node': 25.0.9 + '@inquirer/confirm@6.3.2': + resolution: {integrity: sha512-Xvr/0HggjddPtGppuqVmxhTw+Hr8PvsZ/k0HmOEaAqQEt80OITNkFWnsdNmyT0/eM4Ab+iJLx2R8rctlEyfSVg==} + engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + peerDependencies: + '@types/node': 25.0.9 + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/core@10.1.5': resolution: {integrity: sha512-/vyCWhET0ktav/mUeBqJRYTwmjFPIKPRYb3COAw7qORULgipGSUO2vL32lQKki3UxDKJ8BvuEbokaoyCA6YlWw==} engines: {node: '>=18'} + '@inquirer/core@12.0.3': + resolution: {integrity: sha512-wsSy0sznmXwkty+2PzZwx00Cazc/E0r0B7mAzdGROz2Ct+DFZXaK7WDjGZvgjRldxH5ZhFVfF2lgkYrqgOw2KA==} + engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + peerDependencies: + '@types/node': 25.0.9 + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/external-editor@1.0.3': resolution: {integrity: sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA==} engines: {node: '>=18'} @@ -18189,6 +18211,10 @@ packages: resolution: {integrity: sha512-Ey6176gZmeqZuY/W/nZiUyvmb1/qInjcpiZjXWi6nON+nxJpD1bxtSoBxNliGISae32n6OwbY+TSXPZ1CfS4bw==} engines: {node: '>=18'} + '@inquirer/figures@2.0.9': + resolution: {integrity: sha512-EAWgUTGQ/Umgga51dE3B2PUHbufuXarDfg86uVgoSgNHNNQnyFKcOrQLWVqYMghuSyHh8+2HUH0Js9cTC1WAdg==} + engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + '@inquirer/type@3.0.4': resolution: {integrity: sha512-2MNFrDY8jkFYc9Il9DgLsHhMzuHnOYM1+CUYVWbzu9oT0hC7V7EcYvdCKeoll/Fcci04A+ERZ9wcc7cQ8lTkIA==} engines: {node: '>=18'} @@ -18198,6 +18224,15 @@ packages: '@types/node': optional: true + '@inquirer/type@4.1.1': + resolution: {integrity: sha512-yJoHYrMnxIsJZCY+0Vb66Dy3he3kL3e2wOBKhoSwWWAzZAY82emlxwgprCtp6yRixvNRNq9ztfRWQYPNr3Go7A==} + engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + peerDependencies: + '@types/node': 25.0.9 + peerDependenciesMeta: + '@types/node': + optional: true + '@ioredis/commands@1.10.0': resolution: {integrity: sha512-UmeW7z4LfctwoQ5wkhVzgq8tXkreED2xZGpX+Bg+zA+WJFZCT6c062AfCK/Dfk81xZnnwdhJCUMkitihRaoC2Q==} @@ -18424,10 +18459,20 @@ packages: resolution: {integrity: sha512-JwqeCQ1U3fvccttHZq7Tk0m/TMC6WcFAQZdukypW3AzlJYKYTGNVd1ANU2GuhKnv4UQuOFj3oAl0LLG/gxFN1w==} engines: {node: '>=16'} + '@msw/playwright@0.6.7': + resolution: {integrity: sha512-q7m2JtnN1Iz25xauqx5lkD+tbbDM3oXZBg67aXr4EbxK7IZKTh6c71bbTCnDi/F2SuHq/jPUfS8NJXPcdroARA==} + engines: {node: '>=20.0.0'} + peerDependencies: + msw: ^2.12.10 + '@mswjs/interceptors@0.37.6': resolution: {integrity: sha512-wK+5pLK5XFmgtH3aQ2YVvA3HohS3xqV/OxuVOdNx9Wpnz7VE/fnC+e1A7ln6LFYeck7gOJ/dsZV6OLplOtAJ2w==} engines: {node: '>=18'} + '@mswjs/interceptors@0.41.9': + resolution: {integrity: sha512-VVPPgHyQ6ShqnrmDWuxjmUIsO9gWyOZFmuOfLd9LfBGQJwZfy0gvv9pbHSJuoFNIYC7ZDX9aoFwowjcdSC4E8w==} + engines: {node: '>=18'} + '@mui/core-downloads-tracker@6.4.7': resolution: {integrity: sha512-XjJrKFNt9zAKvcnoIIBquXyFyhfrHYuttqMsoDS7lM7VwufYG4fAPw4kINjBFg++fqXM2BNAuWR9J7XVIuKIKg==} @@ -18821,6 +18866,9 @@ packages: '@open-draft/deferred-promise@2.2.0': resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==} + '@open-draft/deferred-promise@3.0.0': + resolution: {integrity: sha512-XW375UK8/9SqUVNVa6M0yEy8+iTi4QN5VZ7aZuRFQmy76LRwI9wy5F4YIBU6T+eTe2/DNDo8tqu8RHlwLHM6RA==} + '@open-draft/logger@0.3.0': resolution: {integrity: sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==} @@ -22010,12 +22058,18 @@ packages: '@types/serve-static@2.2.0': resolution: {integrity: sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==} + '@types/set-cookie-parser@2.4.10': + resolution: {integrity: sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==} + '@types/sockjs@0.3.36': resolution: {integrity: sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==} '@types/statuses@2.0.5': resolution: {integrity: sha512-jmIUGWrAiwu3dZpxntxieC+1n/5c3mjrImkmOSQ2NC5uP6cYO4aAZDdSmRcI5C1oiTmqlZGHC+/NmJrKogbP5A==} + '@types/statuses@2.0.6': + resolution: {integrity: sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==} + '@types/tough-cookie@4.0.5': resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==} @@ -23734,6 +23788,10 @@ packages: resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==} engines: {node: '>=18'} + cookie@1.1.1: + resolution: {integrity: sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==} + engines: {node: '>=18'} + cookie@2.0.1: resolution: {integrity: sha512-yuToqVvRrj6pfDXREyQAAv8SkAEk/8GS3jQRTiUMm66TVtBYmqQeoEjL2Lmq8Rpo6271vH76InTChTitEAm65w==} engines: {node: '>=22'} @@ -25087,6 +25145,10 @@ packages: resolution: {integrity: sha512-AjqGKbDGUFRKIRCP9tCKiIGHyriz2oHEbPIbEtcSLSs4YjReZOIPQQWek4+6hjw62H9QShXHyaGivGiYVLeYFQ==} engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} + graphql@16.14.2: + resolution: {integrity: sha512-Chq1s4CY7jmh8gO2qvLIJyfCDIN+EHLFW/9iShnp1z8FjBQMoodWP1kDC36VAMXXIvAjj4ARa7ntfAV2BrjsbA==} + engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} + gzip-size@7.0.0: resolution: {integrity: sha512-O1Ld7Dr+nqPnmGpdhzLmMTQ4vAsD+rHwMm1NLUmoUFFymBOMKxCCrtDxqdBRYXdeEPEi3SyoR4TizJLQrnKBNA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -25178,6 +25240,9 @@ packages: headers-polyfill@4.0.3: resolution: {integrity: sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==} + headers-polyfill@5.0.1: + resolution: {integrity: sha512-1TJ6Fih/b8h5TIcv+1+Hw0PDQWJTKDKzFZzcKOiW1wJza3XoAQlkCuXLbymPYB8+ZQyw8mHvdw560e8zVFIWyA==} + hey-listen@1.0.8: resolution: {integrity: sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==} @@ -26448,6 +26513,16 @@ packages: ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + msw@2.15.0: + resolution: {integrity: sha512-2wQAmKkQKxRuXvYJxVhPGG0wZNBQyD06oJvxqw90XqLvptdqxdlHrFUfEteKkpaNORX3Xzc+HtEl/q0nfmN2wQ==} + engines: {node: '>=18'} + hasBin: true + peerDependencies: + typescript: '>= 4.8.x' + peerDependenciesMeta: + typescript: + optional: true + msw@2.7.0: resolution: {integrity: sha512-BIodwZ19RWfCbYTxWTUfTXc+sg4OwjCAgxU1ZsgmggX/7S3LdUifsbUPJs61j0rWb19CZRGY5if77duhc0uXzw==} engines: {node: '>=18'} @@ -26469,6 +26544,10 @@ packages: resolution: {integrity: sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==} engines: {node: ^18.17.0 || >=20.5.0} + mute-stream@3.0.0: + resolution: {integrity: sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==} + engines: {node: ^20.17.0 || >=22.9.0} + mysql2@3.15.3: resolution: {integrity: sha512-FBrGau0IXmuqg4haEZRBfHNWB5mUARw6hNwPDXXGg0XzVJ50mr/9hb267lvpVMnhZ1FON3qNd4Xfcez1rbFwSg==} engines: {node: '>= 8.0'} @@ -27638,6 +27717,9 @@ packages: resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==} engines: {node: '>= 4'} + rettime@0.11.11: + resolution: {integrity: sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==} + reusify@1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} @@ -28575,6 +28657,10 @@ packages: resolution: {integrity: sha512-xygQcmneDyzsEuKZrFbRMne5HDqMs++aFzefrJTgEIKjQ3rekM+RPfFCVq2Gp1VIDqddoYeppCj4Pcb+RZW0GQ==} engines: {node: '>=20'} + type-fest@5.9.0: + resolution: {integrity: sha512-yANm3Jr3GiJ1qgJlxGAVxTOIcEOk1rhQHamlXtnrCK7EHP4HeM9OGxtMg/W7HFdrVzw/ZWJKGVIJusVH85sLtw==} + engines: {node: '>=20'} + type-is@1.6.18: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} @@ -29051,6 +29137,9 @@ packages: uploadthing: optional: true + until-async@3.0.2: + resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==} + untun@0.1.3: resolution: {integrity: sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ==} hasBin: true @@ -29756,95 +29845,6 @@ packages: use-sync-external-store: optional: true - '@msw/playwright@0.6.7': - resolution: {integrity: sha512-q7m2JtnN1Iz25xauqx5lkD+tbbDM3oXZBg67aXr4EbxK7IZKTh6c71bbTCnDi/F2SuHq/jPUfS8NJXPcdroARA==} - engines: {node: '>=20.0.0'} - peerDependencies: - msw: ^2.12.10 - - '@mswjs/interceptors@0.41.9': - resolution: {integrity: sha512-VVPPgHyQ6ShqnrmDWuxjmUIsO9gWyOZFmuOfLd9LfBGQJwZfy0gvv9pbHSJuoFNIYC7ZDX9aoFwowjcdSC4E8w==} - engines: {node: '>=18'} - - msw@2.15.0: - resolution: {integrity: sha512-2wQAmKkQKxRuXvYJxVhPGG0wZNBQyD06oJvxqw90XqLvptdqxdlHrFUfEteKkpaNORX3Xzc+HtEl/q0nfmN2wQ==} - engines: {node: '>=18'} - hasBin: true - peerDependencies: - typescript: '>= 4.8.x' - peerDependenciesMeta: - typescript: - optional: true - - '@inquirer/confirm@6.3.2': - resolution: {integrity: sha512-Xvr/0HggjddPtGppuqVmxhTw+Hr8PvsZ/k0HmOEaAqQEt80OITNkFWnsdNmyT0/eM4Ab+iJLx2R8rctlEyfSVg==} - engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - peerDependencies: - '@types/node': 25.0.9 - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/core@12.0.3': - resolution: {integrity: sha512-wsSy0sznmXwkty+2PzZwx00Cazc/E0r0B7mAzdGROz2Ct+DFZXaK7WDjGZvgjRldxH5ZhFVfF2lgkYrqgOw2KA==} - engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - peerDependencies: - '@types/node': 25.0.9 - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/ansi@2.0.8': - resolution: {integrity: sha512-WpQM+Ti6Z40EFwwt+uL2p4UabT+W179zHp6HhLVOzfbwnVn05IPO/eXIZXGNqcT1jbQ15SujNLzQ39k4QPPxBQ==} - engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - - '@inquirer/figures@2.0.9': - resolution: {integrity: sha512-EAWgUTGQ/Umgga51dE3B2PUHbufuXarDfg86uVgoSgNHNNQnyFKcOrQLWVqYMghuSyHh8+2HUH0Js9cTC1WAdg==} - engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - - '@inquirer/type@4.1.1': - resolution: {integrity: sha512-yJoHYrMnxIsJZCY+0Vb66Dy3he3kL3e2wOBKhoSwWWAzZAY82emlxwgprCtp6yRixvNRNq9ztfRWQYPNr3Go7A==} - engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - peerDependencies: - '@types/node': 25.0.9 - peerDependenciesMeta: - '@types/node': - optional: true - - mute-stream@3.0.0: - resolution: {integrity: sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==} - engines: {node: ^20.17.0 || >=22.9.0} - - '@open-draft/deferred-promise@3.0.0': - resolution: {integrity: sha512-XW375UK8/9SqUVNVa6M0yEy8+iTi4QN5VZ7aZuRFQmy76LRwI9wy5F4YIBU6T+eTe2/DNDo8tqu8RHlwLHM6RA==} - - '@types/statuses@2.0.6': - resolution: {integrity: sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==} - - cookie@1.1.1: - resolution: {integrity: sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==} - engines: {node: '>=18'} - - graphql@16.14.2: - resolution: {integrity: sha512-Chq1s4CY7jmh8gO2qvLIJyfCDIN+EHLFW/9iShnp1z8FjBQMoodWP1kDC36VAMXXIvAjj4ARa7ntfAV2BrjsbA==} - engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} - - headers-polyfill@5.0.1: - resolution: {integrity: sha512-1TJ6Fih/b8h5TIcv+1+Hw0PDQWJTKDKzFZzcKOiW1wJza3XoAQlkCuXLbymPYB8+ZQyw8mHvdw560e8zVFIWyA==} - - '@types/set-cookie-parser@2.4.10': - resolution: {integrity: sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==} - - rettime@0.11.11: - resolution: {integrity: sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==} - - type-fest@5.9.0: - resolution: {integrity: sha512-yANm3Jr3GiJ1qgJlxGAVxTOIcEOk1rhQHamlXtnrCK7EHP4HeM9OGxtMg/W7HFdrVzw/ZWJKGVIJusVH85sLtw==} - engines: {node: '>=20'} - - until-async@3.0.2: - resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==} - snapshots: '@adobe/css-tools@4.4.1': {} @@ -32504,12 +32504,21 @@ snapshots: transitivePeerDependencies: - babel-plugin-macros + '@inquirer/ansi@2.0.8': {} + '@inquirer/confirm@5.1.4(@types/node@25.0.9)': dependencies: '@inquirer/core': 10.1.5(@types/node@25.0.9) '@inquirer/type': 3.0.4(@types/node@25.0.9) '@types/node': 25.0.9 + '@inquirer/confirm@6.3.2(@types/node@25.0.9)': + dependencies: + '@inquirer/core': 12.0.3(@types/node@25.0.9) + '@inquirer/type': 4.1.1(@types/node@25.0.9) + optionalDependencies: + '@types/node': 25.0.9 + '@inquirer/core@10.1.5(@types/node@25.0.9)': dependencies: '@inquirer/figures': 1.0.10 @@ -32523,6 +32532,18 @@ snapshots: transitivePeerDependencies: - '@types/node' + '@inquirer/core@12.0.3(@types/node@25.0.9)': + dependencies: + '@inquirer/ansi': 2.0.8 + '@inquirer/figures': 2.0.9 + '@inquirer/type': 4.1.1(@types/node@25.0.9) + cli-width: 4.1.0 + fast-wrap-ansi: 0.2.0 + mute-stream: 3.0.0 + signal-exit: 4.1.0 + optionalDependencies: + '@types/node': 25.0.9 + '@inquirer/external-editor@1.0.3(@types/node@25.0.9)': dependencies: chardet: 2.1.1 @@ -32532,10 +32553,16 @@ snapshots: '@inquirer/figures@1.0.10': {} + '@inquirer/figures@2.0.9': {} + '@inquirer/type@3.0.4(@types/node@25.0.9)': optionalDependencies: '@types/node': 25.0.9 + '@inquirer/type@4.1.1(@types/node@25.0.9)': + optionalDependencies: + '@types/node': 25.0.9 + '@ioredis/commands@1.10.0': {} '@isaacs/cliui@8.0.2': @@ -32836,6 +32863,12 @@ snapshots: chevrotain: 10.5.0 lilconfig: 2.1.0 + '@msw/playwright@0.6.7(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))': + dependencies: + '@mswjs/interceptors': 0.41.9 + msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) + outvariant: 1.4.3 + '@mswjs/interceptors@0.37.6': dependencies: '@open-draft/deferred-promise': 2.2.0 @@ -32845,6 +32878,15 @@ snapshots: outvariant: 1.4.3 strict-event-emitter: 0.5.1 + '@mswjs/interceptors@0.41.9': + dependencies: + '@open-draft/deferred-promise': 2.2.0 + '@open-draft/logger': 0.3.0 + '@open-draft/until': 2.1.0 + is-node-process: 1.2.0 + outvariant: 1.4.3 + strict-event-emitter: 0.5.1 + '@mui/core-downloads-tracker@6.4.7': {} '@mui/material@6.4.7(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': @@ -33427,6 +33469,8 @@ snapshots: '@open-draft/deferred-promise@2.2.0': {} + '@open-draft/deferred-promise@3.0.0': {} + '@open-draft/logger@0.3.0': dependencies: is-node-process: 1.2.0 @@ -36483,12 +36527,18 @@ snapshots: '@types/http-errors': 2.0.4 '@types/node': 25.0.9 + '@types/set-cookie-parser@2.4.10': + dependencies: + '@types/node': 25.0.9 + '@types/sockjs@0.3.36': dependencies: '@types/node': 25.0.9 '@types/statuses@2.0.5': {} + '@types/statuses@2.0.6': {} + '@types/tough-cookie@4.0.5': {} '@types/triple-beam@1.3.5': {} @@ -37388,6 +37438,15 @@ snapshots: chai: 6.2.2 tinyrainbow: 3.1.0 + '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0))': + dependencies: + '@vitest/spy': 4.1.4 + estree-walker: 3.0.3 + magic-string: 0.30.21 + optionalDependencies: + msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) + vite: 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.9.0) + '@vitest/mocker@4.1.4(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0))': dependencies: '@vitest/spy': 4.1.4 @@ -38887,6 +38946,8 @@ snapshots: cookie@1.0.2: {} + cookie@1.1.1: {} + cookie@2.0.1: {} copy-file@11.1.0: @@ -40624,6 +40685,8 @@ snapshots: graphql@16.10.0: {} + graphql@16.14.2: {} + gzip-size@7.0.0: dependencies: duplexer: 0.1.2 @@ -40713,6 +40776,11 @@ snapshots: headers-polyfill@4.0.3: {} + headers-polyfill@5.0.1: + dependencies: + '@types/set-cookie-parser': 2.4.10 + set-cookie-parser: 3.1.0 + hey-listen@1.0.8: {} highlight.js@10.7.3: {} @@ -41952,6 +42020,31 @@ snapshots: ms@2.1.3: {} + msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2): + dependencies: + '@inquirer/confirm': 6.3.2(@types/node@25.0.9) + '@mswjs/interceptors': 0.41.9 + '@open-draft/deferred-promise': 3.0.0 + '@types/statuses': 2.0.6 + cookie: 1.1.1 + graphql: 16.14.2 + headers-polyfill: 5.0.1 + is-node-process: 1.2.0 + outvariant: 1.4.3 + path-to-regexp: 6.3.0 + picocolors: 1.1.1 + rettime: 0.11.11 + statuses: 2.0.2 + strict-event-emitter: 0.5.1 + tough-cookie: 6.0.1 + type-fest: 5.9.0 + until-async: 3.0.2 + yargs: 17.7.2 + optionalDependencies: + typescript: '@typescript/typescript6@6.0.2' + transitivePeerDependencies: + - '@types/node' + msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2): dependencies: '@bundled-es-modules/cookie': 2.0.1 @@ -42012,6 +42105,8 @@ snapshots: mute-stream@2.0.0: {} + mute-stream@3.0.0: {} + mysql2@3.15.3: dependencies: aws-ssl-profiles: 1.1.2 @@ -43624,6 +43719,8 @@ snapshots: retry@0.13.1: {} + rettime@0.11.11: {} + reusify@1.0.4: {} rfdc@1.4.1: {} @@ -44674,6 +44771,10 @@ snapshots: dependencies: tagged-tag: 1.0.0 + type-fest@5.9.0: + dependencies: + tagged-tag: 1.0.0 + type-is@1.6.18: dependencies: media-typer: 0.3.0 @@ -44932,6 +45033,8 @@ snapshots: lru-cache: 11.5.1 ofetch: 2.0.0-alpha.3 + until-async@3.0.2: {} + untun@0.1.3: dependencies: citty: 0.1.6 @@ -45332,6 +45435,35 @@ snapshots: transitivePeerDependencies: - msw + vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): + dependencies: + '@vitest/expect': 4.1.4 + '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + '@vitest/pretty-format': 4.1.4 + '@vitest/runner': 4.1.4 + '@vitest/snapshot': 4.1.4 + '@vitest/spy': 4.1.4 + '@vitest/utils': 4.1.4 + es-module-lexer: 2.3.1 + expect-type: 1.3.0 + magic-string: 0.30.21 + obug: 2.1.1 + pathe: 2.0.3 + picomatch: 4.0.4 + std-env: 4.1.0 + tinybench: 2.9.0 + tinyexec: 1.0.2 + tinyglobby: 0.2.16 + tinyrainbow: 3.1.0 + vite: 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.9.0) + why-is-node-running: 2.3.0 + optionalDependencies: + '@types/node': 25.0.9 + '@vitest/ui': 4.1.4(vitest@4.1.4) + jsdom: 29.1.1(@noble/hashes@2.0.1) + transitivePeerDependencies: + - msw + vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): dependencies: '@vitest/expect': 4.1.4 @@ -46082,134 +46214,3 @@ snapshots: immer: 10.1.1 react: 19.2.3 use-sync-external-store: 1.6.0(react@19.2.3) - '@msw/playwright@0.6.7(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))': - dependencies: - '@mswjs/interceptors': 0.41.9 - msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) - outvariant: 1.4.3 - - '@mswjs/interceptors@0.41.9': - dependencies: - '@open-draft/deferred-promise': 2.2.0 - '@open-draft/logger': 0.3.0 - '@open-draft/until': 2.1.0 - is-node-process: 1.2.0 - outvariant: 1.4.3 - strict-event-emitter: 0.5.1 - - msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2): - dependencies: - '@inquirer/confirm': 6.3.2(@types/node@25.0.9) - '@mswjs/interceptors': 0.41.9 - '@open-draft/deferred-promise': 3.0.0 - '@types/statuses': 2.0.6 - cookie: 1.1.1 - graphql: 16.14.2 - headers-polyfill: 5.0.1 - is-node-process: 1.2.0 - outvariant: 1.4.3 - path-to-regexp: 6.3.0 - picocolors: 1.1.1 - rettime: 0.11.11 - statuses: 2.0.2 - strict-event-emitter: 0.5.1 - tough-cookie: 6.0.1 - type-fest: 5.9.0 - until-async: 3.0.2 - yargs: 17.7.2 - optionalDependencies: - typescript: '@typescript/typescript6@6.0.2' - transitivePeerDependencies: - - '@types/node' - - '@inquirer/confirm@6.3.2(@types/node@25.0.9)': - dependencies: - '@inquirer/core': 12.0.3(@types/node@25.0.9) - '@inquirer/type': 4.1.1(@types/node@25.0.9) - optionalDependencies: - '@types/node': 25.0.9 - - '@inquirer/core@12.0.3(@types/node@25.0.9)': - dependencies: - '@inquirer/ansi': 2.0.8 - '@inquirer/figures': 2.0.9 - '@inquirer/type': 4.1.1(@types/node@25.0.9) - cli-width: 4.1.0 - fast-wrap-ansi: 0.2.0 - mute-stream: 3.0.0 - signal-exit: 4.1.0 - optionalDependencies: - '@types/node': 25.0.9 - - '@inquirer/ansi@2.0.8': {} - - '@inquirer/figures@2.0.9': {} - - '@inquirer/type@4.1.1(@types/node@25.0.9)': - optionalDependencies: - '@types/node': 25.0.9 - - mute-stream@3.0.0: {} - - '@open-draft/deferred-promise@3.0.0': {} - - '@types/statuses@2.0.6': {} - - cookie@1.1.1: {} - - graphql@16.14.2: {} - - headers-polyfill@5.0.1: - dependencies: - '@types/set-cookie-parser': 2.4.10 - set-cookie-parser: 3.1.0 - - '@types/set-cookie-parser@2.4.10': - dependencies: - '@types/node': 25.0.9 - - rettime@0.11.11: {} - - type-fest@5.9.0: - dependencies: - tagged-tag: 1.0.0 - - until-async@3.0.2: {} - - vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): - dependencies: - '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) - '@vitest/pretty-format': 4.1.4 - '@vitest/runner': 4.1.4 - '@vitest/snapshot': 4.1.4 - '@vitest/spy': 4.1.4 - '@vitest/utils': 4.1.4 - es-module-lexer: 2.3.1 - expect-type: 1.3.0 - magic-string: 0.30.21 - obug: 2.1.1 - pathe: 2.0.3 - picomatch: 4.0.4 - std-env: 4.1.0 - tinybench: 2.9.0 - tinyexec: 1.0.2 - tinyglobby: 0.2.16 - tinyrainbow: 3.1.0 - vite: 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.9.0) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 25.0.9 - '@vitest/ui': 4.1.4(vitest@4.1.4) - jsdom: 29.1.1(@noble/hashes@2.0.1) - transitivePeerDependencies: - - msw - - '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0))': - dependencies: - '@vitest/spy': 4.1.4 - estree-walker: 3.0.3 - magic-string: 0.30.21 - optionalDependencies: - msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) - vite: 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.9.0) From 34bb302c09a73ea8b9fd348b0932c22b2fc627b1 Mon Sep 17 00:00:00 2001 From: Harry Whorlow <79278353+harry-whorlow@users.noreply.github.com> Date: Mon, 14 Sep 2026 17:05:02 +0200 Subject: [PATCH 033/175] chore(netlify): bump vite plugin and update trust policy (#8414) --- .../solid/start-basic-netlify/package.json | 2 +- pnpm-lock.yaml | 2120 ++++++++++------- pnpm-workspace.yaml | 4 +- 3 files changed, 1304 insertions(+), 822 deletions(-) diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json index 56aef360a6..960ee02716 100644 --- a/examples/solid/start-basic-netlify/package.json +++ b/examples/solid/start-basic-netlify/package.json @@ -15,7 +15,7 @@ "solid-js": "^1.9.10" }, "devDependencies": { - "@netlify/vite-plugin-tanstack-start": "^1.1.4", + "@netlify/vite-plugin-tanstack-start": "^1.3.19", "@tailwindcss/vite": "^4.2.2", "@types/node": "^22.5.4", "tailwindcss": "^4.2.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c501951239..5320b3268a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -356,7 +356,7 @@ importers: version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) benchmarks/memory/client: dependencies: @@ -432,7 +432,7 @@ importers: version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) benchmarks/memory/server: dependencies: @@ -502,7 +502,7 @@ importers: version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) benchmarks/ssr: dependencies: @@ -569,7 +569,7 @@ importers: version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) e2e/e2e-utils: devDependencies: @@ -590,7 +590,7 @@ importers: version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) e2e/eslint-plugin-start: devDependencies: @@ -623,7 +623,7 @@ importers: version: 5.9.2 vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/react-router/basepath-file-based: dependencies: @@ -2496,7 +2496,7 @@ importers: version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) nitro: specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -2600,7 +2600,7 @@ importers: version: 9.2.1 nitro: specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' @@ -3807,7 +3807,7 @@ importers: version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) nitro: specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' @@ -9724,7 +9724,7 @@ importers: 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.9.0) vitest: specifier: ^4.1.4 - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) examples/react/start-bare: dependencies: @@ -9813,7 +9813,7 @@ importers: version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) nitro: specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10246,7 +10246,7 @@ importers: 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.9.0) vitest: specifier: ^4.1.4 - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) web-vitals: specifier: ^5.1.0 version: 5.1.0 @@ -10612,7 +10612,7 @@ importers: version: 9.0.1 next: specifier: 16.3.4 - version: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) + version: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) react: specifier: ^19.2.3 version: 19.2.3 @@ -10637,7 +10637,7 @@ importers: version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) nitro: specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' @@ -10695,7 +10695,7 @@ importers: version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@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.9.0)) nitro: specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) tailwindcss: specifier: ^4.1.18 version: 4.2.2 @@ -12533,7 +12533,7 @@ importers: version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: ^4.1.4 - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) examples/solid/start-basic: dependencies: @@ -12567,7 +12567,7 @@ importers: version: typescript@7.0.2 nitro: specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -12744,8 +12744,8 @@ importers: version: 1.9.12 devDependencies: '@netlify/vite-plugin-tanstack-start': - specifier: ^1.1.4 - version: 1.1.4(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + specifier: ^1.3.19 + version: 1.3.19(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -12794,7 +12794,7 @@ importers: version: typescript@7.0.2 nitro: specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -12971,7 +12971,7 @@ importers: version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: ^4.1.4 - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) web-vitals: specifier: ^5.1.0 version: 5.1.0 @@ -12980,7 +12980,7 @@ importers: dependencies: '@convex-dev/better-auth': specifier: ^0.9.7 - version: 0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) @@ -12995,7 +12995,7 @@ importers: version: link:../../../packages/solid-start better-auth: specifier: ^1.6.19 - version: 1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) clsx: specifier: ^2.1.1 version: 2.1.1 @@ -13578,7 +13578,7 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -13614,7 +13614,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/eslint-plugin-router: dependencies: @@ -13627,7 +13627,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@typescript-eslint/rule-tester': specifier: ^8.23.0 version: 8.23.0(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -13648,7 +13648,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/eslint-plugin-start: dependencies: @@ -13682,7 +13682,7 @@ importers: version: 5.9.2 vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/history: devDependencies: @@ -13691,7 +13691,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -13706,7 +13706,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/nitro-v2-vite-plugin: dependencies: @@ -13734,7 +13734,7 @@ importers: version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/react-router: dependencies: @@ -13762,7 +13762,7 @@ importers: version: 5.102.0(react@19.2.3) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -13807,7 +13807,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) zod: specifier: 'catalog:' version: 4.5.4 @@ -13832,7 +13832,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13868,7 +13868,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/react-router-ssr-query: dependencies: @@ -13893,7 +13893,7 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -13926,7 +13926,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/react-start: dependencies: @@ -13972,7 +13972,7 @@ importers: version: 2.2.5 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14002,7 +14002,7 @@ importers: version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/react-start-client: dependencies: @@ -14024,7 +14024,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@testing-library/react': specifier: 'catalog:' version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) @@ -14063,7 +14063,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/react-start-rsc: dependencies: @@ -14142,7 +14142,7 @@ importers: version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-start-server: dependencies: @@ -14164,7 +14164,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -14203,7 +14203,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/router-cli: dependencies: @@ -14222,7 +14222,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14240,7 +14240,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/router-core: dependencies: @@ -14265,7 +14265,7 @@ importers: version: 0.11.1 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14286,7 +14286,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/router-devtools: dependencies: @@ -14308,7 +14308,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -14338,7 +14338,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/router-devtools-core: dependencies: @@ -14360,7 +14360,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -14384,7 +14384,7 @@ importers: version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/router-generator: dependencies: @@ -14421,7 +14421,7 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14442,7 +14442,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/router-plugin: dependencies: @@ -14524,7 +14524,7 @@ importers: version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) webpack: specifier: ^5.104.1 version: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) @@ -14542,7 +14542,7 @@ importers: version: link:../router-core '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -14557,7 +14557,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/router-utils: dependencies: @@ -14591,7 +14591,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/babel__generator': specifier: ^7.27.0 version: 7.27.0 @@ -14609,7 +14609,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/router-vite-plugin: dependencies: @@ -14622,7 +14622,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) publint: specifier: 'catalog:' version: 0.3.17 @@ -14634,7 +14634,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/solid-router: dependencies: @@ -14662,7 +14662,7 @@ importers: version: 0.8.10(solid-js@1.9.12) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -14692,7 +14692,7 @@ importers: version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) zod: specifier: 'catalog:' version: 4.5.4 @@ -14714,7 +14714,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14735,7 +14735,7 @@ importers: version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/solid-router-ssr-query: dependencies: @@ -14757,7 +14757,7 @@ importers: version: link:../solid-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) eslint-plugin-solid: specifier: ^0.14.5 version: 0.14.5(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -14781,7 +14781,7 @@ importers: version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/solid-start: dependencies: @@ -14824,7 +14824,7 @@ importers: version: link:../router-utils '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14845,7 +14845,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/solid-start-client: dependencies: @@ -14867,7 +14867,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -14888,7 +14888,7 @@ importers: version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/solid-start-server: dependencies: @@ -14907,7 +14907,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@typescript/native': specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 @@ -14934,7 +14934,7 @@ importers: version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/start-client-core: dependencies: @@ -14956,7 +14956,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14974,7 +14974,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/start-fn-stubs: devDependencies: @@ -14983,7 +14983,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) publint: specifier: 'catalog:' version: 0.3.17 @@ -14995,7 +14995,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/start-plugin-core: dependencies: @@ -15071,7 +15071,7 @@ importers: version: 2.2.5 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/babel__code-frame': specifier: ^7.0.6 version: 7.0.6 @@ -15095,7 +15095,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/start-server-core: dependencies: @@ -15129,7 +15129,7 @@ importers: version: 1.0.0 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15150,7 +15150,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/start-static-server-functions: dependencies: @@ -15172,7 +15172,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15190,7 +15190,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/start-storage-context: dependencies: @@ -15203,7 +15203,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15221,7 +15221,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/valibot-adapter: devDependencies: @@ -15233,7 +15233,7 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -15269,7 +15269,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/virtual-file-routes: devDependencies: @@ -15278,7 +15278,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15293,7 +15293,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) packages/vue-router: dependencies: @@ -15318,7 +15318,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -15351,7 +15351,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15379,7 +15379,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15394,7 +15394,7 @@ importers: version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15416,7 +15416,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@tanstack/vue-router': specifier: workspace:* version: link:../vue-router @@ -15434,7 +15434,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15474,7 +15474,7 @@ importers: version: link:../router-utils '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15495,7 +15495,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15517,7 +15517,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@vitejs/plugin-vue-jsx': specifier: 'catalog:' version: 4.2.0(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) @@ -15535,7 +15535,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15557,7 +15557,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@typescript/native': specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 @@ -15581,7 +15581,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15596,7 +15596,7 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -15629,7 +15629,7 @@ importers: 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.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) zod: specifier: ^3.24.2 version: 3.25.57 @@ -15976,10 +15976,6 @@ packages: resolution: {integrity: sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==} engines: {node: '>=6.9.0'} - '@babel/types@7.28.4': - resolution: {integrity: sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==} - engines: {node: '>=6.9.0'} - '@babel/types@7.29.8': resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==} engines: {node: '>=6.9.0'} @@ -16415,6 +16411,9 @@ packages: peerDependencies: '@electric-sql/pglite': 0.3.2 + '@electric-sql/pglite@0.3.16': + resolution: {integrity: sha512-mZkZfOd9OqTMHsK+1cje8OSzfAQcpD7JmILXTl5ahdempjUDdmg4euf1biDex5/LfQIDJ3gvCu6qDgdnDxfJmA==} + '@electric-sql/pglite@0.3.2': resolution: {integrity: sha512-zfWWa+V2ViDCY/cmUfRqeWY1yLto+EpxjXnZzenB1TyxsTiXaTWeZFIZw6mac52BsuQm0RjCnisjBtdBaXOI6w==} @@ -16545,6 +16544,12 @@ packages: cpu: [ppc64] os: [aix] + '@esbuild/aix-ppc64@0.28.1': + resolution: {integrity: sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [aix] + '@esbuild/aix-ppc64@0.28.2': resolution: {integrity: sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==} engines: {node: '>=18'} @@ -16581,6 +16586,12 @@ packages: cpu: [arm64] os: [android] + '@esbuild/android-arm64@0.28.1': + resolution: {integrity: sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==} + engines: {node: '>=18'} + cpu: [arm64] + os: [android] + '@esbuild/android-arm64@0.28.2': resolution: {integrity: sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==} engines: {node: '>=18'} @@ -16617,6 +16628,12 @@ packages: cpu: [arm] os: [android] + '@esbuild/android-arm@0.28.1': + resolution: {integrity: sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==} + engines: {node: '>=18'} + cpu: [arm] + os: [android] + '@esbuild/android-arm@0.28.2': resolution: {integrity: sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==} engines: {node: '>=18'} @@ -16653,6 +16670,12 @@ packages: cpu: [x64] os: [android] + '@esbuild/android-x64@0.28.1': + resolution: {integrity: sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==} + engines: {node: '>=18'} + cpu: [x64] + os: [android] + '@esbuild/android-x64@0.28.2': resolution: {integrity: sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==} engines: {node: '>=18'} @@ -16689,6 +16712,12 @@ packages: cpu: [arm64] os: [darwin] + '@esbuild/darwin-arm64@0.28.1': + resolution: {integrity: sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==} + engines: {node: '>=18'} + cpu: [arm64] + os: [darwin] + '@esbuild/darwin-arm64@0.28.2': resolution: {integrity: sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==} engines: {node: '>=18'} @@ -16725,6 +16754,12 @@ packages: cpu: [x64] os: [darwin] + '@esbuild/darwin-x64@0.28.1': + resolution: {integrity: sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==} + engines: {node: '>=18'} + cpu: [x64] + os: [darwin] + '@esbuild/darwin-x64@0.28.2': resolution: {integrity: sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==} engines: {node: '>=18'} @@ -16761,6 +16796,12 @@ packages: cpu: [arm64] os: [freebsd] + '@esbuild/freebsd-arm64@0.28.1': + resolution: {integrity: sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==} + engines: {node: '>=18'} + cpu: [arm64] + os: [freebsd] + '@esbuild/freebsd-arm64@0.28.2': resolution: {integrity: sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==} engines: {node: '>=18'} @@ -16797,6 +16838,12 @@ packages: cpu: [x64] os: [freebsd] + '@esbuild/freebsd-x64@0.28.1': + resolution: {integrity: sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==} + engines: {node: '>=18'} + cpu: [x64] + os: [freebsd] + '@esbuild/freebsd-x64@0.28.2': resolution: {integrity: sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==} engines: {node: '>=18'} @@ -16833,6 +16880,12 @@ packages: cpu: [arm64] os: [linux] + '@esbuild/linux-arm64@0.28.1': + resolution: {integrity: sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==} + engines: {node: '>=18'} + cpu: [arm64] + os: [linux] + '@esbuild/linux-arm64@0.28.2': resolution: {integrity: sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==} engines: {node: '>=18'} @@ -16869,6 +16922,12 @@ packages: cpu: [arm] os: [linux] + '@esbuild/linux-arm@0.28.1': + resolution: {integrity: sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==} + engines: {node: '>=18'} + cpu: [arm] + os: [linux] + '@esbuild/linux-arm@0.28.2': resolution: {integrity: sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==} engines: {node: '>=18'} @@ -16905,6 +16964,12 @@ packages: cpu: [ia32] os: [linux] + '@esbuild/linux-ia32@0.28.1': + resolution: {integrity: sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==} + engines: {node: '>=18'} + cpu: [ia32] + os: [linux] + '@esbuild/linux-ia32@0.28.2': resolution: {integrity: sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==} engines: {node: '>=18'} @@ -16941,6 +17006,12 @@ packages: cpu: [loong64] os: [linux] + '@esbuild/linux-loong64@0.28.1': + resolution: {integrity: sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==} + engines: {node: '>=18'} + cpu: [loong64] + os: [linux] + '@esbuild/linux-loong64@0.28.2': resolution: {integrity: sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==} engines: {node: '>=18'} @@ -16977,6 +17048,12 @@ packages: cpu: [mips64el] os: [linux] + '@esbuild/linux-mips64el@0.28.1': + resolution: {integrity: sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==} + engines: {node: '>=18'} + cpu: [mips64el] + os: [linux] + '@esbuild/linux-mips64el@0.28.2': resolution: {integrity: sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==} engines: {node: '>=18'} @@ -17013,6 +17090,12 @@ packages: cpu: [ppc64] os: [linux] + '@esbuild/linux-ppc64@0.28.1': + resolution: {integrity: sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [linux] + '@esbuild/linux-ppc64@0.28.2': resolution: {integrity: sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==} engines: {node: '>=18'} @@ -17049,6 +17132,12 @@ packages: cpu: [riscv64] os: [linux] + '@esbuild/linux-riscv64@0.28.1': + resolution: {integrity: sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==} + engines: {node: '>=18'} + cpu: [riscv64] + os: [linux] + '@esbuild/linux-riscv64@0.28.2': resolution: {integrity: sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==} engines: {node: '>=18'} @@ -17085,6 +17174,12 @@ packages: cpu: [s390x] os: [linux] + '@esbuild/linux-s390x@0.28.1': + resolution: {integrity: sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==} + engines: {node: '>=18'} + cpu: [s390x] + os: [linux] + '@esbuild/linux-s390x@0.28.2': resolution: {integrity: sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==} engines: {node: '>=18'} @@ -17121,6 +17216,12 @@ packages: cpu: [x64] os: [linux] + '@esbuild/linux-x64@0.28.1': + resolution: {integrity: sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==} + engines: {node: '>=18'} + cpu: [x64] + os: [linux] + '@esbuild/linux-x64@0.28.2': resolution: {integrity: sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==} engines: {node: '>=18'} @@ -17151,6 +17252,12 @@ packages: cpu: [arm64] os: [netbsd] + '@esbuild/netbsd-arm64@0.28.1': + resolution: {integrity: sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==} + engines: {node: '>=18'} + cpu: [arm64] + os: [netbsd] + '@esbuild/netbsd-arm64@0.28.2': resolution: {integrity: sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==} engines: {node: '>=18'} @@ -17187,6 +17294,12 @@ packages: cpu: [x64] os: [netbsd] + '@esbuild/netbsd-x64@0.28.1': + resolution: {integrity: sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==} + engines: {node: '>=18'} + cpu: [x64] + os: [netbsd] + '@esbuild/netbsd-x64@0.28.2': resolution: {integrity: sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==} engines: {node: '>=18'} @@ -17223,6 +17336,12 @@ packages: cpu: [arm64] os: [openbsd] + '@esbuild/openbsd-arm64@0.28.1': + resolution: {integrity: sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openbsd] + '@esbuild/openbsd-arm64@0.28.2': resolution: {integrity: sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==} engines: {node: '>=18'} @@ -17259,6 +17378,12 @@ packages: cpu: [x64] os: [openbsd] + '@esbuild/openbsd-x64@0.28.1': + resolution: {integrity: sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==} + engines: {node: '>=18'} + cpu: [x64] + os: [openbsd] + '@esbuild/openbsd-x64@0.28.2': resolution: {integrity: sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==} engines: {node: '>=18'} @@ -17283,6 +17408,12 @@ packages: cpu: [arm64] os: [openharmony] + '@esbuild/openharmony-arm64@0.28.1': + resolution: {integrity: sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openharmony] + '@esbuild/openharmony-arm64@0.28.2': resolution: {integrity: sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==} engines: {node: '>=18'} @@ -17319,6 +17450,12 @@ packages: cpu: [x64] os: [sunos] + '@esbuild/sunos-x64@0.28.1': + resolution: {integrity: sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==} + engines: {node: '>=18'} + cpu: [x64] + os: [sunos] + '@esbuild/sunos-x64@0.28.2': resolution: {integrity: sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==} engines: {node: '>=18'} @@ -17355,6 +17492,12 @@ packages: cpu: [arm64] os: [win32] + '@esbuild/win32-arm64@0.28.1': + resolution: {integrity: sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==} + engines: {node: '>=18'} + cpu: [arm64] + os: [win32] + '@esbuild/win32-arm64@0.28.2': resolution: {integrity: sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==} engines: {node: '>=18'} @@ -17391,6 +17534,12 @@ packages: cpu: [ia32] os: [win32] + '@esbuild/win32-ia32@0.28.1': + resolution: {integrity: sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==} + engines: {node: '>=18'} + cpu: [ia32] + os: [win32] + '@esbuild/win32-ia32@0.28.2': resolution: {integrity: sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==} engines: {node: '>=18'} @@ -17427,6 +17576,12 @@ packages: cpu: [x64] os: [win32] + '@esbuild/win32-x64@0.28.1': + resolution: {integrity: sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==} + engines: {node: '>=18'} + cpu: [x64] + os: [win32] + '@esbuild/win32-x64@0.28.2': resolution: {integrity: sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==} engines: {node: '>=18'} @@ -17834,13 +17989,6 @@ packages: resolution: {integrity: sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==} engines: {node: '>=18.18'} - '@iarna/toml@2.2.5': - resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==} - - '@img/colour@1.0.0': - resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==} - engines: {node: '>=18'} - '@img/colour@1.1.0': resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==} engines: {node: '>=18'} @@ -18587,9 +18735,13 @@ packages: '@neon-rs/load@0.0.4': resolution: {integrity: sha512-kTPhdZyTQxB+2wpiRcFWrDcejc4JI6tkPuS7UZCG4l6Zvc5kU/gGQ/ozvHTh1XR5tS+UlfAfGuPajjzQjCiHCw==} - '@netlify/api@14.0.7': - resolution: {integrity: sha512-smSD3MnyUwi+rdcvRlD2EAGEpzK9RRMiGxaXzKW7FGqIlZSEe08aPySuC0d5BXwl/7EmT43hOkBHH4KtP8DxcQ==} - engines: {node: '>=18.14.0'} + '@netlify/ai@1.0.1': + resolution: {integrity: sha512-jicymJwSK2/PPi0c3TjWRSp2h1Q/R+SrDd2NMY6bjckFYJJ6jyfToJj+gaypMycknSWI5LCgFwnJS209CMXtMw==} + engines: {node: '>=22.12.0'} + + '@netlify/api@15.1.2': + resolution: {integrity: sha512-mwDpddsem/KJw0CDAKUBnzKsM9UUfgUgRntvL3yyOZ+L12amaXmj38T/1ndnxmRIx1rIJtfbq4eEzxloaniylA==} + engines: {node: '>=22.12.0'} '@netlify/binary-info@1.0.0': resolution: {integrity: sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw==} @@ -18598,93 +18750,125 @@ packages: resolution: {integrity: sha512-dFpqDc6/x5LEu9L7kblCQu00CFEchH8J42jmQoXPuhKoE7avajzeLTbVKA8Olk3S/c2m9ejegrgbhL8NRA2Jyw==} engines: {node: ^14.16.0 || >=16.0.0} - '@netlify/cache@3.3.0': - resolution: {integrity: sha512-rKHmfPreOJhOz0FEKzqFdykIAdO2fC98hNXab6JuIKycySWZtLq+YtythuR/qL6AWBtdn1DQTAsOh8zBz7va7w==} - engines: {node: '>=20.6.1'} + '@netlify/blobs@11.0.3': + resolution: {integrity: sha512-Z8IXQtQC8BQjm76i1bN+l12TTyKQ/s1R92Ajhou7+fpP0KSxnJ65QzLEb5WuFuFutn8ORrcd4mlF8A2xhw8dzA==} + engines: {node: '>=22.12.0'} - '@netlify/config@23.2.0': - resolution: {integrity: sha512-zlI792/efPUY1XKtBML2OJBgKMyfNQIeGEYibH8SqeDxPjNuCy0qELE0U9Sc6+Ss34XryPBUPdV60tYhSoe6lw==} - engines: {node: '>=18.14.0'} + '@netlify/cache@4.0.0': + resolution: {integrity: sha512-tRWkLmO6pyqZetFkhYgtX6LH1umqaJAZN5mRNOJubca/+Mqm0VTUyl51FeS0UbVfetLwiwgpzbGmABpc5gGHyg==} + engines: {node: '>=22.12.0'} + + '@netlify/config@25.2.5': + resolution: {integrity: sha512-VqJeiQk2eZ9o3ls7C57e2TEalQdR2U3oLjI/Rlo9njU0l8bD3Cr6kBTU5shGIPQgeJVGU9rQLaX24Yd7WXrWVA==} + engines: {node: '>=22.12.0'} hasBin: true + '@netlify/database-dev@1.0.1': + resolution: {integrity: sha512-Zu8cM4AeXNuQI/cNAI6vrammtdDnWIGO6PYKDAECDMzsb3IcoTsVOZAePup7cGdjaGcBBVdi1qx/PoI5hNZcxg==} + engines: {node: '>=22.12.0'} + '@netlify/dev-utils@4.3.0': resolution: {integrity: sha512-vZAL8pMuj3yPQlmHSgyaA/UQFxc6pZgU0LucFJ1+IPWGJtIzBXHRvuR4acpoP72HtyQPUHJ42s7U9GaaSGVNHg==} engines: {node: ^18.14.0 || >=20} - '@netlify/dev@4.6.3': - resolution: {integrity: sha512-PT23zofsvrH/y28HwdLpa3VDsXaJPG+aauJ9MTWC2xQBUlMvlhuLBB+WtjxbnEuQUTzxQ7sgVXnt2o5WyqWb7A==} - engines: {node: '>=20.6.1'} + '@netlify/dev-utils@6.0.1': + resolution: {integrity: sha512-q5g70dO3q/M/XTBQz7uIECJxVlJoS8UBlzpjf22DV6q61UzXa8EONTPXPmvisrFcUi1I3AUKplPcHGQYZZj+Vw==} + engines: {node: '>=22.12.0'} - '@netlify/edge-bundler@14.7.0': - resolution: {integrity: sha512-EvjYzhY0qrDhapJQ8n/fXvEsjImai36VKs6kuVey20Qos5jC0oljdUBOeQ35nXTxiWi2Vo91IhjIWEQCLcUNdQ==} - engines: {node: '>=18.14.0'} + '@netlify/dev@5.1.0': + resolution: {integrity: sha512-g4fIVlz62NXshbLMx+UjHkcF/cr28AXAU/xpTJiFntkKddsoO5ahQjtBEoiKSQsBPtUrT7a7vMk6VFlrB3RDrg==} + engines: {node: '>=22.12.0'} + + '@netlify/edge-bundler@16.0.4': + resolution: {integrity: sha512-J7joSRuOIwg7bSMQBc+zq7Lb3p6gwsLMU/NYSFbXNIZtk6gSQnY3ZwnAncEhRqvN8lKsKx+27bn+4B2+B0N8ag==} + engines: {node: '>=22.12.0'} '@netlify/edge-functions-bootstrap@2.16.0': resolution: {integrity: sha512-v8QQihSbBHj3JxtJsHoepXALpNumD9M7egHoc8z62FYl5it34dWczkaJoFFopEyhiBVKi4K/n0ZYpdzwfujd6g==} - '@netlify/edge-functions-dev@1.0.0': - resolution: {integrity: sha512-bAUOuyxkqjEnX64Xel2QKqa7RNA13axrHYI089Vh9w5/+MCtf+CEuwexQ0Y3RoCyefjg8arHShL7lBccWFh4cg==} - engines: {node: '>=20.6.1'} + '@netlify/edge-functions-dev@2.0.1': + resolution: {integrity: sha512-IIIBoBhbqoOeOQLEfYLmW55IHOAxXc9athsUH7ZHKUUs3agi7ehVaZYZwhkQxB+l/K9/vRYHUnAZD715auIDpA==} + engines: {node: '>=22.12.0'} - '@netlify/edge-functions@3.0.0': - resolution: {integrity: sha512-qvwxrrOFeB9phD4zok/8FDWCXtipYpmLav/B2M6mUyjwB+XTZA769WfNWRElTG4cSUgrNM+GkyLuFHU2D0aY4Q==} - engines: {node: '>=18.0.0'} + '@netlify/edge-functions@4.0.0': + resolution: {integrity: sha512-0jerPQQ5mLczl7jwCRfTJsLcaiXbvPOC+Whtxxk7IHdz24OvZGjUtVHAxhppjT8wcX48I7C6oAff04QdQDMTfw==} + engines: {node: '>=22.12.0'} - '@netlify/functions-dev@1.0.0': - resolution: {integrity: sha512-Ws/NZiSjz2X2KW4fpZIPkfKGwoFcTFItm6iAgpY06TOol+n+sy2+qgvvjvF6Plm1l7mT2kttxXdsk6kVnR31Qg==} - engines: {node: '>=20.6.1'} + '@netlify/functions-dev@2.0.5': + resolution: {integrity: sha512-SSlmwe5GMfQmTDPbHfVTPe4h6lI3kbcepRxT2CKN30L9gx0NmwTGoMgns36DV64fHvabT5gNzzRxOx5sxYgzNg==} + engines: {node: '>=22.12.0'} - '@netlify/functions@5.0.0': - resolution: {integrity: sha512-gyKzl+P5SPp6P4iqykwPagSy7ODgRoQqi9TkjFJjM74FVJgxdiBQoLAmz+Pjl7kE5avJWtIvlQ+akAFaChekQQ==} - engines: {node: '>=18.0.0'} + '@netlify/functions@6.0.0': + resolution: {integrity: sha512-Pee+FoFnAtdejTkl62a7mZxj6Wx4eqVNuYyDc5T4XPJN9GaAWaUf4cZQFlf2m4Fqq0HoghjtcPKo+BZviVPPKA==} + engines: {node: '>=22.12.0'} - '@netlify/headers-parser@9.0.2': - resolution: {integrity: sha512-86YEGPxVemhksY1LeSr8NSOyH11RHvYHq+FuBJnTlPZoRDX+TD+0TAxF6lwzAgVTd1VPkyFEHlNgUGqw7aNzRQ==} - engines: {node: '>=18.14.0'} + '@netlify/headers-parser@10.1.1': + resolution: {integrity: sha512-ooiSc/eN/ktuugZmY4GVPh6nBYz2um0zpemokDvTLLQPF12QyXil8N6fr82wdLi03WNowwiL98eultZkTyHlyw==} + engines: {node: '>=22.12.0'} - '@netlify/headers@2.1.0': - resolution: {integrity: sha512-+7MgRPBYhRjizrd6JHxlD9KCjUyYk5yMqa16Ib3VNOSWYzaYiQi8Muyb1pn1pQVfBN2oPeK/q7J3pEdc/PWznQ==} - engines: {node: '>=20.6.1'} + '@netlify/headers@3.0.1': + resolution: {integrity: sha512-LcEu16gy28dkEp2+pa5EafauTfmFl6hkwiPqmoMBY+GiLLWQC00X8L4O1ZUrPqbKynsraSqEeKEfocC2FktrEQ==} + engines: {node: '>=22.12.0'} - '@netlify/images@1.3.0': - resolution: {integrity: sha512-edQefgR4aeL04oSgkGyjza3CObdU2C24EmRuF/FPXIR1GHa/TkEKMamppxFjZ6qj1i5tX0RGTLKvnREmtW34NA==} - engines: {node: '>=20.6.1'} + '@netlify/images@2.0.1': + resolution: {integrity: sha512-47DzR/PqIJqbUIef6P7EmhbNQbUOD4IuGNhTG7h3+xcynhQdBLBkCaBwY2DXOzUloA1MxYhKGYV2z4R3pO36hg==} + engines: {node: '>=22.12.0'} - '@netlify/open-api@2.40.0': - resolution: {integrity: sha512-Dp4lilDnkRKGWnljGkFVxfoh1wsWqxheE5/ZOf/sMZPsh3jGu5QZ4hVLEidzXYB/zIKFFqLaUbP2XYVxTqWqyQ==} + '@netlify/open-api@2.57.1': + resolution: {integrity: sha512-4YKcf35SKDp8N1JPw5cN/P0n/rJmVg8igL3UQUtAPIA9lBea6IigUknWRAXZEHhmXHAyR2ptiejSuQk+YFmlEA==} engines: {node: '>=14.8.0'} - '@netlify/redirect-parser@15.0.3': - resolution: {integrity: sha512-/HB3fcRRNgf6O/pbLn4EYNDHrU2kiadMMnazg8/OjvQK2S9i4y61vQcrICvDxYKUKQdgeEaABUuaCNAJFnfD9w==} - engines: {node: '>=18.14.0'} + '@netlify/otel@7.0.2': + resolution: {integrity: sha512-MHEsRJTZtOCrLa2fR+Y3GN51rvgxUHazuRVxuWuG7R1qzwynXAZB20Ufwp7BxKSTKcp7LNVEnKAZ/k2ytVmYvQ==} + engines: {node: '>=22.12.0'} - '@netlify/redirects@3.1.0': - resolution: {integrity: sha512-Eo50oNaTybEfB/4W6JFWdzQ1EbpObbaf83sIpT6H0DzfBgQIzPc3azdb7eD9eEFi3IAQjR5kZ6bOb2i4wbFDHQ==} - engines: {node: '>=20.6.1'} + '@netlify/redirect-parser@16.1.1': + resolution: {integrity: sha512-2Wg2em5rUi9EXKz5z4MAUb2Pfoyxm+jJpERYyIuYOwm6pfQHQCBjOD+HoW2CzDS859c0FlxNdnxq50bkfdKiLA==} + engines: {node: '>=22.12.0'} + + '@netlify/redirects@4.0.2': + resolution: {integrity: sha512-4Qpz6FpwrLITrScg34zjK9Iv0BiyyPVAGO7HvUZg0txihHPgKBRtLMByEwfP6mhuzTExoxMXYklqgHg2xtbPxA==} + engines: {node: '>=22.12.0'} '@netlify/runtime-utils@2.2.0': resolution: {integrity: sha512-K3kWIxIMucibzQsATU2xw2JI+OpS9PZfPW/a+81gmeLC8tLv5YAxTVT0NFY/3imk1kcOJb9g7658jPLqDJaiAw==} engines: {node: ^18.14.0 || >=20} - '@netlify/runtime@4.1.1': - resolution: {integrity: sha512-5qnHsri4X5r2spdD2tvdbU78grFV4fq7uVh/rMXF19qlgcHiuo0yr1JBEim1oINs/w+pyjusXMfnFEZjvV2qlQ==} - engines: {node: '>=20.6.1'} + '@netlify/runtime-utils@3.0.0': + resolution: {integrity: sha512-OHo40+V3QZkR+UrDjqhN+LekrAby/dSSJxsvyYs9i88E/mSl3goB/ysoL+VYROm190egxmQyRYlHK7vL4GeHBQ==} + engines: {node: '>=22.12.0'} - '@netlify/serverless-functions-api@2.7.1': - resolution: {integrity: sha512-NQcLB8BHbIsgSBPk9A/OBR5mGpc6dOAg1iRsYHWK0IoKsvwQ9a7bZc2+E40nE41Mnk24UjfK09vDLxP85O/zwA==} + '@netlify/runtime@5.0.3': + resolution: {integrity: sha512-MGoAWvFDuD0BbpIo8pwYPxxWsfMGBiiI4HetQOMkrx7ytnEZjq/qKKfzNCQKJg0Ed86XdQefKToVcP10wc38IQ==} + engines: {node: '>=22.12.0'} + + '@netlify/server-dev@0.1.1': + resolution: {integrity: sha512-yA+uMfscw2Unz8JvC0dRP9z5P0lnCOy//9YICFF4nzDijYXe80bsnvrblB8wOPYBq0/KmVhl4s0gCP/3roTp4w==} + engines: {node: '>=22.12.0'} + + '@netlify/serverless-functions-api@2.18.0': + resolution: {integrity: sha512-Uo5XyMFZOinq6AonHu6dUOkLvVydn+SaldoVkB4yQSpDrtqYWi56CoA26IIOur1EMJqRdt6JIzjzIe4jpzYdhQ==} engines: {node: '>=18.0.0'} - '@netlify/static@3.1.0': - resolution: {integrity: sha512-XbxiXpHaAakBASBFL5qc0SJhLlJdzYD0MYdM9sfCnRI38YJdvr0F2eHQlQDF016gn/iXhG6fJDxcWHEt2hEFDA==} - engines: {node: '>=20.6.1'} + '@netlify/serverless-functions-api@2.21.2': + resolution: {integrity: sha512-hlWyAXqwPXXujQ59fago956xft8EykD9jBncM6h+M/06mBR6E4stO1r1tDgAqRYm+XqgA7ZZNZU5TtBD+ZhLVw==} + engines: {node: '>=18.0.0'} - '@netlify/types@2.1.0': - resolution: {integrity: sha512-ktUb5d58pt1lQGXO5E9S0F1ljM0g+CoQuGTVII0IxBc0apmPq5RI0o3OWLY7U3ZERRiYTg5UfjiMihBEzuZsuw==} + '@netlify/static@4.0.0': + resolution: {integrity: sha512-YJcyaByknJ/JMmcqUFb9XId2NLgZitJlQC2FGP1a6mqndiMzAd9qoKtHxNRHX4NefI49+UABGtKF4UkL5rM8tw==} + engines: {node: '>=22.12.0'} + + '@netlify/types@2.8.0': + resolution: {integrity: sha512-8/g0Pt6y6wXj5Ia5eeYLiXhRfWeqZXGXpGFeCiiQdUOem+FPtXdA4+YdGxqzWc7D0AvptKSO01KGeeVWHSu8Kg==} engines: {node: ^18.14.0 || >=20} - '@netlify/vite-plugin-tanstack-start@1.1.4': - resolution: {integrity: sha512-GahhrKT7B1LRi4Bnj+O+Yhs2Bu4N6AfILzz/b06YxXEO7rRfX2yUDRBtv7/AFVLkyVOtkypkFZhZBbK9craVEA==} - engines: {node: ^22.12.0} + '@netlify/types@3.0.0': + resolution: {integrity: sha512-zRCidsQgI4CZWrZB/kmwdPf0QbSNljakfNSLizFvrsSA3UcUrTWSBNMVKmZnob92/8ESeUN0ewXLOlffJU+ATQ==} + engines: {node: '>=22.12.0'} + + '@netlify/vite-plugin-tanstack-start@1.3.19': + resolution: {integrity: sha512-qLrbU7ZWyHtoCdtmTUOUc9VQwMRHfJ5EqAVOwZyXHbp4okdFGeJkpcpwNGa1pHDOvdrVf8dyIK0Plc0KvX829g==} + engines: {node: ^22.12.0 || >=24.0.0} peerDependencies: '@tanstack/react-start': workspace:* '@tanstack/solid-start': workspace:* @@ -18695,15 +18879,15 @@ packages: '@tanstack/solid-start': optional: true - '@netlify/vite-plugin@2.7.4': - resolution: {integrity: sha512-Eid41kWWruhONKA7eS+bGMs+JjEXaBhQEkH82+SyjeSVj+FhHQGSHdrejMI0nj1jSgVUa3JMh+l57OgRB6Lvkg==} - engines: {node: ^20.6.1 || >=22} + '@netlify/vite-plugin@3.0.1': + resolution: {integrity: sha512-63vL+KpnbfJv+xQSfOn37j8aSOWjiljeaFL9g/HY+YNJpDJ3Y5BPPW1VExx4dcPqXBkggBHm5Y6HpTvBeTSx3Q==} + engines: {node: '>=22.12.0'} peerDependencies: vite: ^8.0.14 - '@netlify/zip-it-and-ship-it@14.1.11': - resolution: {integrity: sha512-5Ed9XH1JVPL7pAdq9zpC2WHjqHhHkaghuV3r2bvTTpx9JrTdzZxPeNnjZRjJMkjQAi8xSped5hNFJuD0QYmOuw==} - engines: {node: '>=18.14.0'} + '@netlify/zip-it-and-ship-it@15.5.1': + resolution: {integrity: sha512-ECHwLIHkSgfkxqF+q40xLMTTSxir1/pDGK6d55oKvwKidrW4qyTyHCAkuKtjOTJ30A+E238X2iiRyI+SCDjTuA==} + engines: {node: '>=22.12.0'} hasBin: true '@next/env@16.3.4': @@ -18875,6 +19059,60 @@ packages: '@open-draft/until@2.1.0': resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==} + '@opentelemetry/api-logs@0.221.0': + resolution: {integrity: sha512-OlanaW1vv7ufTqQ3/fPLI4arGt5ZoM+P8abOMki6uEYnpRazepSWDwDnnw+la7kE26SHVC18//SMccrDvLKOXQ==} + engines: {node: '>=8.0.0'} + + '@opentelemetry/api@1.8.0': + resolution: {integrity: sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==} + engines: {node: '>=8.0.0'} + + '@opentelemetry/api@1.9.1': + resolution: {integrity: sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==} + engines: {node: '>=8.0.0'} + + '@opentelemetry/context-async-hooks@2.10.0': + resolution: {integrity: sha512-bvyMcgLEkozzSzpEEEo1OMoeQ97bxj6Qs2uN3mPrSdDvObMI1myffD/BPqcLlzZO9//d1SqQA/WPw7Cz2AiqhA==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + + '@opentelemetry/core@2.10.0': + resolution: {integrity: sha512-/wNZ8twnEQQA4HoHu22+vcsdru6pWPWxW+7w+FlxT6Id7PE/WIbZmVKkte+PF72e0F2dnImFeHD2syyE1Mw6MQ==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + + '@opentelemetry/instrumentation@0.221.0': + resolution: {integrity: sha512-cCk80Z/iRDf/5gfsKMB4f74LqVA5yKETB/9ojPzVW/6/f70iu89nJvGxsFCxx4XfSohaOofkU19kiYm84AiAlw==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + + '@opentelemetry/resources@2.10.0': + resolution: {integrity: sha512-q6MMm2zhggzsHVNbabYwut+a6nbuQQe3URUoxaojM/8K1IBfwwPzvxIjNi2/lI1TFe+fMHMW9MWhrtDLEXEnkA==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.3.0 <1.10.0' + + '@opentelemetry/sdk-trace-base@2.10.0': + resolution: {integrity: sha512-GuYQQT7QD2EeO8lcZLRQzcbOyhqAzL+6WWTKTU9mSUBYBazkEDl+VrQcXQhbB08OWM9anD1aHleVadzulpOaUQ==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.3.0 <1.10.0' + + '@opentelemetry/sdk-trace-node@2.10.0': + resolution: {integrity: sha512-GZK/G6oZyBLGlH1pUgeDch7D91KoHd2uotUGIkWCPi9GI5T9X0p4L7nNAMDR1BQjkRYoDqo+ddfVx9t5Uhys+Q==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + + '@opentelemetry/sdk-trace@2.10.0': + resolution: {integrity: sha512-MfQGq3GRmTh5fM/y+OjaO0vj6+luCB1XO2gfXCalKCfgKw0eHL++sm75DNweC6ohlp+aFvACqeE0fYayqdRaoQ==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.3.0 <1.10.0' + '@opentelemetry/semantic-conventions@1.41.1': resolution: {integrity: sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA==} engines: {node: '>=14'} @@ -19316,12 +19554,6 @@ packages: os: [linux] libc: [musl] - '@parcel/watcher-wasm@2.5.1': - resolution: {integrity: sha512-RJxlQQLkaMMIuWRozy+z2vEqbaQlCuaCgVZIUCzQLYggY22LZbP5Y1+ia+FD724Ids9e+XIyOLXLrLgQSHIthw==} - engines: {node: '>= 10.0.0'} - bundledDependencies: - - napi-wasm - '@parcel/watcher-wasm@2.6.0': resolution: {integrity: sha512-dtjbDxKSDPQ8AmA+pS4OFaHE1FKrjtGpLGBxw85uKFkRorjNbvDM/aFPgqosu40wprbp1xw2ZSxIKqghCUHe2w==} engines: {node: '>= 10.0.0'} @@ -21334,6 +21566,11 @@ packages: '@supabase/supabase-js@2.48.1': resolution: {integrity: sha512-VMD+CYk/KxfwGbI4fqwSUVA7CLr1izXpqfFerhnYPSi6LEKD8GoR4kuO5Cc8a+N43LnfSQwLJu4kVm2e4etEmA==} + '@sveltejs/acorn-typescript@1.0.13': + resolution: {integrity: sha512-wgKggnhZVL9Bfx1OaKKTrYY9BFRk6C8UAkQNUcIv1+llzYrIqy+RZm5HPKzn0NpEBvTVhTqB4kQyllZywsRBRQ==} + peerDependencies: + acorn: ^8.9.0 + '@swc-node/core@1.14.1': resolution: {integrity: sha512-jrt5GUaZUU6cmMS+WTJEvGvaB6j1YNKPHPzC2PUi2BjaFbtxURHj6641Az6xN7b665hNniAIdvjxWcRml5yCnw==} engines: {node: '>= 10'} @@ -22085,9 +22322,6 @@ packages: '@types/yargs@17.0.33': resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==} - '@types/yauzl@2.10.3': - resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==} - '@typescript-eslint/eslint-plugin@8.44.1': resolution: {integrity: sha512-molgphGqOBT7t4YKCSkbasmu1tb1MgrZ2szGzHbclF7PNmOkSTQVHy+2jXOSnxvR3+Xe1yySHFZoqMpz3TfQsw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -22514,16 +22748,16 @@ packages: cpu: [x64] os: [win32] - '@vercel/nft@0.29.4': - resolution: {integrity: sha512-6lLqMNX3TuycBPABycx7A9F1bHQR7kiQln6abjFbPrf5C/05qHM9M5E4PeTE59c7z8g6vHnx1Ioihb2AQl7BTA==} - engines: {node: '>=18'} - hasBin: true - '@vercel/nft@1.11.0': resolution: {integrity: sha512-m1QFg+U+3yPOnP1xSYJ73UIRxLOXdts1JOhiOiyPYqEsALgrXFFINvgUaD6R6iNvaBFAjHllBCbkfx4FuOdpaA==} engines: {node: '>=20'} hasBin: true + '@vercel/nft@1.3.1': + resolution: {integrity: sha512-ihNT1rswiq3cy4WKQAV5kJi6UjWX1vLUzlLc+Vvq83G8CU9nMgfDWz5f1tOnSlS8LeC4Wp4qTB3+HGj/ccUrFQ==} + engines: {node: '>=20'} + hasBin: true + '@vitejs/plugin-react@4.7.0': resolution: {integrity: sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==} engines: {node: ^14.18.0 || >=16.0.0} @@ -22796,10 +23030,18 @@ packages: resolution: {integrity: sha512-eR8SYtf9Nem1Tnl0IWrY33qJ5wCtIWlt3Fs3c6V4aAaTFLtkEQErXu3SSZg/XCHrj9hXSJ8/8t+CdMk5Qec/ZA==} engines: {node: '>=18.0.0'} + '@whatwg-node/fetch@0.10.13': + resolution: {integrity: sha512-b4PhJ+zYj4357zwk4TTuF2nEe0vVtOrwdsrNo5hL+u1ojXNhh1FgJ6pg1jzDlwlT4oBdzfSwaBwMCtFCsIWg8Q==} + engines: {node: '>=18.0.0'} + '@whatwg-node/node-fetch@0.8.1': resolution: {integrity: sha512-cQmQEo7IsI0EPX9VrwygXVzrVlX43Jb7/DBZSmpnC7xH4xkyOnn/HykHpTaQk7TUs7zh59A5uTGqx3p2Ouzffw==} engines: {node: '>=18.0.0'} + '@whatwg-node/node-fetch@0.8.6': + resolution: {integrity: sha512-BDMdYFcerLQkwA2RTldxOqRCs6ZQD1S7UgP3pUdGUkcbgTrP/V5ko77ZkCww9DHmC4lpoYuwigGfQYj285gMvA==} + engines: {node: '>=18.0.0'} + '@whatwg-node/promise-helpers@1.3.2': resolution: {integrity: sha512-Nst5JdK47VIl9UcGwtv2Rcgyn5lWtZ0/mhRQ4G8NN2isxpq2TO30iqHzmwoJycjWuyUfg3GFXqP/gFHXeV57IA==} engines: {node: '>=16.0.0'} @@ -22808,6 +23050,10 @@ packages: resolution: {integrity: sha512-Otmxo+0mp8az3B48pLI1I4msNOXPIoP7TLm6h5wOEQmynqHt8oP9nR6NJUeJk6iI5OtFpQtkbJFwfGkmplvc3Q==} engines: {node: '>=18.0.0'} + '@whatwg-node/server@0.11.0': + resolution: {integrity: sha512-VSdkwnJRr8Yv9UgB2aXB3VUPWwd6Oqnn0hycFwhg9pZgWxJXb7JmhsiXe9tmpMwjHFxli12PGcz9aI63YYloGQ==} + engines: {node: '>=18.0.0'} + '@workos-inc/node@8.0.0': resolution: {integrity: sha512-D8VDfx0GXeiVm8vccAl0rElW7taebRnrteKPJzZwehwzI9W/Usa4qKfmwxj+7Lh1Z1deEocDRCpZpV7ml4GpWQ==} engines: {node: '>=20.15.0'} @@ -23007,6 +23253,10 @@ packages: resolution: {integrity: sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==} engines: {node: '>= 14'} + archiver@8.0.0: + resolution: {integrity: sha512-fV1orZfsnPn9BaSByR/qE67rJCLJEy2Ox5bq7nJh+jquWaNh6Sfec75kJ2T6PtdGUbPQlrVoSVCEOa5SdiTQ1g==} + engines: {node: '>=18'} + argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} @@ -23068,6 +23318,9 @@ packages: resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==} engines: {node: '>=8.0.0'} + atomically@2.1.1: + resolution: {integrity: sha512-P4w9o2dqARji6P7MHprklbfiArZAWvo07yW7qs3pdljb3BWr12FIB7W+p0zJiuiVsUpRO0iZn1kFFcpPegg0tQ==} + autocannon@8.0.0: resolution: {integrity: sha512-fMMcWc2JPFcUaqHeR6+PbmEpTxCrPZyBUM95oG4w3ngJ8NfBNas/ZXA+pTHXLqJ0UlFVTcy05GC25WxKx/M20A==} hasBin: true @@ -23186,10 +23439,6 @@ packages: engines: {node: '>=6.0.0'} hasBin: true - baseline-browser-mapping@2.9.8: - resolution: {integrity: sha512-Y1fOuNDowLfgKOypdc9SPABfoWXuZHBOyCS4cD52IeZBhr4Md6CLLs6atcxVrzRmQ06E7hSlm5bHHApPKR/byA==} - hasBin: true - batch@0.6.1: resolution: {integrity: sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==} @@ -23330,9 +23579,6 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true - buffer-crc32@0.2.13: - resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} - buffer-crc32@1.0.0: resolution: {integrity: sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==} engines: {node: '>=8.0.0'} @@ -23426,6 +23672,10 @@ packages: resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} + chalk@6.0.0: + resolution: {integrity: sha512-2uNTXIuTTxk7ciZgAU1BQcgnchcG0xXnrs6jzkQfj9SsRa9M2s5zE8WT96hS6KmG4MzWHSrvH43DF1m4XRkrFg==} + engines: {node: '>=22'} + char-regex@1.0.2: resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==} engines: {node: '>=10'} @@ -23475,6 +23725,9 @@ packages: cjs-module-lexer@1.4.3: resolution: {integrity: sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==} + cjs-module-lexer@2.2.1: + resolution: {integrity: sha512-Ca8swihM+/4yKecYHY52kgJd300hi2lADU/a1RxNTRe+RJ9jvqQlESpbz9DnG9mowez8qwXHB8qYdIUw9e+F5Q==} + classnames@2.5.1: resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==} @@ -23510,10 +23763,6 @@ packages: client-only@0.0.1: resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} - clipboardy@4.0.0: - resolution: {integrity: sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w==} - engines: {node: '>=18'} - cliui@7.0.4: resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} @@ -23625,6 +23874,10 @@ packages: resolution: {integrity: sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==} engines: {node: '>= 14'} + compress-commons@7.0.1: + resolution: {integrity: sha512-g0S8KAD8qf4+V//pr3BfB1aBnARLXNz2Gx+jmHU0LEriUuoQUOPOulVquHKTJ8+EAIIO7fhseNDr9wK5Q9FKBQ==} + engines: {node: '>=18'} + compressible@2.0.18: resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==} engines: {node: '>= 0.6'} @@ -23761,9 +24014,6 @@ packages: react: optional: true - cookie-es@1.2.2: - resolution: {integrity: sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg==} - cookie-es@1.2.3: resolution: {integrity: sha512-lXVyvUvrNXblMqzIRrxHb57UUVmqsSWlxqt3XIjCkUP0wDAf6uicO6KMbEgYrMNtEvWgWHwe42CKxPu9MYAnWw==} @@ -23825,10 +24075,13 @@ packages: resolution: {integrity: sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==} engines: {node: '>= 14'} - cron-parser@4.9.0: - resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==} - engines: {node: '>=12.0.0'} - deprecated: v4 is no longer maintained, upgrade to v5 + crc32-stream@7.0.1: + resolution: {integrity: sha512-IBWsY8xznyQrcHn8h4bC8/4ErNke5elzgG8GcqF4RFPw6aHkWWRc7Tgw6upjaTX/CT/yQgqYENkxYsTYN+hW2g==} + engines: {node: '>=18'} + + cron-parser@5.10.1: + resolution: {integrity: sha512-pKRrRagItwk9rGIStcUyMxFX34x56zoX3KDf9HJ4ttwkXIK1qxK63EvXvEDmlxI9AdPJ+Y7TEKRftRlW5eSS7A==} + engines: {node: '>=18'} croner@10.0.1: resolution: {integrity: sha512-ixNtAJndqh173VQ4KodSdJEI6nuioBWI0V1ITNKhZZsO0pEMoDxz539T4FTTbSZ/xIOSuDnzxLVRqBVSvPNE2g==} @@ -24020,8 +24273,8 @@ packages: babel-plugin-macros: optional: true - dedent@1.7.0: - resolution: {integrity: sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==} + dedent@1.7.2: + resolution: {integrity: sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==} peerDependencies: babel-plugin-macros: ^3.1.0 peerDependenciesMeta: @@ -24420,6 +24673,9 @@ packages: es-module-lexer@2.3.1: resolution: {integrity: sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==} + es-module-lexer@3.0.2: + resolution: {integrity: sha512-BuIB67FngDSyQ/dpQNOZybwdEBDUGJQvOqwWr4ha/ufYiqzuEwPkKO2zLhRAgay28tStRIHUeWmszZAJo3GCOg==} + es-object-atoms@1.1.1: resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==} engines: {node: '>= 0.4'} @@ -24481,6 +24737,11 @@ packages: engines: {node: '>=18'} hasBin: true + esbuild@0.28.1: + resolution: {integrity: sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==} + engines: {node: '>=18'} + hasBin: true + esbuild@0.28.2: resolution: {integrity: sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==} engines: {node: '>=18'} @@ -24761,11 +25022,6 @@ packages: extendable-error@0.1.7: resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==} - extract-zip@2.0.1: - resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==} - engines: {node: '>= 10.17.0'} - hasBin: true - fast-check@3.23.2: resolution: {integrity: sha512-h5+1OzzfCC3Ef7VbtKdcv7zsstUQwUDlYpUTvjeUsJAssPgLn7QzbboPtL5ro04Mq0rPOsMzl7q5hIbRs2wD1A==} engines: {node: '>=8.0.0'} @@ -24827,9 +25083,6 @@ packages: resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==} engines: {node: '>=0.8.0'} - fd-slicer@1.1.0: - resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==} - fdir@6.5.0: resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} engines: {node: '>=12.0.0'} @@ -25045,10 +25298,6 @@ packages: resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==} engines: {node: '>= 0.4'} - get-stream@5.2.0: - resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==} - engines: {node: '>=8'} - get-stream@8.0.1: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} @@ -25156,9 +25405,6 @@ packages: h3@1.15.11: resolution: {integrity: sha512-L3THSe2MPeBwgIZVSH5zLdBBU90TOxarvhK9d04IDY2AmVS8j2Jz2LIWtwsGOU3lu2I5jCN7FNvVfY2+XyF+mg==} - h3@1.15.5: - resolution: {integrity: sha512-xEyq3rSl+dhGX2Lm0+eFQIAzlDN6Fs0EcC4f7BNUmzaRX/PTzeuM+Tr2lHB8FoXggsQIeXLj8EDVgs5ywxyxmg==} - h3@2.0.1-rc.14: resolution: {integrity: sha512-163qbGmTr/9rqQRNuqMqtgXnOUAkE4KTdauiC9y0E5iG1I65kte9NyfWvZw5RTDMt6eY+DtyoNzrQ9wA2BfvGQ==} engines: {node: '>=20.11.1'} @@ -25266,6 +25512,10 @@ packages: resolution: {integrity: sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==} engines: {node: ^16.14.0 || >=18.0.0} + hosted-git-info@9.0.3: + resolution: {integrity: sha512-Hc+ghLoSt6QaYZUv0WBiIvmMDZuZZ7oaDvdH8MbfOO4lOsxdXLEvuC6ePoGs9H1X9oCLyq6+NVN0MKqD+ydxyg==} + engines: {node: ^20.17.0 || >=22.9.0} + hpack.js@2.1.6: resolution: {integrity: sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==} @@ -25435,6 +25685,10 @@ packages: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} engines: {node: '>=6'} + import-in-the-middle@3.5.1: + resolution: {integrity: sha512-mPKuL8bPQzecui2KK6Gb+M8JvJoHnhS1FeYGa22QopBmlevF5F0FE6ued/B5EgHDeIoMTONIpDWWFKUPOG0DBQ==} + engines: {node: '>=18'} + import-lazy@4.0.0: resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==} engines: {node: '>=8'} @@ -25714,10 +25968,6 @@ packages: resolution: {integrity: sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==} engines: {node: '>=16'} - is64bit@2.0.0: - resolution: {integrity: sha512-jv+8jaWCl0g2lSBkNSVXdzfBA0npK1HGC2KtWM9FumFRoGS94g3NbCCLVnCYHLjp4GrW2KZeeSTMo5ddtznmGw==} - engines: {node: '>=18'} - isarray@1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} @@ -25866,19 +26116,19 @@ packages: resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==} engines: {node: '>=0.10.0'} - jsonwebtoken@9.0.2: - resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==} + jsonwebtoken@9.0.3: + resolution: {integrity: sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==} engines: {node: '>=12', npm: '>=6'} junk@4.0.1: resolution: {integrity: sha512-Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ==} engines: {node: '>=12.20'} - jwa@1.4.2: - resolution: {integrity: sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==} + jwa@2.0.1: + resolution: {integrity: sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==} - jws@3.2.2: - resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==} + jws@4.0.1: + resolution: {integrity: sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==} jwt-decode@3.1.2: resolution: {integrity: sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==} @@ -26130,10 +26380,6 @@ packages: '@parcel/watcher': optional: true - listhen@1.9.0: - resolution: {integrity: sha512-I8oW2+QL5KJo8zXNWX046M134WchxsXC7SawLPvRQpogCbkyQIaFxPE89A2HiwR7vAK2Dm2ERBAmyjTYGYEpBg==} - hasBin: true - loader-runner@4.3.0: resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==} engines: {node: '>=6.11.5'} @@ -26477,6 +26723,10 @@ packages: resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==} engines: {node: '>= 18'} + minizlib@3.1.0: + resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==} + engines: {node: '>= 18'} + mkdirp@3.0.1: resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} engines: {node: '>=10'} @@ -26493,6 +26743,9 @@ packages: engines: {node: '>=18'} hasBin: true + module-details-from-path@1.0.4: + resolution: {integrity: sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==} + motion-dom@11.18.1: resolution: {integrity: sha512-g76KvA001z+atjfxczdRtw/RXOM3OMSdd1f4DL77qCTF/+avrRJiawSG4yDibEQ215sr9kpinSlX2pCTJ9zbhw==} @@ -26766,6 +27019,10 @@ packages: resolution: {integrity: sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==} engines: {node: ^16.14.0 || >=18.0.0} + normalize-package-data@8.0.0: + resolution: {integrity: sha512-RWk+PI433eESQ7ounYxIp67CYuVsS1uYSonX3kA6ps/3LWfjVQa/ptEg6Y3T6uAMq1mWpX9PQ+qx+QaHpsc7gQ==} + engines: {node: ^20.17.0 || >=22.9.0} + normalize-path@2.1.1: resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==} engines: {node: '>=0.10.0'} @@ -26846,9 +27103,6 @@ packages: ohash@2.0.11: resolution: {integrity: sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==} - omit.js@2.0.2: - resolution: {integrity: sha512-hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg==} - on-exit-leak-free@2.1.2: resolution: {integrity: sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==} engines: {node: '>=14.0.0'} @@ -26968,10 +27222,6 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} - p-wait-for@5.0.2: - resolution: {integrity: sha512-lwx6u1CotQYPVju77R+D0vFomni/AqRfqLmqQ8hekklqZ6gAY9rONh7lBQ0uxWMkC2AuX9b2DVAl8To0NyP1JA==} - engines: {node: '>=12'} - package-json-from-dist@1.0.1: resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==} @@ -27082,9 +27332,6 @@ packages: resolution: {integrity: sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==} engines: {node: '>=18'} - pathe@1.1.2: - resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} - pathe@2.0.3: resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==} @@ -27097,6 +27344,9 @@ packages: perfect-debounce@2.1.0: resolution: {integrity: sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==} + pg-gateway@0.3.0-beta.4: + resolution: {integrity: sha512-CTjsM7Z+0Nx2/dyZ6r8zRsc3f9FScoD5UAOlfUx1Fdv/JOIWvRbF7gou6l6vP+uypXQVoYPgw8xZDXgMGvBa4Q==} + picocolors@1.1.1: resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} @@ -27389,9 +27639,6 @@ packages: engines: {node: '>=18'} hasBin: true - pump@3.0.3: - resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==} - punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} @@ -27557,6 +27804,14 @@ packages: resolution: {integrity: sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==} engines: {node: '>=18'} + read-package-up@12.0.0: + resolution: {integrity: sha512-Q5hMVBYur/eQNWDdbF4/Wqqr9Bjvtrw2kjGxxBbKLbx8bVCL8gcArjTy8zDUuLGQicftpMuU0riQNcAsbtOVsw==} + engines: {node: '>=20'} + + read-pkg@10.1.0: + resolution: {integrity: sha512-I8g2lArQiP78ll51UeMZojewtYgIRCKCWqZEgOO8c/uefTI+XDXvCSXu3+YNUaTNvZzobrL5+SqHjBrByRRTdg==} + engines: {node: '>=20'} + read-pkg@9.0.1: resolution: {integrity: sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==} engines: {node: '>=18'} @@ -27579,6 +27834,10 @@ packages: readdir-glob@1.1.3: resolution: {integrity: sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==} + readdir-glob@3.0.0: + resolution: {integrity: sha512-AhNB2KgKeVJr16nK9LLZbJNWnYoT23ZrumNKFDebHBdkC8KHSqWo871JAUhoWC/RtjEVdqNMFpM6qrwRbaUqpw==} + engines: {node: '>=18'} + readdirp@3.6.0: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} @@ -27664,6 +27923,10 @@ packages: resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} engines: {node: '>=0.10.0'} + require-in-the-middle@8.0.1: + resolution: {integrity: sha512-QT7FVMXfWOYFbeRBF6nu+I6tr2Tf3u0q8RIEjNob/heKY/nh7drD/k7eeMFmSQgnTtCzLDcCu/XEnpW2wk4xCQ==} + engines: {node: '>=9.3.0 || >=8.10.0 <9.0.0'} + require-package-name@2.0.1: resolution: {integrity: sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==} @@ -28307,6 +28570,12 @@ packages: strip-literal@4.0.0: resolution: {integrity: sha512-PaqAvfUZKBwc/SLmNZtHmzK+v19Z4O4eS3cKPeGvbIv/U3pnyEq4Tuw3/4v/FwfM8VQaEawsyCcOQ0P+kpwWWw==} + stubborn-fs@2.0.0: + resolution: {integrity: sha512-Y0AvSwDw8y+nlSNFXMm2g6L51rBGdAQT20J3YSOqxC53Lo3bjWRtr2BKcfYoAf352WYpsZSTURrA0tqhfgudPA==} + + stubborn-utils@1.0.2: + resolution: {integrity: sha512-zOh9jPYI+xrNOyisSelgym4tolKTJCQd5GBhK0+0xJvcYDcwlOoxF/rnFKQ2KRZknXSG9jWAp66fwP6AxN9STg==} + style-loader@4.0.0: resolution: {integrity: sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA==} engines: {node: '>= 18.12.0'} @@ -28371,10 +28640,6 @@ packages: symbol-tree@3.2.4: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} - system-architecture@0.1.0: - resolution: {integrity: sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==} - engines: {node: '>=18'} - tagged-tag@1.0.0: resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==} engines: {node: '>=20'} @@ -28411,6 +28676,10 @@ packages: engines: {node: '>=18'} deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me + tar@7.5.22: + resolution: {integrity: sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA==} + engines: {node: '>=18'} + teex@1.0.1: resolution: {integrity: sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==} @@ -28537,8 +28806,9 @@ packages: resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} engines: {node: '>=0.6'} - toml@3.0.0: - resolution: {integrity: sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==} + toml@4.3.0: + resolution: {integrity: sha512-lVb8X9BsPVuH0M4BKeS91tXAmJvCjQ5UIyAbQFaxkKGyUFK2RPkhwaFSQH8vbpl1d23eu/IBH+dwVMHWaq9A5A==} + engines: {node: '>=20'} tomlify-j0.4@3.0.0: resolution: {integrity: sha512-2Ulkc8T7mXJ2l0W476YC/A209PR38Nw8PuaCNtk9uI3t1zzFdGQeWYGQvmj2PZkVvRC/Yoi4xQKMRnWc/N29tQ==} @@ -28865,68 +29135,6 @@ packages: unrs-resolver@1.11.1: resolution: {integrity: sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==} - unstorage@1.17.4: - resolution: {integrity: sha512-fHK0yNg38tBiJKp/Vgsq4j0JEsCmgqH58HAn707S7zGkArbZsVr/CwINoi+nh3h98BRCwKvx1K3Xg9u3VV83sw==} - peerDependencies: - '@azure/app-configuration': ^1.8.0 - '@azure/cosmos': ^4.2.0 - '@azure/data-tables': ^13.3.0 - '@azure/identity': ^4.6.0 - '@azure/keyvault-secrets': ^4.9.0 - '@azure/storage-blob': ^12.26.0 - '@capacitor/preferences': ^6 || ^7 || ^8 - '@deno/kv': '>=0.9.0' - '@netlify/blobs': ^6.5.0 || ^7.0.0 || ^8.1.0 || ^9.0.0 || ^10.0.0 - '@planetscale/database': ^1.19.0 - '@upstash/redis': ^1.34.3 - '@vercel/blob': '>=0.27.1' - '@vercel/functions': ^2.2.12 || ^3.0.0 - '@vercel/kv': ^1 || ^2 || ^3 - aws4fetch: ^1.0.20 - db0: '>=0.2.1' - idb-keyval: ^6.2.1 - ioredis: ^5.4.2 - uploadthing: ^7.4.4 - peerDependenciesMeta: - '@azure/app-configuration': - optional: true - '@azure/cosmos': - optional: true - '@azure/data-tables': - optional: true - '@azure/identity': - optional: true - '@azure/keyvault-secrets': - optional: true - '@azure/storage-blob': - optional: true - '@capacitor/preferences': - optional: true - '@deno/kv': - optional: true - '@netlify/blobs': - optional: true - '@planetscale/database': - optional: true - '@upstash/redis': - optional: true - '@vercel/blob': - optional: true - '@vercel/functions': - optional: true - '@vercel/kv': - optional: true - aws4fetch: - optional: true - db0: - optional: true - idb-keyval: - optional: true - ioredis: - optional: true - uploadthing: - optional: true - unstorage@1.17.5: resolution: {integrity: sha512-0i3iqvRfx29hkNntHyQvJTpf5W9dQ9ZadSoRU8+xVlhVtT7jAX57fazYO9EHvcRCfBCyi5YRya7XCDOsbTgkPg==} peerDependencies: @@ -29140,10 +29348,6 @@ packages: until-async@3.0.2: resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==} - untun@0.1.3: - resolution: {integrity: sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ==} - hasBin: true - untun@0.2.2: resolution: {integrity: sha512-+NnOJcSiEtYsVgJmXUzQbJeRAFXJC4yPJYuh6kF9B0Rm6zunXcs/3GZOTllyocSbUDIxD6Bj7e/4ATw7sph1Sw==} hasBin: true @@ -29167,9 +29371,6 @@ packages: peerDependencies: browserslist: '>= 4.21.0' - uqr@0.1.2: - resolution: {integrity: sha512-MJu7ypHq6QasgF5YRTjqscSzQp/W11zoUk6kvmlH+fmWEs63Y0Eib13hYFwAzagRJcVY8WVnlV+eBDUGMJ5IbA==} - uqr@0.1.3: resolution: {integrity: sha512-0rjE8iEJe4YmT9TOhwsZtqCMRLc5DXZUI2UEYUUg63ikBkqqE5EYWaI0etFe/5KUcmcYwLih2RND1kq+hrUJXA==} @@ -29609,6 +29810,9 @@ packages: whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} + when-exit@2.1.5: + resolution: {integrity: sha512-VGkKJ564kzt6Ms1dbgPP/yuIoQCrsFAnRbptpC5wOEsDaNsbCB2bnfnaA8i/vRs5tjUSEOtIuvl9/MyVsvQZCg==} + which-boxed-primitive@1.1.1: resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==} engines: {node: '>= 0.4'} @@ -29784,8 +29988,9 @@ packages: resolution: {integrity: sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==} engines: {node: ^20.19.0 || ^22.12.0 || >=23} - yauzl@2.10.0: - resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==} + yauzl@3.4.0: + resolution: {integrity: sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==} + engines: {node: '>=12'} yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} @@ -29815,6 +30020,10 @@ packages: resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==} engines: {node: '>= 14'} + zip-stream@7.0.5: + resolution: {integrity: sha512-dSvYKdvLsAHCDqPOhIwk/q5CvuWtTB3Dgpoe0uVEFjTzIOAmsQpprX25InCvrvJsirEbu1OHyy67n/kAj1Sw/w==} + engines: {node: '>=18'} + zod@3.25.57: resolution: {integrity: sha512-6tgzLuwVST5oLUxXTmBqoinKMd3JeesgbgseXeFasKKj8Q1FCZrHnbqJOyiEvr4cVAlbug+CgIsmJ8cl/pU5FA==} @@ -30545,17 +30754,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/types@7.28.4': - dependencies: - '@babel/helper-string-parser': 7.29.7 - '@babel/helper-validator-identifier': 7.29.7 - '@babel/types@7.29.8': dependencies: '@babel/helper-string-parser': 7.29.7 '@babel/helper-validator-identifier': 7.29.7 - '@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0)': + '@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0)': dependencies: '@better-auth/utils': 0.4.2 '@better-fetch/fetch': 1.3.1 @@ -30566,40 +30770,42 @@ snapshots: kysely: 0.29.2 nanostores: 1.3.0 zod: 4.5.4 + optionalDependencies: + '@opentelemetry/api': 1.9.1 - '@better-auth/drizzle-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)': + '@better-auth/drizzle-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)': dependencies: - '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) + '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) '@better-auth/utils': 0.4.2 - '@better-auth/kysely-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(kysely@0.29.2)': + '@better-auth/kysely-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(kysely@0.29.2)': dependencies: - '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) + '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) '@better-auth/utils': 0.4.2 optionalDependencies: kysely: 0.29.2 - '@better-auth/memory-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)': + '@better-auth/memory-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)': dependencies: - '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) + '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) '@better-auth/utils': 0.4.2 - '@better-auth/mongo-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)': + '@better-auth/mongo-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)': dependencies: - '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) + '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) '@better-auth/utils': 0.4.2 - '@better-auth/prisma-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))': + '@better-auth/prisma-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))': dependencies: - '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) + '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) '@better-auth/utils': 0.4.2 optionalDependencies: '@prisma/client': 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) prisma: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@better-auth/telemetry@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)': + '@better-auth/telemetry@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)': dependencies: - '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) + '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) '@better-auth/utils': 0.4.2 '@better-fetch/fetch': 1.3.1 @@ -30960,7 +31166,7 @@ snapshots: '@codspeed/core': 5.5.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2) tinybench: 2.9.0 vite: 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.9.0) - vitest: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) transitivePeerDependencies: - debug - supports-color @@ -30970,9 +31176,9 @@ snapshots: '@colors/colors@1.6.0': {} - '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: - better-auth: 1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) + better-auth: 1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)) common-tags: 1.8.2 convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) convex-helpers: 0.1.104(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react@19.2.3)(zod@3.25.76) @@ -31076,6 +31282,8 @@ snapshots: dependencies: '@electric-sql/pglite': 0.3.2 + '@electric-sql/pglite@0.3.16': {} + '@electric-sql/pglite@0.3.2': {} '@emnapi/core@1.10.0': @@ -31241,6 +31449,9 @@ snapshots: '@esbuild/aix-ppc64@0.27.4': optional: true + '@esbuild/aix-ppc64@0.28.1': + optional: true + '@esbuild/aix-ppc64@0.28.2': optional: true @@ -31259,6 +31470,9 @@ snapshots: '@esbuild/android-arm64@0.27.4': optional: true + '@esbuild/android-arm64@0.28.1': + optional: true + '@esbuild/android-arm64@0.28.2': optional: true @@ -31277,6 +31491,9 @@ snapshots: '@esbuild/android-arm@0.27.4': optional: true + '@esbuild/android-arm@0.28.1': + optional: true + '@esbuild/android-arm@0.28.2': optional: true @@ -31295,6 +31512,9 @@ snapshots: '@esbuild/android-x64@0.27.4': optional: true + '@esbuild/android-x64@0.28.1': + optional: true + '@esbuild/android-x64@0.28.2': optional: true @@ -31313,6 +31533,9 @@ snapshots: '@esbuild/darwin-arm64@0.27.4': optional: true + '@esbuild/darwin-arm64@0.28.1': + optional: true + '@esbuild/darwin-arm64@0.28.2': optional: true @@ -31331,6 +31554,9 @@ snapshots: '@esbuild/darwin-x64@0.27.4': optional: true + '@esbuild/darwin-x64@0.28.1': + optional: true + '@esbuild/darwin-x64@0.28.2': optional: true @@ -31349,6 +31575,9 @@ snapshots: '@esbuild/freebsd-arm64@0.27.4': optional: true + '@esbuild/freebsd-arm64@0.28.1': + optional: true + '@esbuild/freebsd-arm64@0.28.2': optional: true @@ -31367,6 +31596,9 @@ snapshots: '@esbuild/freebsd-x64@0.27.4': optional: true + '@esbuild/freebsd-x64@0.28.1': + optional: true + '@esbuild/freebsd-x64@0.28.2': optional: true @@ -31385,6 +31617,9 @@ snapshots: '@esbuild/linux-arm64@0.27.4': optional: true + '@esbuild/linux-arm64@0.28.1': + optional: true + '@esbuild/linux-arm64@0.28.2': optional: true @@ -31403,6 +31638,9 @@ snapshots: '@esbuild/linux-arm@0.27.4': optional: true + '@esbuild/linux-arm@0.28.1': + optional: true + '@esbuild/linux-arm@0.28.2': optional: true @@ -31421,6 +31659,9 @@ snapshots: '@esbuild/linux-ia32@0.27.4': optional: true + '@esbuild/linux-ia32@0.28.1': + optional: true + '@esbuild/linux-ia32@0.28.2': optional: true @@ -31439,6 +31680,9 @@ snapshots: '@esbuild/linux-loong64@0.27.4': optional: true + '@esbuild/linux-loong64@0.28.1': + optional: true + '@esbuild/linux-loong64@0.28.2': optional: true @@ -31457,6 +31701,9 @@ snapshots: '@esbuild/linux-mips64el@0.27.4': optional: true + '@esbuild/linux-mips64el@0.28.1': + optional: true + '@esbuild/linux-mips64el@0.28.2': optional: true @@ -31475,6 +31722,9 @@ snapshots: '@esbuild/linux-ppc64@0.27.4': optional: true + '@esbuild/linux-ppc64@0.28.1': + optional: true + '@esbuild/linux-ppc64@0.28.2': optional: true @@ -31493,6 +31743,9 @@ snapshots: '@esbuild/linux-riscv64@0.27.4': optional: true + '@esbuild/linux-riscv64@0.28.1': + optional: true + '@esbuild/linux-riscv64@0.28.2': optional: true @@ -31511,6 +31764,9 @@ snapshots: '@esbuild/linux-s390x@0.27.4': optional: true + '@esbuild/linux-s390x@0.28.1': + optional: true + '@esbuild/linux-s390x@0.28.2': optional: true @@ -31529,6 +31785,9 @@ snapshots: '@esbuild/linux-x64@0.27.4': optional: true + '@esbuild/linux-x64@0.28.1': + optional: true + '@esbuild/linux-x64@0.28.2': optional: true @@ -31544,6 +31803,9 @@ snapshots: '@esbuild/netbsd-arm64@0.27.4': optional: true + '@esbuild/netbsd-arm64@0.28.1': + optional: true + '@esbuild/netbsd-arm64@0.28.2': optional: true @@ -31562,6 +31824,9 @@ snapshots: '@esbuild/netbsd-x64@0.27.4': optional: true + '@esbuild/netbsd-x64@0.28.1': + optional: true + '@esbuild/netbsd-x64@0.28.2': optional: true @@ -31580,6 +31845,9 @@ snapshots: '@esbuild/openbsd-arm64@0.27.4': optional: true + '@esbuild/openbsd-arm64@0.28.1': + optional: true + '@esbuild/openbsd-arm64@0.28.2': optional: true @@ -31598,6 +31866,9 @@ snapshots: '@esbuild/openbsd-x64@0.27.4': optional: true + '@esbuild/openbsd-x64@0.28.1': + optional: true + '@esbuild/openbsd-x64@0.28.2': optional: true @@ -31610,6 +31881,9 @@ snapshots: '@esbuild/openharmony-arm64@0.27.4': optional: true + '@esbuild/openharmony-arm64@0.28.1': + optional: true + '@esbuild/openharmony-arm64@0.28.2': optional: true @@ -31628,6 +31902,9 @@ snapshots: '@esbuild/sunos-x64@0.27.4': optional: true + '@esbuild/sunos-x64@0.28.1': + optional: true + '@esbuild/sunos-x64@0.28.2': optional: true @@ -31646,6 +31923,9 @@ snapshots: '@esbuild/win32-arm64@0.27.4': optional: true + '@esbuild/win32-arm64@0.28.1': + optional: true + '@esbuild/win32-arm64@0.28.2': optional: true @@ -31664,6 +31944,9 @@ snapshots: '@esbuild/win32-ia32@0.27.4': optional: true + '@esbuild/win32-ia32@0.28.1': + optional: true + '@esbuild/win32-ia32@0.28.2': optional: true @@ -31682,6 +31965,9 @@ snapshots: '@esbuild/win32-x64@0.27.4': optional: true + '@esbuild/win32-x64@0.28.1': + optional: true + '@esbuild/win32-x64@0.28.2': optional: true @@ -32271,12 +32557,7 @@ snapshots: '@humanwhocodes/retry@0.4.2': {} - '@iarna/toml@2.2.5': {} - - '@img/colour@1.0.0': {} - - '@img/colour@1.1.0': - optional: true + '@img/colour@1.1.0': {} '@img/sharp-darwin-arm64@0.34.5': optionalDependencies: @@ -33001,13 +33282,6 @@ snapshots: '@tybys/wasm-util': 0.10.2 optional: true - '@napi-rs/wasm-runtime@1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@tybys/wasm-util': 0.10.3 - optional: true - '@napi-rs/wasm-runtime@1.1.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)': dependencies: '@emnapi/core': 1.11.1 @@ -33015,6 +33289,13 @@ snapshots: '@tybys/wasm-util': 0.10.3 optional: true + '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': + dependencies: + '@emnapi/core': 1.10.0 + '@emnapi/runtime': 1.10.0 + '@tybys/wasm-util': 0.10.3 + optional: true + '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': dependencies: '@emnapi/core': 1.11.3 @@ -33024,11 +33305,14 @@ snapshots: '@neon-rs/load@0.0.4': {} - '@netlify/api@14.0.7': + '@netlify/ai@1.0.1': dependencies: - '@netlify/open-api': 2.40.0 + '@netlify/api': 15.1.2 + + '@netlify/api@15.1.2': + dependencies: + '@netlify/open-api': 2.57.1 node-fetch: 3.3.2 - p-wait-for: 5.0.2 picoquery: 2.5.0 '@netlify/binary-info@1.0.0': {} @@ -33037,19 +33321,27 @@ snapshots: dependencies: '@netlify/dev-utils': 4.3.0 '@netlify/runtime-utils': 2.2.0 + optional: true - '@netlify/cache@3.3.0': + '@netlify/blobs@11.0.3(supports-color@10.2.2)': dependencies: - '@netlify/runtime-utils': 2.2.0 + '@netlify/dev-utils': 6.0.1 + '@netlify/otel': 7.0.2(supports-color@10.2.2) + '@netlify/runtime-utils': 3.0.0 + transitivePeerDependencies: + - supports-color - '@netlify/config@23.2.0': + '@netlify/cache@4.0.0': dependencies: - '@iarna/toml': 2.2.5 - '@netlify/api': 14.0.7 - '@netlify/headers-parser': 9.0.2 - '@netlify/redirect-parser': 15.0.3 - chalk: 5.6.2 - cron-parser: 4.9.0 + '@netlify/runtime-utils': 3.0.0 + + '@netlify/config@25.2.5': + dependencies: + '@netlify/api': 15.1.2 + '@netlify/headers-parser': 10.1.1 + '@netlify/redirect-parser': 16.1.1 + chalk: 6.0.0 + cron-parser: 5.10.1 deepmerge: 4.3.1 dot-prop: 9.0.0 execa: 8.0.1 @@ -33060,14 +33352,20 @@ snapshots: indent-string: 5.0.0 is-plain-obj: 4.1.0 map-obj: 5.0.2 - omit.js: 2.0.2 p-locate: 6.0.0 path-type: 6.0.0 read-package-up: 11.0.0 + smol-toml: 1.6.1 tomlify-j0.4: 3.0.0 validate-npm-package-name: 5.0.1 yaml: 2.9.0 yargs: 17.7.2 + zod: 4.5.4 + + '@netlify/database-dev@1.0.1': + dependencies: + '@electric-sql/pglite': 0.3.16 + pg-gateway: 0.3.0-beta.4 '@netlify/dev-utils@4.3.0': dependencies: @@ -33086,19 +33384,37 @@ snapshots: tmp-promise: 3.0.3 uuid: 11.1.0 write-file-atomic: 5.0.1 + optional: true - '@netlify/dev@4.6.3(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)': + '@netlify/dev-utils@6.0.1': dependencies: - '@netlify/blobs': 10.1.0 - '@netlify/config': 23.2.0 - '@netlify/dev-utils': 4.3.0 - '@netlify/edge-functions-dev': 1.0.0 - '@netlify/functions-dev': 1.0.0(rollup@4.63.1)(supports-color@10.2.2) - '@netlify/headers': 2.1.0 - '@netlify/images': 1.3.0(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) - '@netlify/redirects': 3.1.0 - '@netlify/runtime': 4.1.1 - '@netlify/static': 3.1.0 + '@whatwg-node/server': 0.11.0 + ansis: 4.3.1 + atomically: 2.1.1 + chokidar: 5.0.0 + decache: 4.6.2 + dettle: 1.0.5 + dot-prop: 9.0.0 + empathic: 2.0.0 + env-paths: 3.0.0 + parse-gitignore: 2.0.0 + semver: 7.8.5 + + '@netlify/dev@5.1.0(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)': + dependencies: + '@netlify/ai': 1.0.1 + '@netlify/blobs': 11.0.3(supports-color@10.2.2) + '@netlify/config': 25.2.5 + '@netlify/database-dev': 1.0.1 + '@netlify/dev-utils': 6.0.1 + '@netlify/edge-functions-dev': 2.0.1 + '@netlify/functions-dev': 2.0.5(rollup@4.63.1)(supports-color@10.2.2) + '@netlify/headers': 3.0.1 + '@netlify/images': 2.0.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) + '@netlify/redirects': 4.0.2 + '@netlify/runtime': 5.0.3(supports-color@10.2.2) + '@netlify/server-dev': 0.1.1 + '@netlify/static': 4.0.0 ulid: 3.0.1 transitivePeerDependencies: - '@azure/app-configuration' @@ -33109,6 +33425,7 @@ snapshots: - '@azure/storage-blob' - '@capacitor/preferences' - '@deno/kv' + - '@parcel/watcher' - '@planetscale/database' - '@upstash/redis' - '@vercel/blob' @@ -33122,62 +33439,60 @@ snapshots: - idb-keyval - ioredis - rollup + - srvx - supports-color - uploadthing - '@netlify/edge-bundler@14.7.0': + '@netlify/edge-bundler@16.0.4': dependencies: '@import-maps/resolve': 2.0.0 + '@sveltejs/acorn-typescript': 1.0.13(acorn@8.18.0) + acorn: 8.18.0 ajv: 8.18.0 ajv-errors: 3.0.0(ajv@8.18.0) better-ajv-errors: 1.2.0(ajv@8.18.0) common-path-prefix: 3.0.0 - env-paths: 3.0.0 - esbuild: 0.25.10 + esbuild: 0.28.1 execa: 8.0.1 find-up: 7.0.0 - get-port: 7.1.0 node-stream-zip: 1.15.0 p-retry: 6.2.1 - p-wait-for: 5.0.2 parse-imports: 2.2.1 - path-key: 4.0.0 semver: 7.8.5 - tar: 7.4.3 + tar: 7.5.22 tmp-promise: 3.0.3 urlpattern-polyfill: 8.0.2 - uuid: 11.1.0 '@netlify/edge-functions-bootstrap@2.16.0': {} - '@netlify/edge-functions-dev@1.0.0': + '@netlify/edge-functions-dev@2.0.1': dependencies: - '@netlify/dev-utils': 4.3.0 - '@netlify/edge-bundler': 14.7.0 - '@netlify/edge-functions': 3.0.0 + '@netlify/dev-utils': 6.0.1 + '@netlify/edge-bundler': 16.0.4 + '@netlify/edge-functions': 4.0.0 '@netlify/edge-functions-bootstrap': 2.16.0 - '@netlify/runtime-utils': 2.2.0 + '@netlify/runtime-utils': 3.0.0 get-port: 7.1.0 - '@netlify/edge-functions@3.0.0': + '@netlify/edge-functions@4.0.0': dependencies: - '@netlify/types': 2.1.0 + '@netlify/types': 3.0.0 - '@netlify/functions-dev@1.0.0(rollup@4.63.1)(supports-color@10.2.2)': + '@netlify/functions-dev@2.0.5(rollup@4.63.1)(supports-color@10.2.2)': dependencies: - '@netlify/blobs': 10.1.0 - '@netlify/dev-utils': 4.3.0 - '@netlify/functions': 5.0.0 - '@netlify/zip-it-and-ship-it': 14.1.11(rollup@4.63.1)(supports-color@10.2.2) - cron-parser: 4.9.0 + '@netlify/blobs': 11.0.3(supports-color@10.2.2) + '@netlify/dev-utils': 6.0.1 + '@netlify/functions': 6.0.0 + '@netlify/zip-it-and-ship-it': 15.5.1(rollup@4.63.1)(supports-color@10.2.2) + cron-parser: 5.10.1 decache: 4.6.2 - extract-zip: 2.0.1(supports-color@10.2.2) is-stream: 4.0.1 jwt-decode: 4.0.0 lambda-local: 2.2.0 - read-package-up: 11.0.0 + read-package-up: 12.0.0 semver: 7.8.5 source-map-support: 0.5.21 + yauzl: 3.4.0 transitivePeerDependencies: - bare-abort-controller - bare-buffer @@ -33185,26 +33500,22 @@ snapshots: - rollup - supports-color - '@netlify/functions@5.0.0': + '@netlify/functions@6.0.0': dependencies: - '@netlify/types': 2.1.0 + '@netlify/types': 3.0.0 - '@netlify/headers-parser@9.0.2': + '@netlify/headers-parser@10.1.1': dependencies: - '@iarna/toml': 2.2.5 escape-string-regexp: 5.0.0 - fast-safe-stringify: 2.1.1 - is-plain-obj: 4.1.0 - map-obj: 5.0.2 - path-exists: 5.0.0 + smol-toml: 1.6.1 - '@netlify/headers@2.1.0': + '@netlify/headers@3.0.1': dependencies: - '@netlify/headers-parser': 9.0.2 + '@netlify/headers-parser': 10.1.1 - '@netlify/images@1.3.0(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))': + '@netlify/images@2.0.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))': dependencies: - ipx: 3.1.1(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) + ipx: 3.1.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -33215,6 +33526,7 @@ snapshots: - '@capacitor/preferences' - '@deno/kv' - '@netlify/blobs' + - '@parcel/watcher' - '@planetscale/database' - '@upstash/redis' - '@vercel/blob' @@ -33224,45 +33536,73 @@ snapshots: - db0 - idb-keyval - ioredis + - srvx - uploadthing - '@netlify/open-api@2.40.0': {} + '@netlify/open-api@2.57.1': {} - '@netlify/redirect-parser@15.0.3': + '@netlify/otel@7.0.2(supports-color@10.2.2)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1) + '@opentelemetry/instrumentation': 0.221.0(@opentelemetry/api@1.9.1)(supports-color@10.2.2) + '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-trace-node': 2.10.0(@opentelemetry/api@1.9.1) + transitivePeerDependencies: + - supports-color + + '@netlify/redirect-parser@16.1.1': dependencies: - '@iarna/toml': 2.2.5 fast-safe-stringify: 2.1.1 - is-plain-obj: 4.1.0 - path-exists: 5.0.0 + smol-toml: 1.6.1 - '@netlify/redirects@3.1.0': + '@netlify/redirects@4.0.2': dependencies: - '@netlify/dev-utils': 4.3.0 - '@netlify/redirect-parser': 15.0.3 - cookie: 1.0.2 - jsonwebtoken: 9.0.2 + '@netlify/dev-utils': 6.0.1 + '@netlify/redirect-parser': 16.1.1 + cookie: 2.0.1 + jsonwebtoken: 9.0.3 netlify-redirector: 0.5.0 - '@netlify/runtime-utils@2.2.0': {} + '@netlify/runtime-utils@2.2.0': + optional: true - '@netlify/runtime@4.1.1': + '@netlify/runtime-utils@3.0.0': {} + + '@netlify/runtime@5.0.3(supports-color@10.2.2)': dependencies: - '@netlify/blobs': 10.1.0 - '@netlify/cache': 3.3.0 - '@netlify/runtime-utils': 2.2.0 - '@netlify/types': 2.1.0 + '@netlify/blobs': 11.0.3(supports-color@10.2.2) + '@netlify/cache': 4.0.0 + '@netlify/runtime-utils': 3.0.0 + '@netlify/types': 3.0.0 + transitivePeerDependencies: + - supports-color - '@netlify/serverless-functions-api@2.7.1': {} + '@netlify/server-dev@0.1.1': + dependencies: + '@netlify/dev-utils': 6.0.1 + '@netlify/serverless-functions-api': 2.21.2 + get-port: 7.1.0 - '@netlify/static@3.1.0': + '@netlify/serverless-functions-api@2.18.0': + dependencies: + '@netlify/types': 2.8.0 + + '@netlify/serverless-functions-api@2.21.2': + dependencies: + '@netlify/types': 2.8.0 + + '@netlify/static@4.0.0': dependencies: mime-types: 3.0.2 - '@netlify/types@2.1.0': {} + '@netlify/types@2.8.0': {} - '@netlify/vite-plugin-tanstack-start@1.1.4(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0))': + '@netlify/types@3.0.0': {} + + '@netlify/vite-plugin-tanstack-start@1.3.19(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0))': dependencies: - '@netlify/vite-plugin': 2.7.4(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + '@netlify/vite-plugin': 3.0.1(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) vite: 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.9.0) optionalDependencies: '@tanstack/solid-start': link:packages/solid-start @@ -33275,6 +33615,7 @@ snapshots: - '@azure/storage-blob' - '@capacitor/preferences' - '@deno/kv' + - '@parcel/watcher' - '@planetscale/database' - '@upstash/redis' - '@vercel/blob' @@ -33289,14 +33630,15 @@ snapshots: - idb-keyval - ioredis - rollup + - srvx - supports-color - uploadthing - '@netlify/vite-plugin@2.7.4(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0))': + '@netlify/vite-plugin@3.0.1(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0))': dependencies: - '@netlify/dev': 4.6.3(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2) - '@netlify/dev-utils': 4.3.0 - dedent: 1.7.0(babel-plugin-macros@3.1.0) + '@netlify/dev': 5.1.0(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2) + '@netlify/dev-utils': 6.0.1 + dedent: 1.7.2(babel-plugin-macros@3.1.0) vite: 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.9.0) transitivePeerDependencies: - '@azure/app-configuration' @@ -33307,6 +33649,7 @@ snapshots: - '@azure/storage-blob' - '@capacitor/preferences' - '@deno/kv' + - '@parcel/watcher' - '@planetscale/database' - '@upstash/redis' - '@vercel/blob' @@ -33321,21 +33664,23 @@ snapshots: - idb-keyval - ioredis - rollup + - srvx - supports-color - uploadthing - '@netlify/zip-it-and-ship-it@14.1.11(rollup@4.63.1)(supports-color@10.2.2)': + '@netlify/zip-it-and-ship-it@15.5.1(rollup@4.63.1)(supports-color@10.2.2)': dependencies: '@babel/parser': 7.29.8 - '@babel/types': 7.28.4 + '@babel/types': 7.29.8 '@netlify/binary-info': 1.0.0 - '@netlify/serverless-functions-api': 2.7.1 - '@vercel/nft': 0.29.4(rollup@4.63.1)(supports-color@10.2.2) - archiver: 7.0.1 + '@netlify/serverless-functions-api': 2.18.0 + '@opentelemetry/api': 1.8.0 + '@vercel/nft': 1.3.1(rollup@4.63.1)(supports-color@10.2.2) + archiver: 8.0.0 common-path-prefix: 3.0.0 copy-file: 11.1.0 es-module-lexer: 1.7.0 - esbuild: 0.25.10 + esbuild: 0.28.1 execa: 8.0.1 fast-glob: 3.3.3 filter-obj: 6.1.0 @@ -33344,7 +33689,7 @@ snapshots: junk: 4.0.1 locate-path: 7.2.0 merge-options: 3.0.4 - minimatch: 9.0.9 + minimatch: 10.2.5 normalize-path: 3.0.0 p-map: 7.0.3 path-exists: 5.0.0 @@ -33353,11 +33698,11 @@ snapshots: resolve: 2.0.0-next.5 semver: 7.8.5 tmp-promise: 3.0.3 - toml: 3.0.0 + toml: 4.3.0 unixify: 1.0.0 urlpattern-polyfill: 8.0.2 yargs: 17.7.2 - zod: 3.25.76 + zod: 4.5.4 transitivePeerDependencies: - bare-abort-controller - bare-buffer @@ -33478,6 +33823,60 @@ snapshots: '@open-draft/until@2.1.0': {} + '@opentelemetry/api-logs@0.221.0': + dependencies: + '@opentelemetry/api': 1.9.1 + + '@opentelemetry/api@1.8.0': {} + + '@opentelemetry/api@1.9.1': {} + + '@opentelemetry/context-async-hooks@2.10.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + + '@opentelemetry/core@2.10.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/semantic-conventions': 1.41.1 + + '@opentelemetry/instrumentation@0.221.0(@opentelemetry/api@1.9.1)(supports-color@10.2.2)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/api-logs': 0.221.0 + import-in-the-middle: 3.5.1 + require-in-the-middle: 8.0.1(supports-color@10.2.2) + transitivePeerDependencies: + - supports-color + + '@opentelemetry/resources@2.10.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1) + '@opentelemetry/semantic-conventions': 1.41.1 + + '@opentelemetry/sdk-trace-base@2.10.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1) + '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-trace': 2.10.0(@opentelemetry/api@1.9.1) + '@opentelemetry/semantic-conventions': 1.41.1 + + '@opentelemetry/sdk-trace-node@2.10.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/context-async-hooks': 2.10.0(@opentelemetry/api@1.9.1) + '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-trace-base': 2.10.0(@opentelemetry/api@1.9.1) + + '@opentelemetry/sdk-trace@2.10.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1) + '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1) + '@opentelemetry/semantic-conventions': 1.41.1 + '@opentelemetry/semantic-conventions@1.41.1': {} '@oxc-minify/binding-android-arm-eabi@0.110.0': @@ -33711,11 +34110,6 @@ snapshots: '@parcel/watcher-linux-x64-musl@2.5.1': optional: true - '@parcel/watcher-wasm@2.5.1': - dependencies: - is-glob: 4.0.3 - micromatch: 4.0.8 - '@parcel/watcher-wasm@2.6.0': dependencies: is-glob: 4.0.3 @@ -33750,6 +34144,7 @@ snapshots: '@parcel/watcher-win32-arm64': 2.5.1 '@parcel/watcher-win32-ia32': 2.5.1 '@parcel/watcher-win32-x64': 2.5.1 + optional: true '@peculiar/asn1-cms@2.7.0': dependencies: @@ -34802,7 +35197,7 @@ snapshots: dependencies: '@emnapi/core': 1.10.0 '@emnapi/runtime': 1.10.0 - '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) + '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) optional: true '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.9': @@ -35718,6 +36113,10 @@ snapshots: - bufferutil - utf-8-validate + '@sveltejs/acorn-typescript@1.0.13(acorn@8.18.0)': + dependencies: + acorn: 8.18.0 + '@swc-node/core@1.14.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)': dependencies: '@swc/core': 1.15.33(@swc/helpers@0.5.23) @@ -36158,18 +36557,6 @@ snapshots: - supports-color - typescript - '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0))': - dependencies: - vite: 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.9.0) - vite-plugin-dts: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) - vite-plugin-externalize-deps: 0.10.0(vite@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.9.0)) - vite-tsconfig-paths: 6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) - transitivePeerDependencies: - - '@types/node' - - rollup - - supports-color - - typescript - '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) @@ -36553,11 +36940,6 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.3 - '@types/yauzl@2.10.3': - dependencies: - '@types/node': 25.0.9 - optional: true - '@typescript-eslint/eslint-plugin@8.44.1(@typescript-eslint/parser@8.44.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)': dependencies: '@eslint-community/regexpp': 4.12.1 @@ -37208,7 +37590,7 @@ snapshots: '@unrs/resolver-binding-win32-x64-msvc@1.11.1': optional: true - '@vercel/nft@0.29.4(rollup@4.63.1)(supports-color@10.2.2)': + '@vercel/nft@1.11.0(rollup@4.63.1)(supports-color@10.2.2)': dependencies: '@mapbox/node-pre-gyp': 2.0.0(supports-color@10.2.2) '@rollup/pluginutils': 5.1.4(rollup@4.63.1) @@ -37217,7 +37599,7 @@ snapshots: async-sema: 3.1.1 bindings: 1.5.0 estree-walker: 2.0.2 - glob: 10.5.0 + glob: 13.0.0 graceful-fs: 4.2.11 node-gyp-build: 4.8.4 picomatch: 4.0.7 @@ -37227,12 +37609,12 @@ snapshots: - rollup - supports-color - '@vercel/nft@1.11.0(rollup@4.63.1)(supports-color@10.2.2)': + '@vercel/nft@1.3.1(rollup@4.63.1)(supports-color@10.2.2)': dependencies: '@mapbox/node-pre-gyp': 2.0.0(supports-color@10.2.2) '@rollup/pluginutils': 5.1.4(rollup@4.63.1) - acorn: 8.15.0 - acorn-import-attributes: 1.9.5(acorn@8.15.0) + acorn: 8.18.0 + acorn-import-attributes: 1.9.5(acorn@8.18.0) async-sema: 3.1.1 bindings: 1.5.0 estree-walker: 2.0.2 @@ -37447,31 +37829,22 @@ snapshots: msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) vite: 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.9.0) - '@vitest/mocker@4.1.4(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0))': + '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@vitest/spy': 4.1.4 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - msw: 2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) - vite: 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.9.0) - - '@vitest/mocker@4.1.4(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': - dependencies: - '@vitest/spy': 4.1.4 - estree-walker: 3.0.3 - magic-string: 0.30.21 - optionalDependencies: - msw: 2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) + msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - '@vitest/mocker@4.1.4(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@vitest/spy': 4.1.4 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - msw: 2.7.0(@types/node@25.0.9)(typescript@5.9.2) + msw: 2.15.0(@types/node@25.0.9)(typescript@5.9.2) vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) '@vitest/pretty-format@4.1.4': @@ -37501,7 +37874,7 @@ snapshots: sirv: 3.0.2 tinyglobby: 0.2.17 tinyrainbow: 3.1.0 - vitest: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) '@vitest/utils@4.1.4': dependencies: @@ -37668,7 +38041,7 @@ snapshots: '@vue/shared': 3.5.25 estree-walker: 2.0.2 magic-string: 0.30.21 - postcss: 8.5.15 + postcss: 8.5.23 source-map-js: 1.2.1 '@vue/compiler-ssr@3.5.25': @@ -37888,6 +38261,12 @@ snapshots: dependencies: '@whatwg-node/node-fetch': 0.8.1 urlpattern-polyfill: 10.1.0 + optional: true + + '@whatwg-node/fetch@0.10.13': + dependencies: + '@whatwg-node/node-fetch': 0.8.6 + urlpattern-polyfill: 10.1.0 '@whatwg-node/node-fetch@0.8.1': dependencies: @@ -37895,6 +38274,14 @@ snapshots: '@whatwg-node/disposablestack': 0.0.6 '@whatwg-node/promise-helpers': 1.3.2 tslib: 2.8.1 + optional: true + + '@whatwg-node/node-fetch@0.8.6': + dependencies: + '@fastify/busboy': 3.1.1 + '@whatwg-node/disposablestack': 0.0.6 + '@whatwg-node/promise-helpers': 1.3.2 + tslib: 2.8.1 '@whatwg-node/promise-helpers@1.3.2': dependencies: @@ -37907,6 +38294,15 @@ snapshots: '@whatwg-node/fetch': 0.10.11 '@whatwg-node/promise-helpers': 1.3.2 tslib: 2.8.1 + optional: true + + '@whatwg-node/server@0.11.0': + dependencies: + '@envelop/instrumentation': 1.0.0 + '@whatwg-node/disposablestack': 0.0.6 + '@whatwg-node/fetch': 0.10.13 + '@whatwg-node/promise-helpers': 1.3.2 + tslib: 2.8.1 '@workos-inc/node@8.0.0': dependencies: @@ -37961,6 +38357,10 @@ snapshots: dependencies: acorn: 8.15.0 + acorn-import-attributes@1.9.5(acorn@8.18.0): + dependencies: + acorn: 8.18.0 + acorn-jsx@5.3.2(acorn@8.15.0): dependencies: acorn: 8.15.0 @@ -38107,6 +38507,21 @@ snapshots: - bare-abort-controller - bare-buffer + archiver@8.0.0: + dependencies: + async: 3.2.6 + buffer-crc32: 1.0.0 + is-stream: 4.0.1 + lazystream: 1.0.1 + normalize-path: 3.0.0 + readable-stream: 4.7.0 + readdir-glob: 3.0.0 + tar-stream: 3.2.0 + zip-stream: 7.0.5 + transitivePeerDependencies: + - bare-abort-controller + - bare-buffer + argparse@1.0.10: dependencies: sprintf-js: 1.0.3 @@ -38163,6 +38578,11 @@ snapshots: atomic-sleep@1.0.0: {} + atomically@2.1.1: + dependencies: + stubborn-fs: 2.0.0 + when-exit: 2.1.5 + autocannon@8.0.0: dependencies: '@minimistjs/subarg': 1.0.0 @@ -38341,8 +38761,6 @@ snapshots: baseline-browser-mapping@2.11.23: {} - baseline-browser-mapping@2.9.8: {} - batch@0.6.1: {} better-ajv-errors@1.2.0(ajv@8.18.0): @@ -38354,15 +38772,15 @@ snapshots: jsonpointer: 5.0.1 leven: 3.1.0 - better-auth@1.6.19(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)): + better-auth@1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)): dependencies: - '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) - '@better-auth/drizzle-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2) - '@better-auth/kysely-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(kysely@0.29.2) - '@better-auth/memory-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2) - '@better-auth/mongo-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2) - '@better-auth/prisma-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) - '@better-auth/telemetry': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1) + '@better-auth/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0) + '@better-auth/drizzle-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2) + '@better-auth/kysely-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(kysely@0.29.2) + '@better-auth/memory-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2) + '@better-auth/mongo-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2) + '@better-auth/prisma-adapter': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) + '@better-auth/telemetry': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(@opentelemetry/api@1.9.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0))(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1) '@better-auth/utils': 0.4.2 '@better-fetch/fetch': 1.3.1 '@noble/ciphers': 2.2.0 @@ -38377,12 +38795,12 @@ snapshots: '@prisma/client': 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) '@tanstack/solid-start': link:packages/solid-start mysql2: 3.15.3 - next: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) + next: 16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2) prisma: 7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) react: 19.2.3 react-dom: 19.2.3(react@19.2.3) solid-js: 1.9.12 - vitest: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) vue: 3.5.25(@typescript/typescript6@6.0.2) transitivePeerDependencies: - '@cloudflare/workers-types' @@ -38485,14 +38903,12 @@ snapshots: browserslist@4.28.1: dependencies: - baseline-browser-mapping: 2.9.8 + baseline-browser-mapping: 2.11.23 caniuse-lite: 1.0.30001760 electron-to-chromium: 1.5.267 node-releases: 2.0.27 update-browserslist-db: 1.2.3(browserslist@4.28.1) - buffer-crc32@0.2.13: {} - buffer-crc32@1.0.0: {} buffer-equal-constant-time@1.0.1: {} @@ -38598,6 +39014,8 @@ snapshots: chalk@5.6.2: {} + chalk@6.0.0: {} + char-regex@1.0.2: {} char-spinner@1.0.1: {} @@ -38668,6 +39086,8 @@ snapshots: cjs-module-lexer@1.4.3: {} + cjs-module-lexer@2.2.1: {} + classnames@2.5.1: {} clean-css@5.3.3: @@ -38701,12 +39121,6 @@ snapshots: client-only@0.0.1: {} - clipboardy@4.0.0: - dependencies: - execa: 8.0.1 - is-wsl: 3.1.1 - is64bit: 2.0.0 - cliui@7.0.4: dependencies: string-width: 4.2.3 @@ -38806,6 +39220,14 @@ snapshots: normalize-path: 3.0.0 readable-stream: 4.7.0 + compress-commons@7.0.1: + dependencies: + crc-32: 1.2.2 + crc32-stream: 7.0.1 + is-stream: 4.0.1 + normalize-path: 3.0.0 + readable-stream: 4.7.0 + compressible@2.0.18: dependencies: mime-db: 1.54.0 @@ -38930,8 +39352,6 @@ snapshots: '@clerk/clerk-react': 5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3) react: 19.2.3 - cookie-es@1.2.2: {} - cookie-es@1.2.3: {} cookie-es@2.0.1: {} @@ -38981,7 +39401,12 @@ snapshots: crc-32: 1.2.2 readable-stream: 4.7.0 - cron-parser@4.9.0: + crc32-stream@7.0.1: + dependencies: + crc-32: 1.2.2 + readable-stream: 4.7.0 + + cron-parser@5.10.1: dependencies: luxon: 3.7.2 @@ -39111,6 +39536,12 @@ snapshots: dependencies: '@babel/runtime': 7.26.7 + db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3): + optionalDependencies: + '@electric-sql/pglite': 0.3.16 + '@libsql/client': 0.15.15 + mysql2: 3.15.3 + db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3): optionalDependencies: '@electric-sql/pglite': 0.3.2 @@ -39147,7 +39578,7 @@ snapshots: optionalDependencies: babel-plugin-macros: 3.1.0 - dedent@1.7.0(babel-plugin-macros@3.1.0): + dedent@1.7.2(babel-plugin-macros@3.1.0): optionalDependencies: babel-plugin-macros: 3.1.0 @@ -39232,7 +39663,8 @@ snapshots: detect-indent@6.1.0: {} - detect-libc@1.0.3: {} + detect-libc@1.0.3: + optional: true detect-libc@2.0.2: {} @@ -39258,11 +39690,11 @@ snapshots: dependencies: node-source-walk: 7.0.1 - detective-postcss@7.0.1(postcss@8.5.15): + detective-postcss@7.0.1(postcss@8.5.23): dependencies: is-url: 1.2.4 - postcss: 8.5.15 - postcss-values-parser: 6.0.2(postcss@8.5.15) + postcss: 8.5.23 + postcss-values-parser: 6.0.2(postcss@8.5.23) detective-sass@6.0.1: dependencies: @@ -39522,6 +39954,8 @@ snapshots: es-module-lexer@2.3.1: {} + es-module-lexer@3.0.2: {} + es-object-atoms@1.1.1: dependencies: es-errors: 1.3.0 @@ -39697,6 +40131,35 @@ snapshots: '@esbuild/win32-ia32': 0.27.4 '@esbuild/win32-x64': 0.27.4 + esbuild@0.28.1: + optionalDependencies: + '@esbuild/aix-ppc64': 0.28.1 + '@esbuild/android-arm': 0.28.1 + '@esbuild/android-arm64': 0.28.1 + '@esbuild/android-x64': 0.28.1 + '@esbuild/darwin-arm64': 0.28.1 + '@esbuild/darwin-x64': 0.28.1 + '@esbuild/freebsd-arm64': 0.28.1 + '@esbuild/freebsd-x64': 0.28.1 + '@esbuild/linux-arm': 0.28.1 + '@esbuild/linux-arm64': 0.28.1 + '@esbuild/linux-ia32': 0.28.1 + '@esbuild/linux-loong64': 0.28.1 + '@esbuild/linux-mips64el': 0.28.1 + '@esbuild/linux-ppc64': 0.28.1 + '@esbuild/linux-riscv64': 0.28.1 + '@esbuild/linux-s390x': 0.28.1 + '@esbuild/linux-x64': 0.28.1 + '@esbuild/netbsd-arm64': 0.28.1 + '@esbuild/netbsd-x64': 0.28.1 + '@esbuild/openbsd-arm64': 0.28.1 + '@esbuild/openbsd-x64': 0.28.1 + '@esbuild/openharmony-arm64': 0.28.1 + '@esbuild/sunos-x64': 0.28.1 + '@esbuild/win32-arm64': 0.28.1 + '@esbuild/win32-ia32': 0.28.1 + '@esbuild/win32-x64': 0.28.1 + esbuild@0.28.2: optionalDependencies: '@esbuild/aix-ppc64': 0.28.2 @@ -40237,16 +40700,6 @@ snapshots: extendable-error@0.1.7: {} - extract-zip@2.0.1(supports-color@10.2.2): - dependencies: - debug: 4.4.3(supports-color@10.2.2) - get-stream: 5.2.0 - yauzl: 2.10.0 - optionalDependencies: - '@types/yauzl': 2.10.3 - transitivePeerDependencies: - - supports-color - fast-check@3.23.2: dependencies: pure-rand: 6.1.0 @@ -40326,10 +40779,6 @@ snapshots: dependencies: websocket-driver: 0.7.4 - fd-slicer@1.1.0: - dependencies: - pend: 1.2.0 - fdir@6.5.0(picomatch@4.0.3): optionalDependencies: picomatch: 4.0.3 @@ -40582,10 +41031,6 @@ snapshots: dunder-proto: 1.0.1 es-object-atoms: 1.1.2 - get-stream@5.2.0: - dependencies: - pump: 3.0.3 - get-stream@8.0.1: {} get-tsconfig@4.10.1: @@ -40703,18 +41148,6 @@ snapshots: ufo: 1.6.4 uncrypto: 0.1.3 - h3@1.15.5: - dependencies: - cookie-es: 1.2.2 - crossws: 0.3.5 - defu: 6.1.4 - destr: 2.0.5 - iron-webcrypto: 1.2.1 - node-mock-http: 1.0.4 - radix3: 1.1.2 - ufo: 1.6.4 - uncrypto: 0.1.3 - h3@2.0.1-rc.14(crossws@0.4.3(srvx@0.10.1)): dependencies: rou3: 0.7.12 @@ -40799,6 +41232,10 @@ snapshots: dependencies: lru-cache: 10.4.3 + hosted-git-info@9.0.3: + dependencies: + lru-cache: 11.5.1 + hpack.js@2.1.6: dependencies: inherits: 2.0.4 @@ -40998,7 +41435,8 @@ snapshots: image-meta@0.2.2: {} - image-size@2.0.2: {} + image-size@2.0.2: + optional: true immer@10.1.1: {} @@ -41009,6 +41447,12 @@ snapshots: parent-module: 1.0.1 resolve-from: 4.0.0 + import-in-the-middle@3.5.1: + dependencies: + cjs-module-lexer: 2.2.1 + es-module-lexer: 3.0.2 + module-details-from-path: 1.0.4 + import-lazy@4.0.0: {} import-local@3.2.0: @@ -41056,23 +41500,23 @@ snapshots: ipaddr.js@2.2.0: {} - ipx@3.1.1(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)): + ipx@3.1.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)): dependencies: '@fastify/accept-negotiator': 2.0.1 citty: 0.1.6 consola: 3.4.2 - defu: 6.1.4 + defu: 6.1.7 destr: 2.0.5 etag: 1.8.1 - h3: 1.15.5 + h3: 1.15.11 image-meta: 0.2.2 - listhen: 1.9.0 + listhen: 1.10.1(srvx@0.11.22) ofetch: 1.5.1 pathe: 2.0.3 sharp: 0.34.5 svgo: 4.0.0 ufo: 1.6.4 - unstorage: 1.17.4(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) + unstorage: 1.17.5(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) xss: 1.0.15 transitivePeerDependencies: - '@azure/app-configuration' @@ -41084,6 +41528,7 @@ snapshots: - '@capacitor/preferences' - '@deno/kv' - '@netlify/blobs' + - '@parcel/watcher' - '@planetscale/database' - '@upstash/redis' - '@vercel/blob' @@ -41093,6 +41538,7 @@ snapshots: - db0 - idb-keyval - ioredis + - srvx - uploadthing iron-session@9.0.1: @@ -41275,10 +41721,6 @@ snapshots: dependencies: is-inside-container: 1.0.0 - is64bit@2.0.0: - dependencies: - system-architecture: 0.1.0 - isarray@1.0.0: {} isarray@2.0.5: {} @@ -41311,7 +41753,8 @@ snapshots: jose@6.1.3: {} - jpeg-js@0.4.4: {} + jpeg-js@0.4.4: + optional: true js-base64@3.7.8: {} @@ -41328,6 +41771,7 @@ snapshots: js-image-generator@1.0.4: dependencies: jpeg-js: 0.4.4 + optional: true js-sha256@0.11.1: {} @@ -41457,9 +41901,9 @@ snapshots: jsonpointer@5.0.1: {} - jsonwebtoken@9.0.2: + jsonwebtoken@9.0.3: dependencies: - jws: 3.2.2 + jws: 4.0.1 lodash.includes: 4.3.0 lodash.isboolean: 3.0.3 lodash.isinteger: 4.0.4 @@ -41472,15 +41916,15 @@ snapshots: junk@4.0.1: {} - jwa@1.4.2: + jwa@2.0.1: dependencies: buffer-equal-constant-time: 1.0.1 ecdsa-sig-formatter: 1.0.11 safe-buffer: 5.2.1 - jws@3.2.2: + jws@4.0.1: dependencies: - jwa: 1.4.2 + jwa: 2.0.1 safe-buffer: 5.2.1 jwt-decode@3.1.2: {} @@ -41694,27 +42138,6 @@ snapshots: transitivePeerDependencies: - srvx - listhen@1.9.0: - dependencies: - '@parcel/watcher': 2.5.1 - '@parcel/watcher-wasm': 2.5.1 - citty: 0.1.6 - clipboardy: 4.0.0 - consola: 3.4.2 - crossws: 0.3.5 - defu: 6.1.4 - get-port-please: 3.2.0 - h3: 1.15.5 - http-shutdown: 1.2.2 - jiti: 2.7.0 - mlly: 1.8.0 - node-forge: 1.3.1 - pathe: 1.1.2 - std-env: 3.10.0 - ufo: 1.6.4 - untun: 0.1.3 - uqr: 0.1.2 - loader-runner@4.3.0: {} local-pkg@0.5.1: @@ -41985,6 +42408,10 @@ snapshots: minipass: 7.1.2 rimraf: 5.0.10 + minizlib@3.1.0: + dependencies: + minipass: 7.1.2 + mkdirp@3.0.1: {} mlly@1.8.0: @@ -42006,6 +42433,8 @@ snapshots: ast-module-types: 6.0.1 node-source-walk: 7.0.1 + module-details-from-path@1.0.4: {} + motion-dom@11.18.1: dependencies: motion-utils: 11.18.1 @@ -42045,6 +42474,32 @@ snapshots: transitivePeerDependencies: - '@types/node' + msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2): + dependencies: + '@inquirer/confirm': 6.3.2(@types/node@25.0.9) + '@mswjs/interceptors': 0.41.9 + '@open-draft/deferred-promise': 3.0.0 + '@types/statuses': 2.0.6 + cookie: 1.1.1 + graphql: 16.14.2 + headers-polyfill: 5.0.1 + is-node-process: 1.2.0 + outvariant: 1.4.3 + path-to-regexp: 6.3.0 + picocolors: 1.1.1 + rettime: 0.11.11 + statuses: 2.0.2 + strict-event-emitter: 0.5.1 + tough-cookie: 6.0.1 + type-fest: 5.9.0 + until-async: 3.0.2 + yargs: 17.7.2 + optionalDependencies: + typescript: 5.9.2 + transitivePeerDependencies: + - '@types/node' + optional: true + msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2): dependencies: '@bundled-es-modules/cookie': 2.0.1 @@ -42070,32 +42525,6 @@ snapshots: transitivePeerDependencies: - '@types/node' - msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2): - dependencies: - '@bundled-es-modules/cookie': 2.0.1 - '@bundled-es-modules/statuses': 1.0.1 - '@bundled-es-modules/tough-cookie': 0.1.6 - '@inquirer/confirm': 5.1.4(@types/node@25.0.9) - '@mswjs/interceptors': 0.37.6 - '@open-draft/deferred-promise': 2.2.0 - '@open-draft/until': 2.1.0 - '@types/cookie': 0.6.0 - '@types/statuses': 2.0.5 - graphql: 16.10.0 - headers-polyfill: 4.0.3 - is-node-process: 1.2.0 - outvariant: 1.4.3 - path-to-regexp: 6.3.0 - picocolors: 1.1.1 - strict-event-emitter: 0.5.1 - type-fest: 4.41.0 - yargs: 17.7.2 - optionalDependencies: - typescript: 5.9.2 - transitivePeerDependencies: - - '@types/node' - optional: true - muggle-string@0.4.1: {} multicast-dns@7.2.5: @@ -42151,7 +42580,7 @@ snapshots: netlify-redirector@0.5.0: {} - next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2): + next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2): dependencies: '@next/env': 16.3.4 '@swc/helpers': 0.5.23 @@ -42170,6 +42599,7 @@ snapshots: '@next/swc-linux-x64-musl': 16.3.4 '@next/swc-win32-arm64-msvc': 16.3.4 '@next/swc-win32-x64-msvc': 16.3.4 + '@opentelemetry/api': 1.9.1 '@playwright/test': 1.63.0 babel-plugin-react-compiler: 1.0.0 sass: 1.97.2 @@ -42234,11 +42664,11 @@ snapshots: - sqlite3 - uploadthing - nitro@3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)): + nitro@3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)): dependencies: consola: 3.4.2 crossws: 0.4.4(srvx@0.11.22) - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) + db0: 0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3) env-runner: 0.1.6(miniflare@4.20260317.0) h3: 2.0.1-rc.16(crossws@0.4.4(srvx@0.11.22)) hookable: 6.1.0 @@ -42249,7 +42679,7 @@ snapshots: rolldown: 1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) srvx: 0.11.22 unenv: 2.0.0-rc.24 - unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) + unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) optionalDependencies: dotenv: 17.4.2 giget: 2.0.0 @@ -42288,7 +42718,61 @@ snapshots: - sqlite3 - uploadthing - nitro@3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + nitro@3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + consola: 3.4.2 + crossws: 0.4.4(srvx@0.11.22) + db0: 0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3) + env-runner: 0.1.6(miniflare@4.20260317.0) + h3: 2.0.1-rc.16(crossws@0.4.4(srvx@0.11.22)) + hookable: 6.1.0 + nf3: 0.3.11 + ocache: 0.1.2 + ofetch: 2.0.0-alpha.3 + ohash: 2.0.11 + rolldown: 1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) + srvx: 0.11.22 + unenv: 2.0.0-rc.24 + unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) + optionalDependencies: + dotenv: 17.4.2 + giget: 3.3.1 + jiti: 2.7.0 + rollup: 4.63.1 + vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + transitivePeerDependencies: + - '@azure/app-configuration' + - '@azure/cosmos' + - '@azure/data-tables' + - '@azure/identity' + - '@azure/keyvault-secrets' + - '@azure/storage-blob' + - '@capacitor/preferences' + - '@deno/kv' + - '@electric-sql/pglite' + - '@emnapi/core' + - '@emnapi/runtime' + - '@libsql/client' + - '@netlify/blobs' + - '@planetscale/database' + - '@upstash/redis' + - '@vercel/blob' + - '@vercel/functions' + - '@vercel/kv' + - aws4fetch + - better-sqlite3 + - chokidar + - drizzle-orm + - idb-keyval + - ioredis + - lru-cache + - miniflare + - mongodb + - mysql2 + - sqlite3 + - uploadthing + + nitro@3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)): dependencies: consola: 3.4.2 crossws: 0.4.4(srvx@0.11.22) @@ -42306,10 +42790,10 @@ snapshots: unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) optionalDependencies: dotenv: 17.4.2 - giget: 3.3.1 + giget: 2.0.0 jiti: 2.7.0 rollup: 4.63.1 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 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.9.0) transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -42458,7 +42942,8 @@ snapshots: lower-case: 2.0.2 tslib: 2.8.1 - node-addon-api@7.1.1: {} + node-addon-api@7.1.1: + optional: true node-domexception@1.0.0: {} @@ -42515,6 +43000,12 @@ snapshots: semver: 7.8.5 validate-npm-package-license: 3.0.4 + normalize-package-data@8.0.0: + dependencies: + hosted-git-info: 9.0.3 + semver: 7.8.5 + validate-npm-package-license: 3.0.4 + normalize-path@2.1.1: dependencies: remove-trailing-separator: 1.1.0 @@ -42723,8 +43214,6 @@ snapshots: ohash@2.0.11: {} - omit.js@2.0.2: {} - on-exit-leak-free@2.1.2: {} on-finished@2.4.1: @@ -42918,10 +43407,6 @@ snapshots: p-try@2.2.0: {} - p-wait-for@5.0.2: - dependencies: - p-timeout: 6.1.4 - package-json-from-dist@1.0.1: {} package-manager-detector@0.2.11: @@ -43025,8 +43510,6 @@ snapshots: path-type@6.0.0: {} - pathe@1.1.2: {} - pathe@2.0.3: {} pend@1.2.0: {} @@ -43035,6 +43518,8 @@ snapshots: perfect-debounce@2.1.0: {} + pg-gateway@0.3.0-beta.4: {} + picocolors@1.1.1: {} picomatch@2.3.1: {} @@ -43154,11 +43639,11 @@ snapshots: postcss-value-parser@4.2.0: {} - postcss-values-parser@6.0.2(postcss@8.5.15): + postcss-values-parser@6.0.2(postcss@8.5.23): dependencies: color-name: 1.1.4 is-url-superb: 4.0.0 - postcss: 8.5.15 + postcss: 8.5.23 quote-unquote: 1.0.0 postcss@8.5.15: @@ -43218,7 +43703,7 @@ snapshots: detective-amd: 6.0.1 detective-cjs: 6.0.1 detective-es6: 5.0.1 - detective-postcss: 7.0.1(postcss@8.5.15) + detective-postcss: 7.0.1(postcss@8.5.23) detective-sass: 6.0.1 detective-scss: 5.0.1 detective-stylus: 5.0.1 @@ -43226,7 +43711,7 @@ snapshots: detective-vue2: 2.2.0(supports-color@10.2.2)(typescript@5.9.3) module-definition: 6.0.1 node-source-walk: 7.0.1 - postcss: 8.5.15 + postcss: 8.5.23 typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -43350,11 +43835,6 @@ snapshots: picocolors: 1.1.1 sade: 1.8.1 - pump@3.0.3: - dependencies: - end-of-stream: 1.4.5 - once: 1.4.0 - punycode@2.3.1: {} pure-rand@6.1.0: {} @@ -43561,6 +44041,20 @@ snapshots: read-pkg: 9.0.1 type-fest: 4.41.0 + read-package-up@12.0.0: + dependencies: + find-up-simple: 1.0.1 + read-pkg: 10.1.0 + type-fest: 5.9.0 + + read-pkg@10.1.0: + dependencies: + '@types/normalize-package-data': 2.4.4 + normalize-package-data: 8.0.0 + parse-json: 8.3.0 + type-fest: 5.9.0 + unicorn-magic: 0.4.0 + read-pkg@9.0.1: dependencies: '@types/normalize-package-data': 2.4.4 @@ -43604,6 +44098,10 @@ snapshots: dependencies: minimatch: 5.1.9 + readdir-glob@3.0.0: + dependencies: + minimatch: 10.2.5 + readdirp@3.6.0: dependencies: picomatch: 2.3.1 @@ -43678,6 +44176,13 @@ snapshots: require-from-string@2.0.2: {} + require-in-the-middle@8.0.1(supports-color@10.2.2): + dependencies: + debug: 4.4.3(supports-color@10.2.2) + module-details-from-path: 1.0.4 + transitivePeerDependencies: + - supports-color + require-package-name@2.0.1: {} requires-port@1.0.0: {} @@ -44060,7 +44565,7 @@ snapshots: sharp@0.34.5: dependencies: - '@img/colour': 1.0.0 + '@img/colour': 1.1.0 detect-libc: 2.1.2 semver: 7.8.5 optionalDependencies: @@ -44431,6 +44936,12 @@ snapshots: dependencies: js-tokens: 10.0.0 + stubborn-fs@2.0.0: + dependencies: + stubborn-utils: 1.0.2 + + stubborn-utils@1.0.2: {} + style-loader@4.0.0(webpack@5.97.1): dependencies: webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4) @@ -44490,8 +45001,6 @@ snapshots: symbol-tree@3.2.4: {} - system-architecture@0.1.0: {} - tagged-tag@1.0.0: {} tailwind-merge@3.6.0: {} @@ -44533,6 +45042,14 @@ snapshots: mkdirp: 3.0.1 yallist: 5.0.0 + tar@7.5.22: + dependencies: + '@isaacs/fs-minipass': 4.0.1 + chownr: 3.0.0 + minipass: 7.1.2 + minizlib: 3.1.0 + yallist: 5.0.0 + teex@1.0.1: dependencies: streamx: 2.27.0 @@ -44656,7 +45173,7 @@ snapshots: toidentifier@1.0.1: {} - toml@3.0.0: {} + toml@4.3.0: {} tomlify-j0.4@3.0.0: {} @@ -44985,21 +45502,6 @@ snapshots: '@unrs/resolver-binding-win32-ia32-msvc': 1.11.1 '@unrs/resolver-binding-win32-x64-msvc': 1.11.1 - unstorage@1.17.4(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)): - dependencies: - anymatch: 3.1.3 - chokidar: 5.0.0 - destr: 2.0.5 - h3: 1.15.5 - lru-cache: 11.5.1 - node-fetch-native: 1.6.7 - ofetch: 1.5.1 - ufo: 1.6.4 - optionalDependencies: - '@netlify/blobs': 10.1.0 - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) - ioredis: 5.11.1(supports-color@10.2.2) - unstorage@1.17.5(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)): dependencies: anymatch: 3.1.3 @@ -45015,6 +45517,21 @@ snapshots: db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) ioredis: 5.11.1(supports-color@10.2.2) + unstorage@1.17.5(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)): + dependencies: + anymatch: 3.1.3 + chokidar: 5.0.0 + destr: 2.0.5 + h3: 1.15.11 + lru-cache: 11.5.1 + node-fetch-native: 1.6.7 + ofetch: 1.5.1 + ufo: 1.6.4 + optionalDependencies: + '@netlify/blobs': 11.0.3(supports-color@10.2.2) + db0: 0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3) + ioredis: 5.11.1(supports-color@10.2.2) + unstorage@2.0.0-alpha.5(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3): optionalDependencies: '@netlify/blobs': 10.1.0 @@ -45024,6 +45541,15 @@ snapshots: lru-cache: 11.5.1 ofetch: 2.0.0-alpha.3 + unstorage@2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3): + optionalDependencies: + '@netlify/blobs': 10.1.0 + chokidar: 5.0.0 + db0: 0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3) + ioredis: 5.11.1(supports-color@10.2.2) + lru-cache: 11.5.1 + ofetch: 2.0.0-alpha.3 + unstorage@2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3): optionalDependencies: '@netlify/blobs': 10.1.0 @@ -45035,12 +45561,6 @@ snapshots: until-async@3.0.2: {} - untun@0.1.3: - dependencies: - citty: 0.1.6 - consola: 3.4.2 - pathe: 1.1.2 - untun@0.2.2: {} untyped@2.0.0: @@ -45072,8 +45592,6 @@ snapshots: escalade: 3.2.0 picocolors: 1.1.1 - uqr@0.1.2: {} - uqr@0.1.3: {} uri-js@4.4.1: @@ -45118,7 +45636,8 @@ snapshots: uuid@10.0.0: {} - uuid@11.1.0: {} + uuid@11.1.0: + optional: true uuid@8.3.2: {} @@ -45162,25 +45681,6 @@ snapshots: - rollup - supports-color - vite-plugin-dts@4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)): - dependencies: - '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) - '@rollup/pluginutils': 5.1.4(rollup@4.63.1) - '@volar/typescript': 2.4.26(@typescript/typescript6@6.0.2) - '@vue/language-core': 2.1.6(@typescript/typescript6@6.0.2) - compare-versions: 6.1.1 - debug: 4.4.3(supports-color@10.2.2) - kolorist: 1.8.0 - local-pkg: 0.5.1 - magic-string: 0.30.21 - typescript: '@typescript/typescript6@6.0.2' - optionalDependencies: - vite: 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.9.0) - transitivePeerDependencies: - - '@types/node' - - rollup - - supports-color - vite-plugin-dts@4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) @@ -45348,94 +45848,7 @@ snapshots: optionalDependencies: vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): - dependencies: - '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) - '@vitest/pretty-format': 4.1.4 - '@vitest/runner': 4.1.4 - '@vitest/snapshot': 4.1.4 - '@vitest/spy': 4.1.4 - '@vitest/utils': 4.1.4 - es-module-lexer: 2.3.1 - expect-type: 1.3.0 - magic-string: 0.30.21 - obug: 2.1.1 - pathe: 2.0.3 - picomatch: 4.0.4 - std-env: 4.1.0 - tinybench: 2.9.0 - tinyexec: 1.0.2 - tinyglobby: 0.2.16 - tinyrainbow: 3.1.0 - vite: 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.9.0) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 25.0.9 - '@vitest/ui': 4.1.4(vitest@4.1.4) - jsdom: 25.0.1(supports-color@10.2.2) - transitivePeerDependencies: - - msw - - vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): - dependencies: - '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - '@vitest/pretty-format': 4.1.4 - '@vitest/runner': 4.1.4 - '@vitest/snapshot': 4.1.4 - '@vitest/spy': 4.1.4 - '@vitest/utils': 4.1.4 - es-module-lexer: 2.3.1 - expect-type: 1.3.0 - magic-string: 0.30.21 - obug: 2.1.1 - pathe: 2.0.3 - picomatch: 4.0.4 - std-env: 4.1.0 - tinybench: 2.9.0 - tinyexec: 1.0.2 - tinyglobby: 0.2.16 - tinyrainbow: 3.1.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 25.0.9 - '@vitest/ui': 4.1.4(vitest@4.1.4) - jsdom: 25.0.1(supports-color@10.2.2) - transitivePeerDependencies: - - msw - - vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): - dependencies: - '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) - '@vitest/pretty-format': 4.1.4 - '@vitest/runner': 4.1.4 - '@vitest/snapshot': 4.1.4 - '@vitest/spy': 4.1.4 - '@vitest/utils': 4.1.4 - es-module-lexer: 2.3.1 - expect-type: 1.3.0 - magic-string: 0.30.21 - obug: 2.1.1 - pathe: 2.0.3 - picomatch: 4.0.4 - std-env: 4.1.0 - tinybench: 2.9.0 - tinyexec: 1.0.2 - tinyglobby: 0.2.16 - tinyrainbow: 3.1.0 - vite: 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.9.0) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 25.0.9 - '@vitest/ui': 4.1.4(vitest@4.1.4) - jsdom: 27.0.0(supports-color@10.2.2) - transitivePeerDependencies: - - msw - - vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): + vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): dependencies: '@vitest/expect': 4.1.4 '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) @@ -45458,45 +45871,17 @@ snapshots: vite: 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.9.0) why-is-node-running: 2.3.0 optionalDependencies: + '@opentelemetry/api': 1.9.1 '@types/node': 25.0.9 '@vitest/ui': 4.1.4(vitest@4.1.4) - jsdom: 29.1.1(@noble/hashes@2.0.1) + jsdom: 25.0.1(supports-color@10.2.2) transitivePeerDependencies: - msw - vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): + vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) - '@vitest/pretty-format': 4.1.4 - '@vitest/runner': 4.1.4 - '@vitest/snapshot': 4.1.4 - '@vitest/spy': 4.1.4 - '@vitest/utils': 4.1.4 - es-module-lexer: 2.3.1 - expect-type: 1.3.0 - magic-string: 0.30.21 - obug: 2.1.1 - pathe: 2.0.3 - picomatch: 4.0.4 - std-env: 4.1.0 - tinybench: 2.9.0 - tinyexec: 1.0.2 - tinyglobby: 0.2.16 - tinyrainbow: 3.1.0 - vite: 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.9.0) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 25.0.9 - '@vitest/ui': 4.1.4(vitest@4.1.4) - jsdom: 29.1.1(@noble/hashes@2.0.1) - transitivePeerDependencies: - - msw - - vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): - dependencies: - '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitest/pretty-format': 4.1.4 '@vitest/runner': 4.1.4 '@vitest/snapshot': 4.1.4 @@ -45516,6 +45901,97 @@ snapshots: vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) why-is-node-running: 2.3.0 optionalDependencies: + '@opentelemetry/api': 1.9.1 + '@types/node': 25.0.9 + '@vitest/ui': 4.1.4(vitest@4.1.4) + jsdom: 25.0.1(supports-color@10.2.2) + transitivePeerDependencies: + - msw + + vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): + dependencies: + '@vitest/expect': 4.1.4 + '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + '@vitest/pretty-format': 4.1.4 + '@vitest/runner': 4.1.4 + '@vitest/snapshot': 4.1.4 + '@vitest/spy': 4.1.4 + '@vitest/utils': 4.1.4 + es-module-lexer: 2.3.1 + expect-type: 1.3.0 + magic-string: 0.30.21 + obug: 2.1.1 + pathe: 2.0.3 + picomatch: 4.0.4 + std-env: 4.1.0 + tinybench: 2.9.0 + tinyexec: 1.0.2 + tinyglobby: 0.2.16 + tinyrainbow: 3.1.0 + vite: 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.9.0) + why-is-node-running: 2.3.0 + optionalDependencies: + '@opentelemetry/api': 1.9.1 + '@types/node': 25.0.9 + '@vitest/ui': 4.1.4(vitest@4.1.4) + jsdom: 27.0.0(supports-color@10.2.2) + transitivePeerDependencies: + - msw + + vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): + dependencies: + '@vitest/expect': 4.1.4 + '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + '@vitest/pretty-format': 4.1.4 + '@vitest/runner': 4.1.4 + '@vitest/snapshot': 4.1.4 + '@vitest/spy': 4.1.4 + '@vitest/utils': 4.1.4 + es-module-lexer: 2.3.1 + expect-type: 1.3.0 + magic-string: 0.30.21 + obug: 2.1.1 + pathe: 2.0.3 + picomatch: 4.0.4 + std-env: 4.1.0 + tinybench: 2.9.0 + tinyexec: 1.0.2 + tinyglobby: 0.2.16 + tinyrainbow: 3.1.0 + vite: 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.9.0) + why-is-node-running: 2.3.0 + optionalDependencies: + '@opentelemetry/api': 1.9.1 + '@types/node': 25.0.9 + '@vitest/ui': 4.1.4(vitest@4.1.4) + jsdom: 29.1.1(@noble/hashes@2.0.1) + transitivePeerDependencies: + - msw + + vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + '@vitest/expect': 4.1.4 + '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + '@vitest/pretty-format': 4.1.4 + '@vitest/runner': 4.1.4 + '@vitest/snapshot': 4.1.4 + '@vitest/spy': 4.1.4 + '@vitest/utils': 4.1.4 + es-module-lexer: 2.3.1 + expect-type: 1.3.0 + magic-string: 0.30.21 + obug: 2.1.1 + pathe: 2.0.3 + picomatch: 4.0.4 + std-env: 4.1.0 + tinybench: 2.9.0 + tinyexec: 1.0.2 + tinyglobby: 0.2.16 + tinyrainbow: 3.1.0 + vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + why-is-node-running: 2.3.0 + optionalDependencies: + '@opentelemetry/api': 1.9.1 '@types/node': 25.0.9 '@vitest/ui': 4.1.4(vitest@4.1.4) jsdom: 29.1.1(@noble/hashes@2.0.1) @@ -45967,6 +46443,8 @@ snapshots: tr46: 0.0.3 webidl-conversions: 3.0.1 + when-exit@2.1.5: {} + which-boxed-primitive@1.1.1: dependencies: is-bigint: 1.1.0 @@ -46083,6 +46561,7 @@ snapshots: dependencies: imurmurhash: 0.1.4 signal-exit: 4.1.0 + optional: true ws@8.18.0: {} @@ -46158,10 +46637,9 @@ snapshots: y18n: 5.0.8 yargs-parser: 22.0.0 - yauzl@2.10.0: + yauzl@3.4.0: dependencies: - buffer-crc32: 0.2.13 - fd-slicer: 1.1.0 + pend: 1.2.0 yocto-queue@0.1.0: {} @@ -46179,7 +46657,7 @@ snapshots: '@poppinss/colors': 4.1.6 '@poppinss/dumper': 0.6.5 '@speed-highlight/core': 1.2.14 - cookie: 1.0.2 + cookie: 1.1.1 youch-core: 0.3.3 youch@4.1.1: @@ -46200,6 +46678,12 @@ snapshots: compress-commons: 6.0.2 readable-stream: 4.7.0 + zip-stream@7.0.5: + dependencies: + compress-commons: 7.0.1 + normalize-path: 3.0.0 + readable-stream: 4.7.0 + zod@3.25.57: {} zod@3.25.76: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 4757e4c795..89a2478792 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -9,10 +9,8 @@ trustPolicyExclude: - 'chokidar@4.0.3' # known to be safe, installed by sass, prisma, netlify... no planned releases in v4, packages is on v5 now - 'semver@6.3.1' # installed by babel, ecosystem has been on v7 for 7 years now, but babel is horribly out of date, 6.3.1 is the latest v6 and was released 3 years ago - 'undici@6.21.2' # installed by cheerio@1.0.0 -> html-link-extractor@1.0.5 -> markdown-link-extractor@4.0.3, is only 1 year old, v6, v7 and v8 are maintained in parallel - - '@netlify/edge-bundler@14.7.0' # existing Netlify dev transitive flagged by pnpm 11.9 trust downgrade checks - '@platformatic/flame@1.7.0' # trusted publishing failed due to a missing sigstore module in npm, then an established maintainer published it manually - - '@netlify/serverless-functions-api@2.7.1' # existing Netlify dev transitive flagged by pnpm 11.9 trust downgrade checks - - '@netlify/zip-it-and-ship-it@14.1.11' # existing Netlify dev transitive flagged by pnpm 11.9 trust downgrade checks + - '@netlify/serverless-functions-api@2.21.2 || 2.18.0' # Netlify's repo went private Aug 2023, provenance never returned for any version since. Two versions: @netlify/server-dev wants ^2.21.2, @netlify/zip-it-and-ship-it pins an exact 2.18.0 packages: - 'packages/*' From bc80866f6d6eb3e6f152ee3682eb783c96403e83 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Mon, 14 Sep 2026 20:42:13 +0200 Subject: [PATCH 034/175] perf(router-core): skip recursion for identical array elements in deepEqual (#8417) Compare array elements by identity before recursing, count the exact comparison down with a single counter, and drop the `typeof` early exit, which `Array.isArray`/`isPlainObject` already imply. Behavior, key enumeration and getter read order are unchanged (pinned by the new contract test). Measured in one mixed-mode process (all option modes share the function's type feedback, which is how the router uses it): equal numeric arrays ~+65%, flat records +7-9%, nested records and mismatches +7-8%; every case improves. Identity guards inside the object loops were rejected: they grow the recursive function past what V8 keeps inlining and cost -31% on a single-key mismatch. react-router.minimal shrinks by 4 B gzip. (cherry picked from commit cb23ed54757255540cb203081c3423524d6483ca) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/deep-equal-array-identity.md | 5 + packages/router-core/src/utils.ts | 14 +- .../tests/deep-equal-contract.test.ts | 108 ++++++++++ .../router-core/tests/deep-equal.bench.ts | 185 ++++++++++++++++++ 4 files changed, 303 insertions(+), 9 deletions(-) create mode 100644 .changeset/deep-equal-array-identity.md create mode 100644 packages/router-core/tests/deep-equal-contract.test.ts create mode 100644 packages/router-core/tests/deep-equal.bench.ts diff --git a/.changeset/deep-equal-array-identity.md b/.changeset/deep-equal-array-identity.md new file mode 100644 index 0000000000..66034c77bc --- /dev/null +++ b/.changeset/deep-equal-array-identity.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Speed up `deepEqual`: identical array elements no longer recurse, the exact comparison keeps a single key counter, and the redundant `typeof` early exit is gone. Equal numeric arrays compare ~70% faster and record comparisons 5–12% faster in the mixed-mode workloads that Link option stabilization and active-state checks produce, with a slightly smaller bundle. Behavior, including key enumeration and getter read order, is unchanged. diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts index 936bb3da73..3b84c4dc3f 100644 --- a/packages/router-core/src/utils.ts +++ b/packages/router-core/src/utils.ts @@ -375,14 +375,12 @@ export function deepEqual( return true } - if (typeof a !== typeof b) { - return false - } - if (Array.isArray(a) && Array.isArray(b)) { if (a.length !== b.length) return false for (let i = 0, l = a.length; i < l; i++) { - if (!deepEqual(a[i], b[i], opts)) return false + const av = a[i] + const bv = b[i] + if (av !== bv && !deepEqual(av, bv, opts)) return false } return true } @@ -408,15 +406,13 @@ export function deepEqual( } } - let bCount = 0 for (const k in b) { if (!ignoreUndefined || b[k] !== undefined) { - bCount++ - if (bCount > aCount || !deepEqual(a[k], b[k], opts)) return false + if (aCount-- === 0 || !deepEqual(a[k], b[k], opts)) return false } } - return aCount === bCount + return aCount === 0 } return false diff --git a/packages/router-core/tests/deep-equal-contract.test.ts b/packages/router-core/tests/deep-equal-contract.test.ts new file mode 100644 index 0000000000..e4dba5917a --- /dev/null +++ b/packages/router-core/tests/deep-equal-contract.test.ts @@ -0,0 +1,108 @@ +import { describe, expect, it } from 'vitest' +import { deepEqual } from '../src/utils' + +// Pins the observable contract of `deepEqual` (including existing quirks) so +// performance work on its loops cannot change it silently. +describe('deepEqual contract', () => { + it.each([ + undefined, + {}, + { partial: true }, + { ignoreUndefined: false }, + { partial: true, ignoreUndefined: false }, + ])('compares nested records and arrays with %j', (opts) => { + const a = Object.freeze({ + page: 1, + nested: Object.freeze({ ids: Object.freeze([1, 2]) }), + }) + expect(deepEqual(a, { page: 1, nested: { ids: [1, 2] } }, opts)).toBe(true) + expect(deepEqual(a, { page: 1, nested: { ids: [1, 3] } }, opts)).toBe(false) + }) + + it('keeps partial comparison directional and arrays length-exact', () => { + expect(deepEqual({ a: 1, b: 2 }, { a: 1 }, { partial: true })).toBe(true) + expect(deepEqual({ a: 1 }, { a: 1, b: 2 }, { partial: true })).toBe(false) + expect(deepEqual([1, 2], [1], { partial: true })).toBe(false) + }) + + it('retains inherited enumeration, symbols, and hidden-property policy', () => { + const a = Object.assign(Object.create({ inherited: 1 }), { own: 2 }) + expect(deepEqual(a, { inherited: 1, own: 2 })).toBe(true) + const s = Symbol('metadata') + expect(deepEqual({ [s]: 1 }, { [s]: 2 })).toBe(true) + expect( + deepEqual(Object.defineProperty({}, 'hidden', { value: 1 }), {}), + ).toBe(true) + }) + + it('retains current undefined-key behavior rather than changing the contract', () => { + expect(deepEqual({ a: undefined }, {})).toBe(true) + expect(deepEqual({ a: undefined }, {}, { ignoreUndefined: false })).toBe( + false, + ) + // Existing quirk: this performance patch deliberately does NOT repair it. + expect( + deepEqual({ a: undefined }, { b: undefined }, { ignoreUndefined: false }), + ).toBe(true) + expect( + deepEqual( + {}, + { a: undefined }, + { partial: true, ignoreUndefined: false }, + ), + ).toBe(true) + }) + + it('retains numeric equality', () => { + expect(deepEqual(-0, 0)).toBe(true) + expect(deepEqual([NaN], [NaN])).toBe(false) + expect( + deepEqual([1n, Infinity, undefined], [1n, Infinity, undefined]), + ).toBe(true) + }) + + it('preserves default-mode getter read order', () => { + const reads: Array = [] + const a = { + get x() { + reads.push('a') + return 1 + }, + } + const b = { + get x() { + reads.push('b') + return 1 + }, + } + expect(deepEqual(a, b)).toBe(true) + expect(reads).toEqual(['a', 'b', 'a', 'b']) + }) + + it('does not read an excess comparison value in exact-defined mode', () => { + const b = { + get x() { + throw new Error('must not read') + }, + } + expect(deepEqual({}, b, { ignoreUndefined: false })).toBe(false) + }) + + it('does not inspect options on an identical child', () => { + const shared = {} + const opts = { + get partial(): boolean { + throw new Error('must not read') + }, + } + expect(deepEqual(shared, shared, opts)).toBe(true) + expect(deepEqual([shared], [shared], opts)).toBe(true) + }) + + it('keeps different class instances opaque', () => { + class Foo { + value = 1 + } + expect(deepEqual(new Foo(), new Foo())).toBe(false) + }) +}) diff --git a/packages/router-core/tests/deep-equal.bench.ts b/packages/router-core/tests/deep-equal.bench.ts new file mode 100644 index 0000000000..7a8d8d0b93 --- /dev/null +++ b/packages/router-core/tests/deep-equal.bench.ts @@ -0,0 +1,185 @@ +import { bench, describe, expect } from 'vitest' +import { deepEqual } from '../src/utils' + +// Workloads modeled on the router's callers: Link inline-option stabilization +// (`ignoreUndefined: false`), active-state search comparison (`partial`), +// matchRoute params (`partial`), and search-middleware value comparisons. +// Inputs rotate over a pool so a single hidden-class or cached shape does not +// dominate; the "fresh" cases build their incoming value inside the timed op. +// +// Always compare implementations with the whole file in one process: the +// cases share `deepEqual`'s type feedback and inlining decisions, and a `-t` +// subset can rank variants very differently from the mixed-mode reality. + +const search = { page: 1, sort: 'asc', filter: 'open', tags: ['a', 'b'] } +const searchEqual = Array.from({ length: 32 }, () => ({ + page: 1, + sort: 'asc', + filter: 'open', + tags: ['a', 'b'], +})) +const searchChangedLate = Array.from({ length: 32 }, () => ({ + page: 1, + sort: 'asc', + filter: 'open', + tags: ['a', 'c'], +})) +const searchChangedEarly = Array.from({ length: 32 }, () => ({ + page: 2, + sort: 'asc', + filter: 'open', + tags: ['a', 'b'], +})) +const nested = { + user: { id: 7, roles: ['admin', 'editor'], prefs: { theme: 'dark' } }, + items: [{ id: 1 }, { id: 2 }, { id: 3 }], +} +const nestedEqual = Array.from({ length: 32 }, () => ({ + user: { id: 7, roles: ['admin', 'editor'], prefs: { theme: 'dark' } }, + items: [{ id: 1 }, { id: 2 }, { id: 3 }], +})) +const numbers = Array.from({ length: 32 }, (_, index) => index) +const numbersEqual = Array.from({ length: 32 }, () => + Array.from({ length: 32 }, (_, index) => index), +) +// Link.tsx stabilizes `[search, params, activeOptions]`-like inline values. +const linkOptions = Array.from({ length: 100 }, (_, index) => [ + { page: index, sort: 'asc' }, + { id: String(index) }, + { exact: false, includeSearch: true, includeHash: undefined }, +]) +const linkOptionsEqual = linkOptions.map((entry) => + entry.map((value) => ({ ...value })), +) +const shared = { ...search, tags: search.tags } + +let sink = 0 +let cursor = 0 +const next = (pool: Array) => pool[cursor++ & 31]! + +expect(deepEqual(search, searchEqual[0])).toBe(true) +expect(deepEqual(search, searchChangedLate[0])).toBe(false) +expect(deepEqual(search, searchChangedEarly[0])).toBe(false) +expect(deepEqual(nested, nestedEqual[0])).toBe(true) +expect(deepEqual(numbers, numbersEqual[0])).toBe(true) +expect(deepEqual(search, shared)).toBe(true) +for (let index = 0; index < linkOptions.length; index++) { + for (let slot = 0; slot < 3; slot++) { + expect( + deepEqual(linkOptions[index]![slot], linkOptionsEqual[index]![slot], { + ignoreUndefined: false, + }), + ).toBe(true) + } +} + +describe('deepEqual', () => { + const options = { time: 1000, warmupTime: 200 } + + bench( + 'equal flat search record (default)', + () => { + sink += +deepEqual(search, next(searchEqual)) + }, + options, + ) + + bench( + 'equal flat record with a shared child (default)', + () => { + sink += +deepEqual(search, shared) + }, + options, + ) + + bench( + 'equal flat record (ignoreUndefined: false)', + () => { + sink += +deepEqual(search, next(searchEqual), { ignoreUndefined: false }) + }, + options, + ) + + bench( + 'equal flat record (partial)', + () => { + sink += +deepEqual(search, next(searchEqual), { partial: true }) + }, + options, + ) + + bench( + 'late mismatch in a nested array (default)', + () => { + sink += +deepEqual(search, next(searchChangedLate)) + }, + options, + ) + + bench( + 'early mismatch (default)', + () => { + sink += +deepEqual(search, next(searchChangedEarly)) + }, + options, + ) + + bench( + 'equal nested record (default)', + () => { + sink += +deepEqual(nested, next(nestedEqual)) + }, + options, + ) + + bench( + 'equal array of 32 numbers', + () => { + sink += +deepEqual(numbers, next(numbersEqual)) + }, + options, + ) + + bench( + 'fresh equal flat record (ignoreUndefined: false)', + () => { + sink += +deepEqual( + search, + { page: 1, sort: 'asc', filter: 'open', tags: search.tags }, + { ignoreUndefined: false }, + ) + }, + options, + ) + + bench( + 'fresh partial mismatch', + () => { + sink += +deepEqual( + search, + { page: 1, sort: 'desc' }, + { partial: true, ignoreUndefined: true }, + ) + }, + options, + ) + + bench( + 'link option stabilization: 100 entries x 3 equal values', + () => { + for (let index = 0; index < linkOptions.length; index++) { + const previous = linkOptions[index]! + const incoming = linkOptionsEqual[index]! + for (let slot = 0; slot < 3; slot++) { + sink += +deepEqual(previous[slot], incoming[slot], { + ignoreUndefined: false, + }) + } + } + }, + options, + ) +}) + +// Keep the results observable so the comparisons cannot be optimized away. +expect(sink).toBeGreaterThanOrEqual(0) From e561fa1d7118e3d29267cc3b6ce1130d6581f387 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Mon, 14 Sep 2026 20:42:14 +0200 Subject: [PATCH 035/175] perf(router-core): pass deepEqual flags positionally (#8418) `deepEqual(a, b, partial?, explicitUndefined?)` replaces the options object. The hot callers (Link option stabilization and active-state checks, matchRoute) no longer allocate `{ partial }` / `{ ignoreUndefined: false }` per comparison, and the comparator reads two booleans instead of an options parameter that saw four object shapes. `explicitUndefined` (falsy default) replaces `ignoreUndefined: false` and reuses the `activeOptions` vocabulary. deepEqual is an internal helper; two-argument callers are unaffected. react-router.minimal shrinks by 48 B gzip (129 raw) on top of the previous commit; the Link stabilization micro-benchmark improves by ~10% and the paired Link component runner resolves three cases as faster. (cherry picked from commit d6f2c1ca55a4900b33868cfc115ac7120d68d26b) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/deep-equal-positional-flags.md | 8 ++ packages/react-router/src/link.tsx | 16 ++-- packages/router-core/src/router.ts | 4 +- packages/router-core/src/utils.ts | 35 +++++--- .../tests/deep-equal-contract.test.ts | 79 ++++++++++--------- .../router-core/tests/deep-equal.bench.ts | 32 ++++---- packages/router-core/tests/utils.test.ts | 50 ++++++------ packages/solid-router/src/link.tsx | 10 ++- packages/vue-router/src/link.tsx | 10 ++- 9 files changed, 135 insertions(+), 109 deletions(-) create mode 100644 .changeset/deep-equal-positional-flags.md diff --git a/.changeset/deep-equal-positional-flags.md b/.changeset/deep-equal-positional-flags.md new file mode 100644 index 0000000000..42df0bc798 --- /dev/null +++ b/.changeset/deep-equal-positional-flags.md @@ -0,0 +1,8 @@ +--- +'@tanstack/router-core': patch +'@tanstack/react-router': patch +'@tanstack/solid-router': patch +'@tanstack/vue-router': patch +--- + +`deepEqual` now takes its flags as positional arguments — `deepEqual(a, b, partial?, explicitUndefined?)` — instead of an options object. The router's hot callers (Link option stabilization and active-state checks, `matchRoute`) no longer allocate an options object per comparison, and the comparator reads two booleans instead of a polymorphic object. `explicitUndefined` replaces `ignoreUndefined: false`. `deepEqual` is an internal helper; it stays exported for compatibility of two-argument calls. diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 0116b1893c..4d5e13164a 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -45,14 +45,14 @@ type LinkState = [href: string | undefined, isActive?: boolean] // mutated in place is not re-read. `deepEqual` short-circuits on reference // equality, so an unchanged reference costs nothing. // -// `ignoreUndefined: false` is required: an explicit `undefined` clears an +// `explicitUndefined` is required: an explicit `undefined` clears an // inherited param or search key, so `{}` and `{ category: undefined }` build // different locations and must not be treated as equal here. function useStableValues>(...values: T): T { const ref = React.useRef>(values) const stable = ref.current as Array values.forEach((value, index) => { - if (!deepEqual(stable[index], value, { ignoreUndefined: false })) { + if (!deepEqual(stable[index], value, false, true)) { stable[index] = value } }) @@ -111,10 +111,12 @@ function resolveIsActive( } if (activeOptions?.includeSearch ?? true) { - const searchTest = deepEqual(location.search, next.search, { - partial: !activeOptions?.exact, - ignoreUndefined: !activeOptions?.explicitUndefined, - }) + const searchTest = deepEqual( + location.search, + next.search, + !activeOptions?.exact, + activeOptions?.explicitUndefined, + ) if (!searchTest) { return false } @@ -852,7 +854,7 @@ function areLinkPropsEqual( } if ( !ROUTER_OPTION_KEYS.has(key) || - !deepEqual(prev[key], next[key], { ignoreUndefined: false }) + !deepEqual(prev[key], next[key], false, true) ) { return false } diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index fc2b76d979..2eff5b2bed 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -2720,13 +2720,13 @@ export class RouterCore< } if (location.params) { - if (!deepEqual(match.rawParams, location.params, { partial: true })) { + if (!deepEqual(match.rawParams, location.params, true)) { return false } } if (opts?.includeSearch ?? true) { - return deepEqual(baseLocation.search, next.search, { partial: true }) + return deepEqual(baseLocation.search, next.search, true) ? match.rawParams : false } diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts index 3b84c4dc3f..e9b2295cb8 100644 --- a/packages/router-core/src/utils.ts +++ b/packages/router-core/src/utils.ts @@ -363,13 +363,19 @@ export function isPlainArray(value: unknown): value is Array { } /** - * Perform a deep equality check with options for partial comparison and - * ignoring `undefined` values. Optimized for router state comparisons. + * Perform a deep equality check optimized for router state comparisons. + * + * - `partial`: `b` may omit keys that `a` has (arrays stay length-exact). + * - `explicitUndefined`: keys holding `undefined` take part in the comparison + * instead of being ignored. + * + * Internal: the flags are positional so hot callers pass no options object. */ export function deepEqual( a: any, b: any, - opts?: { partial?: boolean; ignoreUndefined?: boolean }, + partial?: boolean, + explicitUndefined?: boolean, ): boolean { if (a === b) { return true @@ -380,25 +386,25 @@ export function deepEqual( for (let i = 0, l = a.length; i < l; i++) { const av = a[i] const bv = b[i] - if (av !== bv && !deepEqual(av, bv, opts)) return false + if (av !== bv && !deepEqual(av, bv, partial, explicitUndefined)) { + return false + } } return true } if (isPlainObject(a) && isPlainObject(b)) { - const ignoreUndefined = opts?.ignoreUndefined ?? true - - if (opts?.partial) { + if (partial) { for (const k in b) { - if (!ignoreUndefined || b[k] !== undefined) { - if (!deepEqual(a[k], b[k], opts)) return false + if (explicitUndefined || b[k] !== undefined) { + if (!deepEqual(a[k], b[k], partial, explicitUndefined)) return false } } return true } let aCount = 0 - if (!ignoreUndefined) { + if (explicitUndefined) { aCount = Object.keys(a).length } else { for (const k in a) { @@ -407,8 +413,13 @@ export function deepEqual( } for (const k in b) { - if (!ignoreUndefined || b[k] !== undefined) { - if (aCount-- === 0 || !deepEqual(a[k], b[k], opts)) return false + if (explicitUndefined || b[k] !== undefined) { + if ( + aCount-- === 0 || + !deepEqual(a[k], b[k], partial, explicitUndefined) + ) { + return false + } } } diff --git a/packages/router-core/tests/deep-equal-contract.test.ts b/packages/router-core/tests/deep-equal-contract.test.ts index e4dba5917a..70f0adda6f 100644 --- a/packages/router-core/tests/deep-equal-contract.test.ts +++ b/packages/router-core/tests/deep-equal-contract.test.ts @@ -5,24 +5,40 @@ import { deepEqual } from '../src/utils' // performance work on its loops cannot change it silently. describe('deepEqual contract', () => { it.each([ - undefined, - {}, - { partial: true }, - { ignoreUndefined: false }, - { partial: true, ignoreUndefined: false }, - ])('compares nested records and arrays with %j', (opts) => { - const a = Object.freeze({ - page: 1, - nested: Object.freeze({ ids: Object.freeze([1, 2]) }), - }) - expect(deepEqual(a, { page: 1, nested: { ids: [1, 2] } }, opts)).toBe(true) - expect(deepEqual(a, { page: 1, nested: { ids: [1, 3] } }, opts)).toBe(false) - }) + [undefined, undefined], + [true, undefined], + [undefined, true], + [true, true], + ] as const)( + 'compares nested records and arrays with partial=%s explicitUndefined=%s', + (partial, explicitUndefined) => { + const a = Object.freeze({ + page: 1, + nested: Object.freeze({ ids: Object.freeze([1, 2]) }), + }) + expect( + deepEqual( + a, + { page: 1, nested: { ids: [1, 2] } }, + partial, + explicitUndefined, + ), + ).toBe(true) + expect( + deepEqual( + a, + { page: 1, nested: { ids: [1, 3] } }, + partial, + explicitUndefined, + ), + ).toBe(false) + }, + ) it('keeps partial comparison directional and arrays length-exact', () => { - expect(deepEqual({ a: 1, b: 2 }, { a: 1 }, { partial: true })).toBe(true) - expect(deepEqual({ a: 1 }, { a: 1, b: 2 }, { partial: true })).toBe(false) - expect(deepEqual([1, 2], [1], { partial: true })).toBe(false) + expect(deepEqual({ a: 1, b: 2 }, { a: 1 }, true)).toBe(true) + expect(deepEqual({ a: 1 }, { a: 1, b: 2 }, true)).toBe(false) + expect(deepEqual([1, 2], [1], true)).toBe(false) }) it('retains inherited enumeration, symbols, and hidden-property policy', () => { @@ -37,20 +53,12 @@ describe('deepEqual contract', () => { it('retains current undefined-key behavior rather than changing the contract', () => { expect(deepEqual({ a: undefined }, {})).toBe(true) - expect(deepEqual({ a: undefined }, {}, { ignoreUndefined: false })).toBe( - false, - ) + expect(deepEqual({ a: undefined }, {}, false, true)).toBe(false) // Existing quirk: this performance patch deliberately does NOT repair it. - expect( - deepEqual({ a: undefined }, { b: undefined }, { ignoreUndefined: false }), - ).toBe(true) - expect( - deepEqual( - {}, - { a: undefined }, - { partial: true, ignoreUndefined: false }, - ), - ).toBe(true) + expect(deepEqual({ a: undefined }, { b: undefined }, false, true)).toBe( + true, + ) + expect(deepEqual({}, { a: undefined }, true, true)).toBe(true) }) it('retains numeric equality', () => { @@ -85,18 +93,13 @@ describe('deepEqual contract', () => { throw new Error('must not read') }, } - expect(deepEqual({}, b, { ignoreUndefined: false })).toBe(false) + expect(deepEqual({}, b, false, true)).toBe(false) }) - it('does not inspect options on an identical child', () => { + it('short-circuits identical children', () => { const shared = {} - const opts = { - get partial(): boolean { - throw new Error('must not read') - }, - } - expect(deepEqual(shared, shared, opts)).toBe(true) - expect(deepEqual([shared], [shared], opts)).toBe(true) + expect(deepEqual(shared, shared, true, true)).toBe(true) + expect(deepEqual([shared], [shared], true, true)).toBe(true) }) it('keeps different class instances opaque', () => { diff --git a/packages/router-core/tests/deep-equal.bench.ts b/packages/router-core/tests/deep-equal.bench.ts index 7a8d8d0b93..2b2e788e16 100644 --- a/packages/router-core/tests/deep-equal.bench.ts +++ b/packages/router-core/tests/deep-equal.bench.ts @@ -2,7 +2,7 @@ import { bench, describe, expect } from 'vitest' import { deepEqual } from '../src/utils' // Workloads modeled on the router's callers: Link inline-option stabilization -// (`ignoreUndefined: false`), active-state search comparison (`partial`), +// (`explicitUndefined`), active-state search comparison (`partial`), // matchRoute params (`partial`), and search-middleware value comparisons. // Inputs rotate over a pool so a single hidden-class or cached shape does not // dominate; the "fresh" cases build their incoming value inside the timed op. @@ -66,9 +66,12 @@ expect(deepEqual(search, shared)).toBe(true) for (let index = 0; index < linkOptions.length; index++) { for (let slot = 0; slot < 3; slot++) { expect( - deepEqual(linkOptions[index]![slot], linkOptionsEqual[index]![slot], { - ignoreUndefined: false, - }), + deepEqual( + linkOptions[index]![slot], + linkOptionsEqual[index]![slot], + false, + true, + ), ).toBe(true) } } @@ -93,9 +96,9 @@ describe('deepEqual', () => { ) bench( - 'equal flat record (ignoreUndefined: false)', + 'equal flat record (explicitUndefined)', () => { - sink += +deepEqual(search, next(searchEqual), { ignoreUndefined: false }) + sink += +deepEqual(search, next(searchEqual), false, true) }, options, ) @@ -103,7 +106,7 @@ describe('deepEqual', () => { bench( 'equal flat record (partial)', () => { - sink += +deepEqual(search, next(searchEqual), { partial: true }) + sink += +deepEqual(search, next(searchEqual), true) }, options, ) @@ -141,12 +144,13 @@ describe('deepEqual', () => { ) bench( - 'fresh equal flat record (ignoreUndefined: false)', + 'fresh equal flat record (explicitUndefined)', () => { sink += +deepEqual( search, { page: 1, sort: 'asc', filter: 'open', tags: search.tags }, - { ignoreUndefined: false }, + false, + true, ) }, options, @@ -155,11 +159,7 @@ describe('deepEqual', () => { bench( 'fresh partial mismatch', () => { - sink += +deepEqual( - search, - { page: 1, sort: 'desc' }, - { partial: true, ignoreUndefined: true }, - ) + sink += +deepEqual(search, { page: 1, sort: 'desc' }, true) }, options, ) @@ -171,9 +171,7 @@ describe('deepEqual', () => { const previous = linkOptions[index]! const incoming = linkOptionsEqual[index]! for (let slot = 0; slot < 3; slot++) { - sink += +deepEqual(previous[slot], incoming[slot], { - ignoreUndefined: false, - }) + sink += +deepEqual(previous[slot], incoming[slot], false, true) } } }, diff --git a/packages/router-core/tests/utils.test.ts b/packages/router-core/tests/utils.test.ts index 3a5bfa7030..c5156adef8 100644 --- a/packages/router-core/tests/utils.test.ts +++ b/packages/router-core/tests/utils.test.ts @@ -362,43 +362,43 @@ describe('deepEqual', () => { it('should return `true` for equal objects', () => { const a = { a: { b: 'b' }, c: 'c', d: [{ d: 'd ' }] } const b = { a: { b: 'b' }, c: 'c', d: [{ d: 'd ' }] } - expect(deepEqual(a, b, { partial })).toEqual(true) - expect(deepEqual(b, a, { partial })).toEqual(true) + expect(deepEqual(a, b, partial)).toEqual(true) + expect(deepEqual(b, a, partial)).toEqual(true) }) it('should return `false` for non equal objects', () => { const a = { a: { b: 'b' }, c: 'c' } const b = { a: { b: 'c' }, c: 'c' } - expect(deepEqual(a, b, { partial })).toEqual(false) - expect(deepEqual(b, a, { partial })).toEqual(false) + expect(deepEqual(a, b, partial)).toEqual(false) + expect(deepEqual(b, a, partial)).toEqual(false) }) it('should return `true` for equal objects and ignore `undefined` properties', () => { const a = { a: 'a', b: undefined, c: 'c' } const b = { a: 'a', c: 'c' } - expect(deepEqual(a, b, { partial })).toEqual(true) - expect(deepEqual(b, a, { partial })).toEqual(true) + expect(deepEqual(a, b, partial)).toEqual(true) + expect(deepEqual(b, a, partial)).toEqual(true) }) it('should return `true` for equal objects and ignore `undefined` nested properties', () => { const a = { a: { b: 'b', x: undefined }, c: 'c' } const b = { a: { b: 'b' }, c: 'c', d: undefined } - expect(deepEqual(a, b, { partial })).toEqual(true) - expect(deepEqual(b, a, { partial })).toEqual(true) + expect(deepEqual(a, b, partial)).toEqual(true) + expect(deepEqual(b, a, partial)).toEqual(true) }) it('should return `true` for equal arrays and ignore `undefined` object properties', () => { const a = { a: { b: 'b' }, c: undefined } const b = { a: { b: 'b' } } - expect(deepEqual([a], [b], { partial })).toEqual(true) - expect(deepEqual([b], [a], { partial })).toEqual(true) + expect(deepEqual([a], [b], partial)).toEqual(true) + expect(deepEqual([b], [a], partial)).toEqual(true) }) it('should return `true` for equal arrays and ignore nested `undefined` object properties', () => { const a = { a: { b: 'b', x: undefined }, c: 'c' } const b = { a: { b: 'b' }, c: 'c' } - expect(deepEqual([a], [b], { partial })).toEqual(true) - expect(deepEqual([b], [a], { partial })).toEqual(true) + expect(deepEqual([a], [b], partial)).toEqual(true) + expect(deepEqual([b], [a], partial)).toEqual(true) }) }) @@ -409,15 +409,15 @@ describe('deepEqual', () => { it('should return `false` for objects', () => { const a = { a: { b: 'b', x: undefined }, c: 'c' } const b = { a: { b: 'b' }, c: 'c', d: undefined } - expect(deepEqual(a, b, { partial, ignoreUndefined })).toEqual(false) - expect(deepEqual(b, a, { partial, ignoreUndefined })).toEqual(false) + expect(deepEqual(a, b, partial, !ignoreUndefined)).toEqual(false) + expect(deepEqual(b, a, partial, !ignoreUndefined)).toEqual(false) }) it('should return `false` for arrays', () => { const a = { a: { b: 'b', x: undefined }, c: 'c' } const b = { a: { b: 'b' }, c: 'c' } - expect(deepEqual([a], [b], { partial, ignoreUndefined })).toEqual(false) - expect(deepEqual([b], [a], { partial, ignoreUndefined })).toEqual(false) + expect(deepEqual([a], [b], partial, !ignoreUndefined)).toEqual(false) + expect(deepEqual([b], [a], partial, !ignoreUndefined)).toEqual(false) }) }) describe('partial = true', () => { @@ -425,15 +425,15 @@ describe('deepEqual', () => { it('should return `true` for objects', () => { const a = { a: { b: 'b' }, c: 'c' } const b = { a: { b: 'b' }, c: 'c', d: undefined } - expect(deepEqual(a, b, { partial, ignoreUndefined })).toEqual(true) - expect(deepEqual(b, a, { partial, ignoreUndefined })).toEqual(true) + expect(deepEqual(a, b, partial, !ignoreUndefined)).toEqual(true) + expect(deepEqual(b, a, partial, !ignoreUndefined)).toEqual(true) }) it('should return `true` for arrays', () => { const a = { a: { b: 'b', x: undefined }, c: 'c' } const b = { a: { b: 'b' }, c: 'c' } - expect(deepEqual([a], [b], { partial, ignoreUndefined })).toEqual(true) - expect(deepEqual([b], [a], { partial, ignoreUndefined })).toEqual(true) + expect(deepEqual([a], [b], partial, !ignoreUndefined)).toEqual(true) + expect(deepEqual([b], [a], partial, !ignoreUndefined)).toEqual(true) }) }) }) @@ -442,15 +442,15 @@ describe('deepEqual', () => { it('correctly compares partially equal objects', () => { const a = { a: { b: 'b' }, c: 'c', d: [{ d: 'd ' }] } const b = { a: { b: 'b' }, c: 'c' } - expect(deepEqual(a, b, { partial: true })).toEqual(true) - expect(deepEqual(b, a, { partial: true })).toEqual(false) + expect(deepEqual(a, b, true)).toEqual(true) + expect(deepEqual(b, a, true)).toEqual(false) }) it('correctly compares partially equal objects and ignores `undefined` object properties', () => { const a = { a: { b: 'b' }, c: 'c', d: [{ d: 'd ' }], e: undefined } const b = { a: { b: 'b' }, c: 'c', d: undefined } - expect(deepEqual(a, b, { partial: true })).toEqual(true) - expect(deepEqual(b, a, { partial: true })).toEqual(false) + expect(deepEqual(a, b, true)).toEqual(true) + expect(deepEqual(b, a, true)).toEqual(false) }) }) @@ -487,7 +487,7 @@ describe('deepEqual', () => { Object.prototype.x = 'x' const a = { a: 1 } const b = { a: 1 } - expect(deepEqual(a, b, { ignoreUndefined: false })).toEqual(true) + expect(deepEqual(a, b, false, true)).toEqual(true) }, ) diff --git a/packages/solid-router/src/link.tsx b/packages/solid-router/src/link.tsx index aeaf6a4a20..a5fc4bca57 100644 --- a/packages/solid-router/src/link.tsx +++ b/packages/solid-router/src/link.tsx @@ -212,10 +212,12 @@ export function useLinkProps< } if (activeOptions?.includeSearch ?? true) { - const searchTest = deepEqual(current.search, nextLocation.search, { - partial: !activeOptions?.exact, - ignoreUndefined: !activeOptions?.explicitUndefined, - }) + const searchTest = deepEqual( + current.search, + nextLocation.search, + !activeOptions?.exact, + activeOptions?.explicitUndefined, + ) if (!searchTest) { return false } diff --git a/packages/vue-router/src/link.tsx b/packages/vue-router/src/link.tsx index e0a0789524..6d2fea690c 100644 --- a/packages/vue-router/src/link.tsx +++ b/packages/vue-router/src/link.tsx @@ -681,10 +681,12 @@ function getIsActive( } if (activeOptions?.includeSearch ?? true) { - const searchTest = deepEqual(loc.search, nextLoc.search, { - partial: !activeOptions?.exact, - ignoreUndefined: !activeOptions?.explicitUndefined, - }) + const searchTest = deepEqual( + loc.search, + nextLoc.search, + !activeOptions?.exact, + activeOptions?.explicitUndefined, + ) if (!searchTest) { return false } From 8e164d28f9e9eb1a7301109230d7ece9817492a8 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Mon, 14 Sep 2026 23:30:50 +0200 Subject: [PATCH 036/175] refactor(react-router): drop the useLinkProps pass-through wrapper (#8420) `useLinkPropsFor` existed only to keep the `host` argument off the public `useLinkProps` signature. Fold it into `useLinkProps` behind an `@internal` overload; `stripInternal` removes that overload from the published declarations, so the public signature stays `(options, forwardedRef?)`. react-router.full shrinks by 24 B gzip. (cherry picked from commit 918d3050850815abc8ae49518befda61cb29bf7b) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/use-link-props-wrapper.md | 5 +++++ packages/react-router/src/link.tsx | 32 +++++++++++++++++++--------- 2 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 .changeset/use-link-props-wrapper.md diff --git a/.changeset/use-link-props-wrapper.md b/.changeset/use-link-props-wrapper.md new file mode 100644 index 0000000000..e166709285 --- /dev/null +++ b/.changeset/use-link-props-wrapper.md @@ -0,0 +1,5 @@ +--- +'@tanstack/react-router': patch +--- + +`useLinkProps` no longer calls through an internal wrapper. The host element `Link` renders on is an `@internal` overload parameter that is stripped from the published declarations, so the public `useLinkProps(options, forwardedRef?)` signature is unchanged. diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 4d5e13164a..26ec05a848 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -149,15 +149,16 @@ export function useLinkProps< >( options: UseLinkPropsOptions, forwardedRef?: React.ForwardedRef, -): React.ComponentPropsWithRef<'a'> { - return useLinkPropsFor(options, forwardedRef) -} - -// `host` is what the props are rendered on: `'a'` for `Link`, the component -// given to `createLink`, or `undefined` for the public hook. `Link` never -// renders `type` and an anchor never receives `disabled`, so those are left -// out here rather than copied away from the result in the component. -function useLinkPropsFor< +): React.ComponentPropsWithRef<'a'> +/** + * `host` is what the props are rendered on: `'a'` for `Link` or the component + * given to `createLink`. `Link` never renders `type` and an anchor never + * receives `disabled`, so those are left out here rather than copied away + * from the result in the component. Stripped from the public declarations. + * + * @internal + */ +export function useLinkProps< TRouter extends AnyRouter = RegisteredRouter, const TFrom extends string = string, const TTo extends string | undefined = undefined, @@ -166,6 +167,17 @@ function useLinkPropsFor< >( options: UseLinkPropsOptions, forwardedRef: React.ForwardedRef | undefined, + host: 'a' | React.ElementType, +): React.ComponentPropsWithRef<'a'> +export function useLinkProps< + TRouter extends AnyRouter = RegisteredRouter, + const TFrom extends string = string, + const TTo extends string | undefined = undefined, + const TMaskFrom extends string = TFrom, + const TMaskTo extends string = '', +>( + options: UseLinkPropsOptions, + forwardedRef?: React.ForwardedRef, host?: 'a' | React.ElementType, ): React.ComponentPropsWithRef<'a'> { const router = useRouter() @@ -822,7 +834,7 @@ export function createLink( export const Link: LinkComponent<'a'> = React.memo( React.forwardRef((props, ref) => { const host = props._asChild || 'a' - const linkProps = useLinkPropsFor(props as any, ref, host) + const linkProps = useLinkProps(props as any, ref, host) const children = typeof props.children === 'function' From 856cfcd05a53a12cde9d2c6c0dc3935c86671f69 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Tue, 15 Sep 2026 22:36:13 +0200 Subject: [PATCH 037/175] agents (#8258) * agents * update * docs: require upstream fixes for dependency issues --- AGENTS.md | 197 ++++------------------- benchmarks/AGENTS.md | 13 ++ docs/AGENTS.md | 4 + e2e/AGENTS.md | 9 ++ examples/AGENTS.md | 4 + packages/AGENTS.md | 16 ++ packages/history/AGENTS.md | 3 + packages/router-core/AGENTS.md | 12 ++ packages/router-generator/AGENTS.md | 6 + packages/router-plugin/AGENTS.md | 7 + packages/router-ssr-query-core/AGENTS.md | 9 ++ packages/start-client-core/AGENTS.md | 5 + packages/start-plugin-core/AGENTS.md | 7 + packages/start-server-core/AGENTS.md | 6 + 14 files changed, 128 insertions(+), 170 deletions(-) create mode 100644 benchmarks/AGENTS.md create mode 100644 docs/AGENTS.md create mode 100644 e2e/AGENTS.md create mode 100644 examples/AGENTS.md create mode 100644 packages/AGENTS.md create mode 100644 packages/history/AGENTS.md create mode 100644 packages/router-core/AGENTS.md create mode 100644 packages/router-generator/AGENTS.md create mode 100644 packages/router-plugin/AGENTS.md create mode 100644 packages/router-ssr-query-core/AGENTS.md create mode 100644 packages/start-client-core/AGENTS.md create mode 100644 packages/start-plugin-core/AGENTS.md create mode 100644 packages/start-server-core/AGENTS.md diff --git a/AGENTS.md b/AGENTS.md index 3368f3f100..41d28bbd38 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,181 +1,38 @@ # AGENTS.md -Read and follow [`CONTRIBUTING.md`](./CONTRIBUTING.md) before analyzing or -changing this repository. Its contribution and pull request requirements apply -to AI-assisted work. +## Scope -## Project overview +- Read applicable nested `AGENTS.md` files before editing or testing a subtree. +- Shared routing belongs in `packages/router-core`; check React, Solid, and Vue bindings for shared changes. Shared Start runtime/build logic lives in `packages/start-*-core`. -TanStack Router is a type-safe router with built-in caching and URL state management for React and Solid applications. This monorepo contains two main products: +## Work and validation -- **TanStack Router** - Core routing library with type-safe navigation, search params, and path params -- **TanStack Start** - Full-stack framework built on top of TanStack Router +- Start bug fixes with a failing regression test that uses only public APIs to reproduce and assert user- or developer-visible behavior. Do not manufacture bugs by mutating internals. Establish whether real usage can reach the failing state before adding runtime handling; simplify handling of states proven unreachable. +- For suspected dependency issues, verify the upstream root cause, then propose an upstream fix to the user, including for other `@tanstack/*` packages. **Never implement a workaround in this repository unless the user explicitly authorizes it.** +- During debugging/prototyping, keep fixes aligned with the PR's intended architecture. If making a test pass requires another flag, counter, copied deadline, or duplicate completion authority, stop and consolidate state and ownership. Remove superseded paths instead of accumulating patches and bundle growth. +- Use Node from `.nvmrc` and pnpm from root `package.json`. Install at the root with `CI=1 pnpm install --frozen-lockfile`. +- For sandbox-blocked registry/store access, escalate the same command; report the blocker if unavailable. Do not change stores, delete dependencies/lockfiles, use `--force`/`--ignore-scripts`, or weaken workspace trust/build policies to bypass it. +- Never manually edit `pnpm-lock.yaml` or any `routeTree.gen.ts`. Regenerate the lockfile with `pnpm install --no-frozen-lockfile` after intentional dependency changes; regenerate route trees through app builds/dev servers or the generator fixture harness. +- Always use control-flow braces. Run `pnpm format` before validation. +- Use Nx: workspace imports consume built packages, so direct runners can test stale dependencies. Inspect resolved targets; some are inferred. -## Setup commands +```sh +CI=1 NX_DAEMON=false pnpm nx run : --outputStyle=stream --skipRemoteCache +``` -- Install deps: `pnpm install` -- Setup e2e testing: `pnpm exec playwright install` -- Build packages: `pnpm build` (affected) or `pnpm build:all` (force all) -- Start dev server: `pnpm dev` -- Run tests: `pnpm test` +- Run one Nx command at a time. For a ~20-second startup/graph stall, stop, run `pnpm nx reset`, and retry once, then escalate. Do not apply that timeout to running tests. +- For code changes, run affected packages' `test:unit`, `test:types`, and `test:eslint` where available, including affected consumers; use `test:e2e` for browser/app behavior and `test:build` for exports/build changes. Root `pnpm test` includes the full e2e suite. Published-code changes require `pnpm changeset`. -## Code style +## Runtime rules -- TypeScript strict mode with extensive type safety -- Framework-agnostic core logic separated from React/Solid bindings -- Type-safe routing with search params and path params -- Use workspace protocol for internal dependencies (`workspace:*`) -- Always use curly braces for `if`, `else`, loops, and similar control statements. Never write one-line bodies like `if (foo) x = 1`. +- Import `isServer` from `@tanstack/router-core/isServer`. Conditional exports select: `development` → `undefined`; server (`workerd`, `worker`, `deno`, `node`, `bun`) → `true` except `NODE_ENV=test` → `undefined`; browser/fallback → `false`. `development` wins; `NODE_ENV=development` alone does not select it. +- Keep `isServer ?? router.isServer` directly in each branch condition for dead-code elimination; negate the whole expression for client branches. Never extract it into a variable (e.g. `const serverRendering = isServer ?? router.isServer`) or helper. Without a router, inline `isServer ?? typeof window === 'undefined'` (or the existing `document` check). Keep the constant first and use `??`, never `||`. +- **Never create UI/router reactivity on the server, including development/tests.** Branch before reactive setup; use direct reads and core non-reactive stores. Required transport listeners are allowed only with request-scoped lifetimes and cleanup. +- Shared route definitions/build metadata must not acquire request/user data. Keep it on the request's Router, context, or QueryClient. +- HMR can replace code while caches and pending work survive. Invalidate derived state or bypass caching in development; reject stale async results while preserving intentional HMR identities/state. +- Gate developer diagnostics and message construction with direct `process.env.NODE_ENV !== 'production'` checks. Preserve required validation/throws in production (e.g. detailed development error, compact `invariant()` failure). `!== 'development'` also enables the guarded code in tests; preserve existing dev-server mode gates. -## Dev environment tips +## Performance and final bundle pass -- This is a pnpm workspace monorepo with packages organized by functionality -- Nx provides caching, affected testing, targeting, and parallel execution for efficiency -- Use `pnpm nx show projects` to list all available packages -- Target specific packages: `pnpm nx run @tanstack/react-router:test:unit` -- Target multiple packages: `pnpm nx run-many --target=test:eslint --projects=@tanstack/history,@tanstack/router-core` -- Run affected tests only: `pnpm nx affected --target=test:unit` -- Exclude patterns: `pnpm nx run-many --target=test:unit --exclude="examples/**,e2e/**"` -- Navigate to examples and run `pnpm dev` to test changes: `cd examples/react/basic && pnpm dev` -- **Granular unit testing through Nx (recommended):** - - Specific files: `pnpm nx run @tanstack/react-router:test:unit -- tests/link.test.tsx tests/Scripts.test.tsx` - - Test patterns: `pnpm nx run @tanstack/react-router:test:unit -- tests/ClientOnly.test.tsx -t "should render fallback"` - - Name patterns: `pnpm nx run @tanstack/react-router:test:unit -- -t "navigation"` (all tests with "navigation" in name) - - Exclude patterns: `pnpm nx run @tanstack/react-router:test:unit -- --exclude="**/*link*" tests/` - - List tests: `pnpm nx run @tanstack/react-router:test:unit -- list tests/link.test.tsx` (or `-- list` for all) -- **Available test targets per package:** `test:unit`, `test:types`, `test:eslint`, `test:build`, `test:perf`, `build` -- **Testing strategy:** Package level (nx) → File-level args via nx → Test-level args (`-t`) via nx → Pattern-level args (`--exclude`) via nx -- **Agent execution guardrails (important):** - - Always prefer `pnpm nx ...` over `npx nx ...`. - - Prefer Nx targets over direct test runners so task dependencies (including required builds) remain in the graph. - - In sandbox, run Nx with `CI=1 NX_DAEMON=false pnpm nx run : --outputStyle=stream --skipRemoteCache` - - Run only one Nx command at a time. - - If an Nx command shows no output for ~20 seconds, stop, run `pnpm nx reset` once, and retry once. - - Do not loop retries indefinitely. If it still hangs or sandbox blocks graph/daemon behavior, request escalation immediately. - -## Testing instructions - -- **Critical**: Always run unit and type tests during development - do not proceed if they fail -- **Test types:** `pnpm test:unit`, `pnpm test:types`, `pnpm test:eslint`, `pnpm test:e2e`, `pnpm test:build` -- **Full CI suite:** `pnpm test:ci` -- **Fix formatting:** `pnpm format` -- **Efficient targeted testing workflow:** - 1. **Affected only:** `pnpm nx affected --target=test:unit` (compares to main branch) - 2. **Specific packages:** `pnpm nx run @tanstack/react-router:test:unit` - 3. **Specific files:** `pnpm nx run @tanstack/react-router:test:unit -- tests/link.test.tsx` - 4. **Specific patterns:** `pnpm nx run @tanstack/react-router:test:unit -- tests/link.test.tsx -t "preloading"` -- **Pro tips:** - - Use `pnpm nx run @tanstack/react-router:test:unit -- list` to explore available tests before running - - Use `-t "pattern"` to focus on specific functionality during development - - Use `--exclude` patterns to skip unrelated tests - - Keep all test filtering arguments behind `pnpm nx run ... -- ...` for maximum precision while preserving task dependencies -- **Example workflow:** `pnpm nx run @tanstack/react-router:test:unit` → `pnpm nx run @tanstack/react-router:test:unit -- tests/link.test.tsx` → `pnpm nx run @tanstack/react-router:test:unit -- tests/link.test.tsx -t "preloading"` - -## PR instructions - -- Always run `pnpm test:eslint`, `pnpm test:types`, and `pnpm test:unit` before committing -- Test changes in relevant example apps: `cd examples/react/basic && pnpm dev` -- Update corresponding documentation in `docs/` directory when adding features -- Add or update tests for any code changes -- Use internal docs links relative to `docs/` folder (e.g., `./guide/data-loading`) - -## Package structure - -**Core packages:** - -- `packages/router-core/` - Framework-agnostic core router logic -- `packages/react-router/`, `packages/solid-router/` - React/Solid bindings and components -- `packages/history/` - Browser history management - -**Tooling:** - -- `packages/router-cli/` - CLI tools for code generation -- `packages/router-generator/` - Route generation utilities -- `packages/router-plugin/` - Universal bundler plugins (Vite, Webpack, ESBuild, Rspack) -- `packages/virtual-file-routes/` - Virtual file routing system - -**Developer experience:** - -- `packages/router-devtools/`, `packages/*-router-devtools/` - Development tools -- `packages/eslint-plugin-router/` - ESLint rules for router - -**Validation adapters:** - -- `packages/zod-adapter/`, `packages/valibot-adapter/`, `packages/arktype-adapter/` - -**Start framework:** - -- `packages/*-start/`, `packages/start-*/` - Full-stack framework packages - -**Examples & testing:** - -- `examples/react/`, `examples/solid/` - Example applications (test changes here) -- `e2e/` - End-to-end tests (requires Playwright) -- `docs/router/`, `docs/start/` - Documentation with React/Solid subdirectories - -**Dependencies:** Uses workspace protocol (`workspace:*`) - core → framework → start packages - -## Common development tasks - -**Adding new routes:** - -- Use file-based routing in `src/routes/` directories -- Or use code-based routing with route definitions -- Run route generation with CLI tools - -**Testing changes:** - -- Build packages: `pnpm build` or `pnpm dev` (watch mode) -- Run example apps to test functionality -- Use devtools for debugging router state - -**Documentation updates:** - -- Update relevant docs in `docs/` directory -- Ensure examples reflect documentation changes -- Test documentation links and references -- Use relative links to `docs/` folder format - -## Framework-specific notes - -**React:** - -- Uses React Router components and hooks -- Supports React Server Components (RSC) -- Examples include React Query integration -- Package: `@tanstack/react-router` - -**Solid:** - -- Uses Solid Router components and primitives -- Supports Solid Start for full-stack applications -- Examples include Solid Query integration -- Package: `@tanstack/solid-router` - -## Environment requirements - -- **Node.js** - Required for development -- **pnpm** - Package manager (required for workspace features) -- **Playwright** - Required for e2e tests (`pnpm exec playwright install`) - -## Key architecture patterns - -- **Type Safety**: Extensive TypeScript for type-safe routing -- **Framework Agnostic**: Core logic separated from framework bindings -- **Plugin Architecture**: Universal bundler plugins using unplugin -- **File-based Routing**: Support for both code-based and file-based routing -- **Search Params**: First-class support for type-safe search parameters - -## Development workflow - -1. **Setup**: `pnpm install` and `pnpm exec playwright install` -2. **Build**: `pnpm build:all` or `pnpm dev` for watch mode -3. **Test**: Make changes and run relevant tests (use nx for targeted testing) -4. **Examples**: Navigate to examples and run `pnpm dev` to test changes -5. **Quality**: Run `pnpm test:eslint`, `pnpm test:types`, `pnpm test:unit` before committing - -## References - -- **Documentation**: https://tanstack.com/router -- **GitHub**: https://github.com/TanStack/router -- **Discord Community**: https://discord.com/invite/WrRKjPJ +- For runtime/memory changes, compare identical baseline/candidate workloads using the relevant [benchmark guide](benchmarks/AGENTS.md): client navigation, Start SSR, or memory. Add coverage for unmeasured mechanisms. +- **Last phase for every change affecting emitted client JavaScript**, including core/build transforms: complete the full [bundle-size-optimization skill](.agents/skills/bundle-size-optimization/SKILL.md) after correctness and performance validation. The full workflow is mandatory. diff --git a/benchmarks/AGENTS.md b/benchmarks/AGENTS.md new file mode 100644 index 0000000000..268e23d9cc --- /dev/null +++ b/benchmarks/AGENTS.md @@ -0,0 +1,13 @@ +# Benchmarks + +Read the relevant README before running benchmarks. Compare baseline and candidate with the same workload and production builds; add a focused case when existing scenarios miss the changed mechanism. Keep workloads and benchmark names stable for historical comparisons. + +| Changed behavior | Guide | Nx project | +| ------------------------------------------ | ---------------------------------- | -------------------------------------------------------- | +| Standalone Router navigation/rendering CPU | [client-nav](client-nav/README.md) | `@benchmarks/client-nav` | +| Start request/SSR CPU | [ssr](ssr/README.md) | `@benchmarks/ssr` | +| Client/server retention and allocations | [memory](memory/README.md) | `@benchmarks/memory-client`, `@benchmarks/memory-server` | + +Use `test:perf:` through Nx. Plain memory runs only smoke-test; memory metrics require CodSpeed. Client navigation benchmarks do not cover Start hydration or client server-function calls. + +For bundle-size work, follow the full optimization skill required by the root guide. Full API fixtures are maintained manually: when public hooks/components change, update matching `bundle-size/scenarios/*-full/src/routes/__root.tsx` fixtures. Save baseline results separately because each run overwrites `bundle-size/results/current.json`; report final gzip deltas and explain remaining growth. diff --git a/docs/AGENTS.md b/docs/AGENTS.md new file mode 100644 index 0000000000..ab2d4117e2 --- /dev/null +++ b/docs/AGENTS.md @@ -0,0 +1,4 @@ +# Documentation + +- Register new published pages in `router/config.json` or `start/config.json`; drafts need not be registered. +- Run `pnpm test:docs` from the repository root for Markdown link validation. It checks `docs/**/*.md`, not Markdown elsewhere. Relative links resolve from the containing file. diff --git a/e2e/AGENTS.md b/e2e/AGENTS.md new file mode 100644 index 0000000000..f373ecba4f --- /dev/null +++ b/e2e/AGENTS.md @@ -0,0 +1,9 @@ +# E2E tests + +- Read the project's `package.json` and test config. Inspect resolved targets with `CI=1 NX_DAEMON=false pnpm nx show project --json`: `nx.metadata.playwrightModes` generates modes, variants, and shards. The aggregate `test:e2e` can also run extra package-script suites. For focused Playwright runs, select an executable test target (a mode/shard target when inferred) and append filters after `--` (e.g. `-- tests/navigation.spec.ts --grep "redirect"`). +- Check Playwright's `webServer.command` to select dev or production coverage. A mode named `ssr` can still start a dev server. `e2e/eslint-plugin-start` uses Vitest instead of Playwright. +- For inferred Playwright modes, Nx builds first and supplies `MODE`, `E2E_TOOLCHAIN`, `E2E_DIST_DIR`, and `E2E_PORT_KEY`. Preserve these in server/config changes; let Nx own the build while `webServer.command` only starts the selected server. Target generation lives in [`scripts/nx/playwright-plugin.ts`](../scripts/nx/playwright-plugin.ts). +- Use the same `E2E_PORT_KEY`-aware key throughout config, app, and dummy-server setup/teardown. Clean only that key's port files, before allocation, when `TEST_WORKER_INDEX === undefined`; worker config reloads must not remap a running server's port. +- For new browser tests, reuse the local error-checking fixture. The shared `test` from `@tanstack/router-e2e-utils` fails on unexpected `console.error`, including hydration errors; allow only expected errors with `whitelistErrors`. +- HMR/watch tests edit real app sources. Reuse existing edit/restore helpers such as `createHmrFileEditor`, restore edits in teardown even after failures, and preserve the suites' single-worker and Nx `parallelism: false` settings. +- `@tanstack/router-e2e-utils:test:unit` is a placeholder. Validate helper changes through consuming e2e projects. diff --git a/examples/AGENTS.md b/examples/AGENTS.md new file mode 100644 index 0000000000..eb47fbd925 --- /dev/null +++ b/examples/AGENTS.md @@ -0,0 +1,4 @@ +# Examples + +- Versioned dependencies on this repository's packages resolve locally through `pnpm-workspace.yaml` overrides. Keep published version ranges in example manifests; do not replace them with `workspace:*` as a linking fix. +- Root `pnpm dev` watches package builds. To run an example app, use its own `dev` script after building its workspace dependencies. diff --git a/packages/AGENTS.md b/packages/AGENTS.md new file mode 100644 index 0000000000..0c63c3a15c --- /dev/null +++ b/packages/AGENTS.md @@ -0,0 +1,16 @@ +# Packages + +- Route generation/code splitting live in `router-generator`/`router-plugin`; Start build transforms live in `start-plugin-core`. + +## Router bindings + +- Navigation/render identity is more than href or route membership: same-href navigations can have different history keys, and suspended renders must acknowledge only their own match publication. Preserve those identity checks when optimizing stores or render notifications. +- In navigation params/search, an explicit `undefined` can clear an inherited value; an absent key can inherit it. Preserve that distinction when comparing or memoizing options; React's `useValueStable` uses `deepEqual` with `ignoreUndefined: false`. + +## Tests + +- Inspect test commands: several `test:unit` scripts immediately exit or only echo a message. For these packages, validate behavior in the shared core or consuming e2e app; a successful placeholder target provides no unit coverage. +- For `*-router-ssr-query` changes, run `router-ssr-query-core` unit tests and the affected framework's `e2e/-start/query-integration` tests. The framework wrapper unit targets currently exit without running tests. +- For single-command Vitest targets, append filters after `--`, e.g. `-- tests/link.test.tsx -t "preloading"`. +- `solid-router` and `router-generator` chain two Vitest commands in `test:unit`. Trailing file/name/update arguments reach only the final command. Run the full target for verification: Solid needs browser and server suites; the generator needs fixture generation followed by typechecking. +- For public type changes, add `*.test-d.*` inference regressions and run both unit and type targets. React/Solid Router's TypeScript compiler matrix checks `src`; Vitest runs their inference tests. For changes to inference cost, follow the [type-safety performance guidance](../docs/router/guide/type-safety.md#performance-recommendations); `test:perf` measures runtime, not compiler cost. diff --git a/packages/history/AGENTS.md b/packages/history/AGENTS.md new file mode 100644 index 0000000000..509da6a4ec --- /dev/null +++ b/packages/history/AGENTS.md @@ -0,0 +1,3 @@ +# History + +Accepted browser push/replace operations update the in-memory location immediately and batch native writes into a microtask. Preserve coalescing: the latest href/state wins, but any queued push wins over replaces. Use `history.flush()` when native browser state must be current; verify subsequent updates still flush afterward in `tests/createBrowserHistory.test.ts`. diff --git a/packages/router-core/AGENTS.md b/packages/router-core/AGENTS.md new file mode 100644 index 0000000000..b6f0e66911 --- /dev/null +++ b/packages/router-core/AGENTS.md @@ -0,0 +1,12 @@ +# Router core + +- `RouterCore.update` gates shared route-tree caching with `process.env.NODE_ENV !== 'development'`. `loadRouteChunk` checks promise ownership outside production so obsolete lazy imports cannot overwrite HMR changes. Preserve both behaviors; validate hot updates while imports are pending. +- Route hooks, lifecycle callbacks, and abort listeners can navigate synchronously. Recheck the internal navigation owner after callbacks and awaits before publishing state/assets. Public loader abort signals belong to shared data generations; self-aborting a loader does not discard its result or error. Preserve loader ownership when transferring work between preload, navigation, cache, and background loads; see [`tests/preload-public-signal-lifetime.test.ts`](tests/preload-public-signal-lifetime.test.ts). +- Reusing loader work/data does not reuse `beforeLoad`: each active preload and subsequent navigation reruns it. Keep its returned context separate from reusable route-context contributions; see [`tests/public-preload-lane-contract.test.ts`](tests/public-preload-lane-contract.test.ts). +- Code emitted into HTML (`?script-string` entries and RawStream factories) executes without module scope. Keep it self-contained; pass dependencies explicitly. Validate emitted strings through the existing execution tests after refactors (`RawStream`, `scroll-restoration-script`, `tsr-script-teardown`). +- Before changing SSR streaming or hydration transport, read [`src/ssr/STREAMING.md`](src/ssr/STREAMING.md). Byte ordering, renderer safe points, and completion handling have framework-specific contracts. +- Backpressure tests are excluded from normal unit runs. For buffering/backpressure changes, run the gated suite below. Its memory case requires exposed GC; bypass Nx cache so a previous run with the gate disabled cannot count as validation. + +```sh +RUN_BACKPRESSURE_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @tanstack/router-core:test:unit --outputStyle=stream --skipRemoteCache --skipNxCache -- tests/transformStreamBackpressure.perf.test.ts --pool=forks --execArgv=--expose-gc +``` diff --git a/packages/router-generator/AGENTS.md b/packages/router-generator/AGENTS.md new file mode 100644 index 0000000000..1cc70bf370 --- /dev/null +++ b/packages/router-generator/AGENTS.md @@ -0,0 +1,6 @@ +# Route generator + +- Preserve the existing `safeFileWrite` path: temporary-file rename, modification-time conflict retry, and post-rename stat. Keep unchanged-write suppression and main/shadow cache rotation; these protect concurrent edits, avoid watcher loops, and discard deleted routes. +- Run the complete `test:unit` target after generator changes. Its runtime phase generates fixture route trees before typechecking their consumers; `test:types` excludes the generator fixtures. +- Add generation cases under `tests/generator//`. Read [`tests/generator.test.ts`](tests/generator.test.ts) for per-case configuration and preprocessing. Change route inputs/configuration or templates, then regenerate route trees and expected snapshots through the test harness. +- `preprocess()` recreates selected route files for `file-modification*` and `custom-scaffolding`. Edit their templates/configuration/preprocessing when changing those inputs; edits to recreated files are overwritten. diff --git a/packages/router-plugin/AGENTS.md b/packages/router-plugin/AGENTS.md new file mode 100644 index 0000000000..e954110819 --- /dev/null +++ b/packages/router-plugin/AGENTS.md @@ -0,0 +1,7 @@ +# Router bundler plugin + +- Preserve one initialization of shared module state across reference and split chunks. Shared extraction includes transitive dependencies and whole destructured declarations; never extract `Route` or bindings that depend on it. The invariant suite in `tests/code-splitter.test.ts` covers these contracts. +- `handleRouteUpdate` is stringified and injected into app modules. Keep runtime dependencies inside the function or explicitly emit them; extracting a helper to plugin module scope breaks the generated function. `tests/handle-route-update.test.ts` executes that emitted code. +- Route HMR rebuilds indexes, clears `resolvePathCache`, replaces lazy-chunk ownership, and refreshes active routes while preserving Fast Refresh component identities. Keep these steps coordinated when adding derived state. +- For code-splitting changes, add inputs under `tests/code-splitter/test-files//`. Regenerate and review reference, virtual, and shared snapshots for every grouping in [`tests/code-splitter.test.ts`](tests/code-splitter.test.ts). +- Check [`tests/constants.ts`](tests/constants.ts) for framework coverage: the snapshot matrix currently covers React and Solid only. Validate affected Vue behavior in Vue router e2e apps. diff --git a/packages/router-ssr-query-core/AGENTS.md b/packages/router-ssr-query-core/AGENTS.md new file mode 100644 index 0000000000..a1799ae8f3 --- /dev/null +++ b/packages/router-ssr-query-core/AGENTS.md @@ -0,0 +1,9 @@ +# SSR query integration + +Register QueryClient teardown at SSR attachment, before loading/dehydration can fail. The transport subscribes after initial dehydration. Render completion flushes pending queries, unsubscribes, and closes the stream. Request cleanup also clears the QueryClient, including canceled streams and late dehydration results; preserve these distinct lifecycles in `tests/index.test.ts`. + +For query retention or cleanup changes, enable the GC tests that normal unit runs skip. `RUN_SSR_GC_TESTS=1` configures forked workers with exposed GC. Bypass Nx cache so a previous run with the gate disabled cannot count as validation. + +```sh +RUN_SSR_GC_TESTS=1 CI=1 NX_DAEMON=false pnpm nx run @tanstack/router-ssr-query-core:test:unit --outputStyle=stream --skipRemoteCache --skipNxCache -- tests/index.test.ts +``` diff --git a/packages/start-client-core/AGENTS.md b/packages/start-client-core/AGENTS.md new file mode 100644 index 0000000000..1e45453ddf --- /dev/null +++ b/packages/start-client-core/AGENTS.md @@ -0,0 +1,5 @@ +# Start shared/client runtime + +- RawStream RPC responses use binary frames; request arguments/static responses use JSON/base64; SSR uses injected script factories. Pair framing changes in `src/client-rpc/frame-decoder.ts` with `../start-server-core/src/frame-protocol.ts`. For API/serialization changes, validate affected paths through RawStream e2e and encoder/decoder tests. +- Preserve decoder limits and cancellation scopes: canceling one raw stream must leave sibling streams usable; canceling the JSON stream cancels the whole response. Keep malformed/truncated-frame, unread-stream, and split-header coverage in `tests/frame-decoder.test.ts`. +- Context crosses a trust boundary. Use `safeObjectMerge`/`createNullProtoObject`; preserve trusted server middleware context over client-sent context, including SSR and FormData calls. The `server-functions-global-middleware` e2e suite covers that precedence. diff --git a/packages/start-plugin-core/AGENTS.md b/packages/start-plugin-core/AGENTS.md new file mode 100644 index 0000000000..cd73bbf307 --- /dev/null +++ b/packages/start-plugin-core/AGENTS.md @@ -0,0 +1,7 @@ +# Start compiler and bundler integration + +- Virtual prefixes and query parameters can be part of a module's identity. Preserve them in resolution, loading, and module-cache keys; use `cleanId` only for physical-file matching, diagnostics, and file invalidation. Load compiler dependencies through the bundler host. +- For import-protection changes, read the [shared internals](src/import-protection/INTERNALS.md) and [Vite lifecycle](src/vite/import-protection-plugin/INTERNALS.md). Preserve adapter-specific deferral and survival checks; development has no build-time tree-shaking, and Vite's error/mock modes differ. Cover actual leaks and safe boundaries in cold/warm development and builds. +- Compiler output must match runtime contracts in `start-client-core`, `start-fn-stubs`, and `start-server-core`. For `createServerFn`, cover client, SSR caller, and server-provider output separately in [`tests/createServerFn/createServerFn.test.ts`](tests/createServerFn/createServerFn.test.ts). +- Use a built Start e2e app to validate generated imports and runtime behavior together; compiler snapshots alone do not exercise that integration. +- The shared compiler serves both Vite and Rsbuild. For shared compiler changes, check the relevant adapter suites in `tests/vite/` and `tests/rsbuild/`, plus affected Start e2e modes for build, server-function, or HMR behavior. diff --git a/packages/start-server-core/AGENTS.md b/packages/start-server-core/AGENTS.md new file mode 100644 index 0000000000..ae178f35b6 --- /dev/null +++ b/packages/start-server-core/AGENTS.md @@ -0,0 +1,6 @@ +# Start server runtime + +- Keep request assets out of cached manifests. Assets may mutate in place between head and Scripts rendering; compose their current contents without caching solely by object identity. Asset transforms must preserve the base manifest; request-dependent transforms use `cache: false`. +- Middleware can replace or wrap an SSR response before its body is read. Preserve response ownership with the existing `SsrResponse` helpers and `transferResponseBodyOwnership`; dispose abandoned bodies, and consume/cancel unused clone or tee branches. Rendering completion, serialization completion, and request cleanup are separate lifecycles; read [`../router-core/src/ssr/STREAMING.md`](../router-core/src/ssr/STREAMING.md) before changing them. +- Merge client-sent context with `safeObjectMerge`, placing trusted server middleware context last. Preserve this precedence for JSON, GET, FormData, and direct SSR calls; validate through the `server-functions-global-middleware` e2e suite. +- Changes to `src/frame-protocol.ts` must remain compatible with `../start-client-core/src/client-rpc/frame-decoder.ts`. Keep both packages' framing tests and relevant RawStream e2e coverage. From 83895f127216fc7e5437b3d1190bc4f62521a0d4 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Tue, 15 Sep 2026 22:48:37 +0200 Subject: [PATCH 038/175] test(router-core): add a Link-like buildLocation benchmark (#8423) Mirrors what useLinkProps does on every location publication: 32 links, each with a stable dest object, pointing _fromLocation at a fresh location and calling router.buildLocation inside their selector. Covers the static-cache hit, search updaters (with and without middleware), relative destinations, inherited params and masks. Baseline (Node 24.8, hz, mean of two runs): static cache hit 1,928,000 search updater 41,600 + retainSearchParams 30,850 relative 29,800 params: true 35,050 masked 20,500 (cherry picked from commit d4787b65e25e0817f747fc3c6dc0209889ffe174) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .../router-core/tests/build-location.bench.ts | 152 ++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 packages/router-core/tests/build-location.bench.ts diff --git a/packages/router-core/tests/build-location.bench.ts b/packages/router-core/tests/build-location.bench.ts new file mode 100644 index 0000000000..b6162aafef --- /dev/null +++ b/packages/router-core/tests/build-location.bench.ts @@ -0,0 +1,152 @@ +import { bench, describe, expect } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute, BaseRoute, retainSearchParams } from '../src' +import { createTestRouter } from './routerTestUtils' +import type { AnyRouter, ParsedLocation } from '../src' + +// Mirrors what `useLinkProps` does on every location publication: each link +// owns one stable `dest` object, points `_fromLocation` at the new location +// and calls `router.buildLocation(dest)` inside its store selector. + +const LINKS = 32 + +function createBenchRouter(withMiddleware: boolean) { + const root = new BaseRootRoute({ + validateSearch: (search: Record) => ({ + page: Number(search.page ?? 1), + }), + }) + const posts = new BaseRoute({ + getParentRoute: () => root, + path: '/posts', + // Only routes with middleware get a `search` key, like real route trees. + ...(withMiddleware + ? { search: { middlewares: [retainSearchParams(['page'])] } } + : {}), + } as any) + const post = new BaseRoute({ + getParentRoute: () => posts, + path: '/$postId', + }) + const edit = new BaseRoute({ + getParentRoute: () => post, + path: '/edit', + }) + const history = createMemoryHistory({ initialEntries: ['/posts/1?page=2'] }) + const router = createTestRouter({ + routeTree: root.addChildren([ + posts.addChildren([post.addChildren([edit])]), + ]), + history, + scrollRestoration: false, + }) + history.destroy() + return router +} + +type Dest = Record & { _fromLocation?: ParsedLocation } + +function publication(router: AnyRouter, dests: Array) { + // A fresh location object per publication, like a committed navigation. + const location = { ...router.latestLocation } + let checksum = 0 + for (const dest of dests) { + dest._fromLocation = location + checksum += router.buildLocation(dest as any).href.length + } + return checksum +} + +function defineCase( + name: string, + withMiddleware: boolean, + makeDest: (index: number) => Dest, + expectedHref: (index: number) => string, +) { + const router = createBenchRouter(withMiddleware) + const dests = Array.from({ length: LINKS }, (_, index) => makeDest(index)) + const expected = dests.reduce( + (sum, _dest, index) => sum + expectedHref(index).length, + 0, + ) + // Correctness before timing: every link resolves to the expected href. + dests.forEach((dest, index) => { + dest._fromLocation = router.latestLocation + expect(router.buildLocation(dest as any).href).toBe(expectedHref(index)) + }) + let checksum = 0 + bench( + name, + () => { + checksum = publication(router, dests) + }, + { + time: 1000, + warmupTime: 200, + throws: true, + teardown: () => { + expect(checksum).toBe(expected) + }, + }, + ) +} + +describe(`buildLocation per publication (${LINKS} links)`, () => { + defineCase( + 'absolute to + literal params (static cache hit)', + false, + (index) => ({ to: '/posts/$postId', params: { postId: String(index) } }), + (index) => `/posts/${index}`, + ) + + defineCase( + 'absolute to + search updater (reads current search)', + false, + (index) => ({ + to: '/posts', + search: (prev: Record) => ({ ...prev, page: index }), + }), + (index) => `/posts?page=${index}`, + ) + + defineCase( + 'absolute to + search updater + retainSearchParams middleware', + true, + (index) => ({ + to: '/posts/$postId', + params: { postId: String(index) }, + search: () => ({ page: index }), + }), + (index) => `/posts/${index}?page=${index}`, + ) + + defineCase( + 'relative to from the current match', + false, + (index) => ({ + to: './edit', + search: (prev: unknown) => prev, + hash: `h${index}`, + }), + (index) => `/posts/1/edit?page=2#h${index}`, + ) + + defineCase( + 'params: true (inherits current params)', + false, + (index) => ({ to: '/posts/$postId/edit', params: true, hash: `h${index}` }), + (index) => `/posts/1/edit#h${index}`, + ) + + defineCase( + 'masked destination', + false, + (index) => ({ + to: '/posts/$postId', + params: { postId: String(index) }, + search: () => ({ page: index }), + mask: { to: '/posts' }, + }), + (index) => `/posts/${index}?page=${index}`, + ) +}) From a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Tue, 15 Sep 2026 23:57:16 +0200 Subject: [PATCH 039/175] perf(router-core): parse the location once in update and build rewrites without arrays (#8422) * perf(router-core): parse the location once in update and build rewrites without arrays - update(): compute the basepath/rewrite before the single updateLatestLocation call; the first update always saw basepathWasUnset, so every router construction parsed the location twice and re-published to a store created from the same location. - invalidate(): fill the id set in one pass instead of spread/flat/filter/map. - rewriteBasepath(basepath, caseSensitive?) takes positional arguments (it is internal) and the output rewrite uses cleanPath on a template string instead of joinPaths' array/filter/join. - parseLocation(): inline the single-use fullPath local. react-router.minimal 86019 -> 85989 gzip, react-router.full 89605 -> 89561 gzip. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> (cherry picked from commit 64978a1c8a8b5926c53797edcb528159c70ab093) * perf(router-core): parse the location once in update and build rewrites without arrays [Self-Healing CI Rerun] * test(router-core): cover basepath rewrite composition and updates * perf(router-core): specialize internal basepath rewrites * fix(router-core): key server route caches by case sensitivity --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Co-authored-by: nx-cloud[bot] <71083854+nx-cloud[bot]@users.noreply.github.com> --- .changeset/update-parse-once.md | 7 + packages/router-core/src/rewrite.ts | 35 +- packages/router-core/src/router.ts | 116 +++--- packages/router-core/tests/rewrite.bench.ts | 168 +++++++++ packages/router-core/tests/rewrite.test.ts | 340 +++++++++++++++++- .../tests/route-tree-caches.test.ts | 120 +++++++ 6 files changed, 706 insertions(+), 80 deletions(-) create mode 100644 .changeset/update-parse-once.md create mode 100644 packages/router-core/tests/rewrite.bench.ts diff --git a/.changeset/update-parse-once.md b/.changeset/update-parse-once.md new file mode 100644 index 0000000000..b3623a8d59 --- /dev/null +++ b/.changeset/update-parse-once.md @@ -0,0 +1,7 @@ +--- +'@tanstack/router-core': patch +--- + +Parse the location once when `router.update()` changes the basepath or rewrite, collect `invalidate()` match ids in a single pass, and specialize internal basepath composition without arrays or loops. Preserve basepath case sensitivity when creating and updating the router. + +Rebuild server route trees when `caseSensitive` changes and reuse the server cache only when the route tree and case sensitivity both match. diff --git a/packages/router-core/src/rewrite.ts b/packages/router-core/src/rewrite.ts index 5c82408c00..901880104e 100644 --- a/packages/router-core/src/rewrite.ts +++ b/packages/router-core/src/rewrite.ts @@ -1,4 +1,4 @@ -import { joinPaths, trimPath } from './path' +import { cleanPath, trimPath } from './path' import type { LocationRewrite } from './router' /** Compose multiple rewrite pairs into a single in/out rewrite. */ @@ -20,22 +20,21 @@ export function composeRewrites(rewrites: Array) { } /** Create a rewrite pair that strips/adds a basepath on input/output. */ -export function rewriteBasepath(opts: { - basepath: string - caseSensitive?: boolean -}) { - const trimmedBasepath = trimPath(opts.basepath) +export function rewriteBasepath( + basepath: string, + caseSensitive?: boolean, + rewrite?: LocationRewrite, +) { + const trimmedBasepath = trimPath(basepath) const normalizedBasepath = `/${trimmedBasepath}` - const checkBasepath = opts.caseSensitive + const checkBasepath = caseSensitive ? normalizedBasepath : normalizedBasepath.toLowerCase() const checkBasepathWithSlash = `${checkBasepath}/` - return { + const basepathRewrite = { input: ({ url }) => { - const pathname = opts.caseSensitive - ? url.pathname - : url.pathname.toLowerCase() + const pathname = caseSensitive ? url.pathname : url.pathname.toLowerCase() // Handle exact basepath match (e.g., /my-app -> /) if (pathname === checkBasepath) { @@ -47,10 +46,22 @@ export function rewriteBasepath(opts: { return url }, output: ({ url }) => { - url.pathname = joinPaths(['/', trimmedBasepath, url.pathname]) + // `url.pathname` always starts with "/", so only slashes already inside + // it can repeat; cleanPath keeps the joinPaths normalization. + url.pathname = cleanPath(`/${trimmedBasepath}${url.pathname}`) return url }, } satisfies LocationRewrite + + // Strip the basepath before custom input and restore it after custom output. + return rewrite + ? ({ + input: ({ url }) => + executeRewriteInput(rewrite, basepathRewrite.input({ url })), + output: ({ url }) => + basepathRewrite.output({ url: executeRewriteOutput(rewrite, url) }), + } satisfies LocationRewrite) + : basepathRewrite } /** Execute a location input rewrite if provided. */ diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 2eff5b2bed..cdf1c0e363 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -51,7 +51,6 @@ import { replaceRouteChunk, } from './load-client' import { - composeRewrites, executeRewriteInput, executeRewriteOutput, rewriteBasepath, @@ -1058,6 +1057,7 @@ declare global { var __TSR_CACHE__: | { routeTree: AnyRoute + caseSensitive: boolean | undefined processRouteTreeResult: RouteTreeCaches } | undefined @@ -1244,9 +1244,6 @@ export class RouterCore< } const prevOptions = this.options - const prevBasepath = this.basepath ?? prevOptions?.basepath ?? '/' - const basepathWasUnset = this.basepath === undefined - const prevRewriteOption = prevOptions?.rewrite this.options = { ...prevOptions, @@ -1289,18 +1286,44 @@ export class RouterCore< } } + const nextBasepath = this.options.basepath ?? '/' + const nextRewriteOption = this.options.rewrite + const rewriteChanged = + this.basepath !== nextBasepath || + prevOptions?.rewrite !== nextRewriteOption || + prevOptions?.caseSensitive !== this.options.caseSensitive + + if (rewriteChanged) { + this.basepath = nextBasepath + + this.rewrite = + nextBasepath !== '/' && trimPath(nextBasepath) + ? rewriteBasepath( + nextBasepath, + this.options.caseSensitive, + nextRewriteOption, + ) + : nextRewriteOption + } + + // Parse once, with the final rewrite in place. if (this.history) { this.updateLatestLocation() } - if (this.options.routeTree !== this.routeTree) { + if ( + this.options.routeTree !== this.routeTree || + ((isServer ?? this.isServer) && + prevOptions?.caseSensitive !== this.options.caseSensitive) + ) { this.routeTree = this.options.routeTree as TRouteTree let processRouteTreeResult: RouteTreeCaches if ( process.env.NODE_ENV !== 'development' && (isServer ?? this.isServer) && globalThis.__TSR_CACHE__ && - globalThis.__TSR_CACHE__.routeTree === this.routeTree + globalThis.__TSR_CACHE__.routeTree === this.routeTree && + globalThis.__TSR_CACHE__.caseSensitive === this.options.caseSensitive ) { const cached = globalThis.__TSR_CACHE__ processRouteTreeResult = cached.processRouteTreeResult as any @@ -1314,6 +1337,7 @@ export class RouterCore< ) { globalThis.__TSR_CACHE__ = { routeTree: this.routeTree, + caseSensitive: this.options.caseSensitive, processRouteTreeResult: processRouteTreeResult as any, } } @@ -1321,51 +1345,19 @@ export class RouterCore< this.setRoutes(processRouteTreeResult) } - if (!this.stores && this.latestLocation) { - const config = this.getStoreConfig(this) - this.batch = config.batch - this.stores = createRouterStores(this.latestLocation, config) + if (!this.stores) { + if (this.latestLocation) { + const config = this.getStoreConfig(this) + this.batch = config.batch + this.stores = createRouterStores(this.latestLocation, config) - if (!(isServer ?? this.isServer)) { - setupScrollRestoration(this) - } - } - - const nextBasepath = this.options.basepath ?? '/' - const nextRewriteOption = this.options.rewrite - const basepathChanged = basepathWasUnset || prevBasepath !== nextBasepath - const rewriteChanged = prevRewriteOption !== nextRewriteOption - - if (basepathChanged || rewriteChanged) { - this.basepath = nextBasepath - - const rewrites: Array = [] - const trimmed = trimPath(nextBasepath) - if (trimmed && trimmed !== '/') { - rewrites.push( - rewriteBasepath({ - basepath: nextBasepath, - }), - ) - } - if (nextRewriteOption) { - rewrites.push(nextRewriteOption) - } - - this.rewrite = - rewrites.length === 0 - ? undefined - : rewrites.length === 1 - ? rewrites[0] - : composeRewrites(rewrites) - - if (this.history) { - this.updateLatestLocation() - } - - if (this.stores) { - this.stores.location.set(this.latestLocation) + if (!(isServer ?? this.isServer)) { + setupScrollRestoration(this) + } } + } else if (rewriteChanged) { + // Existing stores hold the location parsed with the previous rewrite. + this.stores.location.set(this.latestLocation) } } @@ -1491,10 +1483,8 @@ export class RouterCore< // (We were already doing this, so just keeping it for now) url.search = searchStr - const fullPath = url.href.replace(url.origin, '') - return { - href: fullPath, + href: url.href.replace(url.origin, ''), publicHref: href, // An input rewrite can expose a path like "//evil.example". // Normalize it to "/evil.example" to keep it on the current origin. @@ -2514,18 +2504,16 @@ export class RouterCore< const committedMatches = this._committed const filter = opts?.filter const preloads = this._preloads - const invalidIds = new Set( - [ - ...committedMatches, - ...this._cache.values(), - ...[...(preloads?.values() ?? [])].flat(), - ...(this._tx?.[3 /* matches */] ?? []), - ] - .filter( - (match) => !filter || filter(match as MakeRouteMatchUnion), - ) - .map((match) => match.id), - ) + const invalidIds = new Set() + const consider = (match: AnyRouteMatch) => { + if (!filter || filter(match as MakeRouteMatchUnion)) { + invalidIds.add(match.id) + } + } + committedMatches.forEach(consider) + this._cache.forEach(consider) + preloads?.forEach((matches) => matches.forEach(consider)) + this._tx?.[3 /* matches */].forEach(consider) const discardedPreloads: Array = [] for (const [controller, matches] of preloads ?? []) { if (matches.some((match) => invalidIds.has(match.id))) { diff --git a/packages/router-core/tests/rewrite.bench.ts b/packages/router-core/tests/rewrite.bench.ts new file mode 100644 index 0000000000..0ccf78cb82 --- /dev/null +++ b/packages/router-core/tests/rewrite.bench.ts @@ -0,0 +1,168 @@ +import { bench, describe, expect } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute } from '../src' +import { + composeRewrites, + executeRewriteInput, + executeRewriteOutput, + rewriteBasepath, +} from '../src/rewrite' +import { createTestRouter } from './routerTestUtils' +import type { LocationRewrite } from '../src' + +describe.each([ + 'basepath only', + 'missing handlers', + 'input only', + 'output only', + 'noop', + 'mutation', + 'URL', + 'string', + 'nested composer', +] as const)('basepath composition (%s)', (returnType) => { + const unchanged = [ + 'basepath only', + 'missing handlers', + 'input only', + 'output only', + 'noop', + ].includes(returnType) + const transform = (url: URL, input: boolean) => { + if (unchanged) { + return + } + const result = + returnType === 'mutation' || returnType === 'nested composer' + ? url + : new URL(url) + result.pathname = input ? '/internal' : '/public' + if (returnType === 'URL') { + return result + } + if (returnType === 'string') { + return result.href + } + return + } + let custom: LocationRewrite | undefined = { + input: ({ url }) => transform(url, true), + output: ({ url }) => transform(url, false), + } + if (returnType === 'basepath only') { + custom = undefined + } else if (returnType === 'missing handlers') { + custom = {} + } else if (returnType === 'input only') { + delete custom.output + } else if (returnType === 'output only') { + delete custom.input + } else if (returnType === 'nested composer') { + custom = composeRewrites([ + custom, + {}, + { input: ({ url }) => url, output: ({ url }) => url }, + ]) + } + const history = createMemoryHistory({ initialEntries: ['/app/public'] }) + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history, + basepath: '/app', + rewrite: custom, + scrollRestoration: false, + }) + history.destroy() + + for (const [name, rewrite] of [ + [ + custom ? 'public composer' : 'standalone basepath', + custom + ? composeRewrites([rewriteBasepath('/app'), custom]) + : rewriteBasepath('/app'), + ], + ['router composition', router.rewrite], + ] as const) { + let url = new URL('https://example.com/app/public?sort=name#title') + url = executeRewriteInput(rewrite, url) + expect(url.pathname).toBe(unchanged ? '/public' : '/internal') + url = executeRewriteOutput(rewrite, url) + expect(url.href).toBe('https://example.com/app/public?sort=name#title') + + bench( + `${name} round trip`, + () => { + // Reuse the round-trip URL so URL construction does not hide the + // composition cost for callbacks that mutate or leave it unchanged. + for (let index = 0; index < 64; index++) { + url = executeRewriteOutput(rewrite, executeRewriteInput(rewrite, url)) + } + }, + { + time: 1000, + warmupTime: 200, + throws: true, + teardown: () => { + expect(url.href).toBe( + 'https://example.com/app/public?sort=name#title', + ) + }, + }, + ) + } + + let trailingSlash = false + bench( + 'router update rebuilding the rewrite', + () => { + if (custom) { + router.update({ rewrite: { ...custom } }) + } else { + trailingSlash = !trailingSlash + router.update({ basepath: trailingSlash ? '/app/' : '/app' }) + } + }, + { + time: 1000, + warmupTime: 200, + throws: true, + teardown: () => { + expect(router.latestLocation.pathname).toBe( + unchanged ? '/public' : '/internal', + ) + }, + }, + ) +}) + +describe.each(['/', '/app'])('unchanged rewrite options (%s)', (basepath) => { + const history = createMemoryHistory({ + initialEntries: [basepath === '/' ? '/public' : '/app/public'], + }) + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history, + basepath, + rewrite: { input: ({ url }) => url }, + scrollRestoration: false, + }) + history.destroy() + const rewrite = router.rewrite + router.update({}) + expect(router.rewrite).toBe(rewrite) + expect(router.latestLocation.pathname).toBe('/public') + + bench( + 'router update without rebuilding the rewrite', + () => router.update({}), + { + time: 1000, + warmupTime: 200, + throws: true, + teardown: () => { + expect(router.rewrite).toBe(rewrite) + expect(router.latestLocation.pathname).toBe('/public') + }, + }, + ) +}) diff --git a/packages/router-core/tests/rewrite.test.ts b/packages/router-core/tests/rewrite.test.ts index c5ca2e9428..2494f050e5 100644 --- a/packages/router-core/tests/rewrite.test.ts +++ b/packages/router-core/tests/rewrite.test.ts @@ -1,15 +1,17 @@ import { describe, expect, test } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute, composeRewrites } from '../src' import { - composeRewrites, executeRewriteInput, executeRewriteOutput, rewriteBasepath, } from '../src/rewrite' +import { createTestRouter } from './routerTestUtils' import type { LocationRewrite } from '../src' describe('rewrite helpers', () => { test('basepath rewrite strips input and restores output', () => { - const rewrite = rewriteBasepath({ basepath: '/app/' }) + const rewrite = rewriteBasepath('/app/') const inputUrl = new URL('https://example.com/app/posts') expect(executeRewriteInput(rewrite, inputUrl).pathname).toBe('/posts') @@ -19,19 +21,40 @@ describe('rewrite helpers', () => { }) test('basepath rewrite handles root output', () => { - const rewrite = rewriteBasepath({ basepath: '/app' }) + const rewrite = rewriteBasepath('/app') const url = new URL('https://example.com/') expect(executeRewriteOutput(rewrite, url).pathname).toBe('/app/') }) test('case-insensitive basepath input preserves original suffix casing', () => { - const rewrite = rewriteBasepath({ basepath: '/App' }) + const rewrite = rewriteBasepath('/App') const url = new URL('https://example.com/app/Users') expect(executeRewriteInput(rewrite, url).pathname).toBe('/Users') }) + test('case-sensitive basepath input only strips an exact-case basepath', () => { + const rewrite = rewriteBasepath('/App', true) + + expect( + executeRewriteInput(rewrite, new URL('https://example.com/app/users')) + .pathname, + ).toBe('/app/users') + expect( + executeRewriteInput(rewrite, new URL('https://example.com/App/users')) + .pathname, + ).toBe('/users') + }) + + test('basepath rewrite output collapses repeated slashes', () => { + const rewrite = rewriteBasepath('/app') + const url = new URL('https://example.com/') + url.pathname = '/posts//1' + + expect(executeRewriteOutput(rewrite, url).pathname).toBe('/app/posts/1') + }) + test('composeRewrites applies input forward and output backward', () => { const calls: Array = [] const first: LocationRewrite = { @@ -69,4 +92,313 @@ describe('rewrite helpers', () => { ).toBe('/cd') expect(calls).toEqual(['first-in', 'second-in', 'second-out', 'first-out']) }) + + test('composeRewrites supports arbitrary chains and mixed return types', () => { + const rewrite = composeRewrites([ + { + input: ({ url }): undefined => { + url.pathname += 'a' + }, + output: ({ url }): undefined => { + url.pathname += 'd' + }, + }, + {}, + { + input: ({ url }) => `${url.href}b`, + output: ({ url }) => `${url.href}c`, + }, + { + input: ({ url }) => new URL(`${url.href}c`), + output: ({ url }) => new URL(`${url.href}b`), + }, + { + output: ({ url }): undefined => { + url.pathname += 'a' + }, + }, + ]) + + expect( + executeRewriteInput(rewrite, new URL('https://example.com/')).pathname, + ).toBe('/abc') + expect( + executeRewriteOutput(rewrite, new URL('https://example.com/')).pathname, + ).toBe('/abcd') + }) + + test('composeRewrites accepts an empty chain', () => { + const rewrite = composeRewrites([]) + const url = new URL('https://example.com/posts') + + expect(executeRewriteInput(rewrite, url)).toBe(url) + expect(executeRewriteOutput(rewrite, url)).toBe(url) + }) +}) + +describe('router rewrites', () => { + test.each([undefined, '/', '', '///'])( + 'keeps the direct rewrite path for basepath %s', + (basepath) => { + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history: createMemoryHistory({ initialEntries: ['/public'] }), + basepath, + }) + + expect(router.rewrite).toBeUndefined() + expect(router.latestLocation.pathname).toBe('/public') + expect(router.buildLocation({ to: '/public' }).publicHref).toBe('/public') + + const rewrite: LocationRewrite = { input: ({ url }) => url } + router.update({ rewrite }) + expect(router.rewrite).toBe(rewrite) + expect(router.state.location.pathname).toBe('/public') + }, + ) + + test.each([ + [undefined, '/app/Users', '/Users'], + [false, '/app/Users', '/Users'], + [true, '/app/Users', '/app/Users'], + [true, '/App/Users', '/Users'], + ] as const)( + 'initializes basepath with caseSensitive %s at %s', + (caseSensitive, pathname, expected) => { + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history: createMemoryHistory({ initialEntries: [pathname] }), + basepath: '/App', + caseSensitive, + }) + + expect(router.latestLocation.pathname).toBe(expected) + expect(router.state.location.pathname).toBe(expected) + }, + ) + + test.each([false, true])( + 'updates basepath case sensitivity and stored location (custom rewrite: %s)', + (customRewrite) => { + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history: createMemoryHistory({ initialEntries: ['/app/Users'] }), + basepath: '/App', + rewrite: customRewrite ? { input: ({ url }) => url } : undefined, + }) + + expect(router.state.location.pathname).toBe('/Users') + + router.update({ caseSensitive: true }) + expect(router.latestLocation.pathname).toBe('/app/Users') + expect(router.state.location.pathname).toBe('/app/Users') + + router.update({ caseSensitive: false }) + expect(router.latestLocation.pathname).toBe('/Users') + expect(router.state.location.pathname).toBe('/Users') + expect(router.buildLocation({ to: '/Users' }).publicHref).toBe( + '/App/Users', + ) + }, + ) + + test.each(['mutation', 'URL', 'string'] as const)( + 'composes basepath around custom rewrites returning %s', + (returnType) => { + const calls: Array = [] + const rewrite = (url: URL, direction: 'input' | 'output') => { + calls.push(`${direction}:${url.pathname}`) + const result = returnType === 'mutation' ? url : new URL(url) + result.pathname = direction === 'input' ? '/internal' : '/public' + if (returnType === 'URL') { + return result + } + if (returnType === 'string') { + return result.href + } + return + } + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history: createMemoryHistory({ initialEntries: ['/app/public'] }), + basepath: '/app', + rewrite: { + input: ({ url }) => rewrite(url, 'input'), + output: ({ url }) => rewrite(url, 'output'), + }, + }) + + expect(router.latestLocation.pathname).toBe('/internal') + expect(calls).toEqual(['input:/public']) + expect(router.buildLocation({ to: '/internal' }).publicHref).toBe( + '/app/public', + ) + expect(calls).toEqual(['input:/public', 'output:/internal']) + }, + ) + + test('rebuilds rewrites and stored locations when basepath or custom rewrite changes', () => { + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history: createMemoryHistory({ initialEntries: ['/app/public'] }), + basepath: '/app', + rewrite: { + input: ({ url }): undefined => { + url.pathname = url.pathname.replace('/public', '/internal') + }, + output: ({ url }): undefined => { + url.pathname = url.pathname.replace('/internal', '/public') + }, + }, + }) + const checkLocations = (pathname: string, outputHref: string) => { + expect(router.latestLocation).toMatchObject({ + pathname, + publicHref: '/app/public', + }) + expect(router.state.location).toMatchObject({ + pathname, + publicHref: '/app/public', + }) + expect(router.buildLocation({ to: '/internal' }).publicHref).toBe( + outputHref, + ) + } + + checkLocations('/internal', '/app/public') + router.update({ basepath: '/other' }) + checkLocations('/app/internal', '/other/public') + + router.update({ + rewrite: { + input: ({ url }) => new URL('/replacement', url), + output: ({ url }) => new URL('/updated', url), + }, + }) + checkLocations('/replacement', '/other/updated') + + router.update({ rewrite: undefined }) + checkLocations('/app/public', '/other/internal') + + router.update({ basepath: '/' }) + checkLocations('/app/public', '/internal') + expect(router.rewrite).toBeUndefined() + }) + + test.each(['URL', 'string'] as const)( + 'preserves query, hash, and external origin from a custom %s output', + (returnType) => { + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history: createMemoryHistory({ initialEntries: ['/app/internal'] }), + origin: 'https://example.com', + basepath: '/app', + rewrite: { + output: ({ url }) => { + const rewritten = new URL(url) + rewritten.hostname = 'external.example' + rewritten.pathname = '/public' + return returnType === 'URL' ? rewritten : rewritten.href + }, + }, + }) + + expect( + router.buildLocation({ + to: '/internal', + search: { sort: 'name' }, + hash: 'section', + }), + ).toMatchObject({ + publicHref: 'https://external.example/app/public?sort=name#section', + external: true, + search: { sort: 'name' }, + hash: 'section', + }) + }, + ) + + test.each(['input', 'output'] as const)( + 'composes basepath with a custom rewrite providing only %s', + (direction) => { + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history: createMemoryHistory({ initialEntries: ['/app/original'] }), + basepath: '/app', + rewrite: { + [direction]: ({ url }: { url: URL }): undefined => { + url.pathname = '/rewritten' + }, + }, + }) + + expect(router.latestLocation.pathname).toBe( + direction === 'input' ? '/rewritten' : '/original', + ) + expect(router.buildLocation({ to: '/original' }).publicHref).toBe( + direction === 'output' ? '/app/rewritten' : '/app/original', + ) + }, + ) + + test('reads custom handlers added, replaced, or removed after composition', () => { + const rewrite: LocationRewrite = {} + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history: createMemoryHistory({ initialEntries: ['/app/public'] }), + basepath: '/app', + rewrite, + }) + const parse = () => router.parseLocation(router.history.location).pathname + + expect(parse()).toBe('/public') + rewrite.input = ({ url }): undefined => { + url.pathname = '/internal' + } + rewrite.output = ({ url }): undefined => { + url.pathname = '/public' + } + expect(parse()).toBe('/internal') + expect(router.buildLocation({ to: '/internal' }).publicHref).toBe( + '/app/public', + ) + + rewrite.input = ({ url }) => new URL('/replaced', url) + expect(parse()).toBe('/replaced') + + delete rewrite.input + delete rewrite.output + expect(parse()).toBe('/public') + expect(router.buildLocation({ to: '/internal' }).publicHref).toBe( + '/app/internal', + ) + }) + + test('composes a nested public rewrite chain inside the basepath', () => { + const router = createTestRouter({ + routeTree: new BaseRootRoute({}), + history: createMemoryHistory({ initialEntries: ['/app/public'] }), + basepath: '/app', + rewrite: composeRewrites([ + { + input: ({ url }): undefined => { + url.pathname = url.pathname.replace('/public', '/intermediate') + }, + output: ({ url }): undefined => { + url.pathname = url.pathname.replace('/intermediate', '/public') + }, + }, + { + input: ({ url }) => url.href.replace('/intermediate', '/internal'), + output: ({ url }) => + new URL(url.href.replace('/internal', '/intermediate')), + }, + ]), + }) + + expect(router.latestLocation.pathname).toBe('/internal') + expect(router.buildLocation({ to: '/internal' }).publicHref).toBe( + '/app/public', + ) + }) }) diff --git a/packages/router-core/tests/route-tree-caches.test.ts b/packages/router-core/tests/route-tree-caches.test.ts index 302dfa62f1..5f2f4721cf 100644 --- a/packages/router-core/tests/route-tree-caches.test.ts +++ b/packages/router-core/tests/route-tree-caches.test.ts @@ -126,6 +126,126 @@ test.each([ }, ) +test.each(['production', 'development'])( + 'refreshes server matching caches when case sensitivity changes in %s', + (mode) => { + vi.stubEnv('NODE_ENV', mode) + const { root, item } = createRoutes() + const strict = new BaseRoute({ + getParentRoute: () => root, + path: '/strict', + caseSensitive: true, + }) + const relaxed = new BaseRoute({ + getParentRoute: () => root, + path: '/relaxed', + caseSensitive: false, + }) + const router = createTestRouter({ + routeTree: root.addChildren([item, strict, relaxed]), + history: history(), + isServer: true, + caseSensitive: false, + }) + expect(router.getMatchedRoutes('/ITEMS/one')[2]).toBe(item) + + for (const caseSensitive of [true, false]) { + router.buildLocation({ + to: '/items/$id', + params: { id: 'one' }, + search: true, + }) + const previousTree = router.processedTree + const previousResolve = router.resolvePathCache + const previousLightweight = router['lightweightCache'] + expect(previousTree.matchCache.get('/ITEMS/one')).toBeDefined() + expect(previousLightweight.get(router.latestLocation)).toBeDefined() + + router.update({ caseSensitive }) + + expect(router.processedTree).not.toBe(previousTree) + expect(router.resolvePathCache).not.toBe(previousResolve) + expect(router['lightweightCache']).not.toBe(previousLightweight) + expect(router.getMatchedRoutes('/ITEMS/one')[2] === item).toBe( + !caseSensitive, + ) + expect(router.getMatchedRoutes('/items/one')[2]).toBe(item) + expect(router.getMatchedRoutes('/STRICT')[2]).not.toBe(strict) + expect(router.getMatchedRoutes('/strict')[2]).toBe(strict) + expect(router.getMatchedRoutes('/RELAXED')[2]).toBe(relaxed) + + const currentTree = router.processedTree + router.update({ caseSensitive }) + expect(router.processedTree).toBe(currentTree) + } + }, +) + +test.each([false, true])( + 'only reuses a server route tree with matching case sensitivity (cached: %s)', + (caseSensitive) => { + const { routeTree, item } = createRoutes() + const createRouter = (sensitive: boolean) => + createTestRouter({ + routeTree, + history: history(), + isServer: true, + caseSensitive: sensitive, + }) + const first = createRouter(caseSensitive) + expect(first.getMatchedRoutes('/ITEMS/one')[2] === item).toBe( + !caseSensitive, + ) + + const same = createRouter(caseSensitive) + expect(same.processedTree).toBe(first.processedTree) + expect(same.resolvePathCache).toBe(first.resolvePathCache) + + const different = createRouter(!caseSensitive) + expect(different.processedTree).not.toBe(first.processedTree) + expect(different.resolvePathCache).not.toBe(first.resolvePathCache) + expect(different.getMatchedRoutes('/ITEMS/one')[2] === item).toBe( + caseSensitive, + ) + expect(different.getMatchedRoutes('/items/one')[2]).toBe(item) + + const reused = createRouter(caseSensitive) + expect(reused.processedTree).toBe(first.processedTree) + for (const router of [first, same, reused]) { + expect(router.getMatchedRoutes('/ITEMS/one')[2] === item).toBe( + !caseSensitive, + ) + expect(router.getMatchedRoutes('/items/one')[2]).toBe(item) + } + }, +) + +test('never accesses the server cache on the client', () => { + const getCache = vi.fn(() => { + throw new Error('Client read the server cache') + }) + const setCache = vi.fn(() => { + throw new Error('Client wrote the server cache') + }) + Object.defineProperty(globalThis, '__TSR_CACHE__', { + configurable: true, + get: getCache, + set: setCache, + }) + const router = createTestRouter({ + routeTree: createRoutes().routeTree, + history: history(), + isServer: false, + caseSensitive: false, + }) + const processedTree = router.processedTree + router.update({ caseSensitive: true }) + expect(router.processedTree).toBe(processedTree) + router.update({ routeTree: createRoutes().routeTree }) + expect(getCache).not.toHaveBeenCalled() + expect(setCache).not.toHaveBeenCalled() +}) + test('keeps different route objects independent and resets derived caches when rebuilding', () => { vi.stubEnv('NODE_ENV', 'development') const firstTree = createRoutes() From a1c8d1aa759c227eae9601a030321ac4c53c24bd Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Wed, 16 Sep 2026 00:42:50 +0200 Subject: [PATCH 040/175] perf(router-core): pass resolvePath arguments positionally (#8419) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `resolvePath(base, to, trailingSlash?, cache?)` replaces the options object, so `resolvePathWithBase` — called from `buildLocation` and `matchRoute` — no longer allocates per path resolution. `resolvePath` is an internal helper. react-router.minimal shrinks by 17 B gzip (60 raw). (cherry picked from commit de7bc72a952aaf77bbedfd4453a4d12edadaad53) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/resolve-path-positional.md | 8 ++ packages/router-core/src/path.ts | 22 ++--- packages/router-core/src/router.ts | 12 +-- packages/router-core/tests/path.test.ts | 110 +++++------------------- 4 files changed, 46 insertions(+), 106 deletions(-) create mode 100644 .changeset/resolve-path-positional.md diff --git a/.changeset/resolve-path-positional.md b/.changeset/resolve-path-positional.md new file mode 100644 index 0000000000..018d4f93b2 --- /dev/null +++ b/.changeset/resolve-path-positional.md @@ -0,0 +1,8 @@ +--- +'@tanstack/router-core': patch +'@tanstack/react-router': patch +'@tanstack/solid-router': patch +'@tanstack/vue-router': patch +--- + +`resolvePath` (internal helper) now takes positional arguments — `resolvePath(base, to, trailingSlash?, cache?)` — so `buildLocation` and `matchRoute` no longer allocate an options object per path resolution. diff --git a/packages/router-core/src/path.ts b/packages/router-core/src/path.ts index 88837db2b1..1b6288dc36 100644 --- a/packages/router-core/src/path.ts +++ b/packages/router-core/src/path.ts @@ -94,23 +94,19 @@ export function exactPathTest( // /a/b/c + d = /a/b/c/d // /a/b/c + d/ = /a/b/c/d // /a/b/c + d/e = /a/b/c/d/e -interface ResolvePathOptions { - base: string - to: string - trailingSlash?: 'always' | 'never' | 'preserve' - cache?: SieveCache -} - /** * Resolve a destination path against a base, honoring trailing-slash policy * and supporting relative segments (`.`/`..`) and absolute `to` values. + * + * Internal: parameters are positional so the router's hot callers pass no + * options object. */ -export function resolvePath({ - base, - to, - trailingSlash = 'never', - cache, -}: ResolvePathOptions) { +export function resolvePath( + base: string, + to: string, + trailingSlash: 'always' | 'never' | 'preserve' = 'never', + cache?: SieveCache, +) { if (to.includes('//')) { to = cleanPath(to) } diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index cdf1c0e363..7f951d77bd 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -1522,12 +1522,12 @@ export class RouterCore< /** Resolve a path using the router's trailing-slash policy. */ resolvePathWithBase = (from: string, path: string) => { - return resolvePath({ - base: from, - to: path, - trailingSlash: this.options.trailingSlash, - cache: this.resolvePathCache, - }) + return resolvePath( + from, + path, + this.options.trailingSlash, + this.resolvePathCache, + ) } matchRoutes: MatchRoutesFn = ( diff --git a/packages/router-core/tests/path.test.ts b/packages/router-core/tests/path.test.ts index 8dc964bcd6..dac91a80fa 100644 --- a/packages/router-core/tests/path.test.ts +++ b/packages/router-core/tests/path.test.ts @@ -476,79 +476,43 @@ describe('resolvePath', () => { ['/posts', '../../data:text/html,test', '/data:text/html,test'], ])('resolves correctly', (a, b, eq) => { it(`${a} to ${b} === ${eq}`, () => { - expect(resolvePath({ base: a, to: b })).toEqual(eq) + expect(resolvePath(a, b)).toEqual(eq) }) it(`${a}/ to ${b} === ${eq} (trailing slash)`, () => { - expect(resolvePath({ base: a + '/', to: b })).toEqual(eq) + expect(resolvePath(a + '/', b)).toEqual(eq) }) it(`${a}/ to ${b}/ === ${eq} (trailing slash + trailing slash)`, () => { - expect(resolvePath({ base: a + '/', to: b + '/' })).toEqual(eq) + expect(resolvePath(a + '/', b + '/')).toEqual(eq) }) }) it('normalizes repeated slashes when resolving the base path', () => { - expect(resolvePath({ base: '/a//b', to: '.' })).toBe('/a/b') + expect(resolvePath('/a//b', '.')).toBe('/a/b') }) describe('trailingSlash', () => { describe(`'always'`, () => { it('keeps trailing slash', () => { - expect( - resolvePath({ - base: '/a/b/c', - to: 'd/', - trailingSlash: 'always', - }), - ).toBe('/a/b/c/d/') + expect(resolvePath('/a/b/c', 'd/', 'always')).toBe('/a/b/c/d/') }) it('adds trailing slash', () => { - expect( - resolvePath({ - base: '/a/b/c', - to: 'd', - trailingSlash: 'always', - }), - ).toBe('/a/b/c/d/') + expect(resolvePath('/a/b/c', 'd', 'always')).toBe('/a/b/c/d/') }) }) describe(`'never'`, () => { it('removes trailing slash', () => { - expect( - resolvePath({ - base: '/a/b/c', - to: 'd/', - trailingSlash: 'never', - }), - ).toBe('/a/b/c/d') + expect(resolvePath('/a/b/c', 'd/', 'never')).toBe('/a/b/c/d') }) it('does not add trailing slash', () => { - expect( - resolvePath({ - base: '/a/b/c', - to: 'd', - trailingSlash: 'never', - }), - ).toBe('/a/b/c/d') + expect(resolvePath('/a/b/c', 'd', 'never')).toBe('/a/b/c/d') }) }) describe(`'preserve'`, () => { it('keeps trailing slash', () => { - expect( - resolvePath({ - base: '/a/b/c', - to: 'd/', - trailingSlash: 'preserve', - }), - ).toBe('/a/b/c/d/') + expect(resolvePath('/a/b/c', 'd/', 'preserve')).toBe('/a/b/c/d/') }) it('does not add trailing slash', () => { - expect( - resolvePath({ - base: '/a/b/c', - to: 'd', - trailingSlash: 'preserve', - }), - ).toBe('/a/b/c/d') + expect(resolvePath('/a/b/c', 'd', 'preserve')).toBe('/a/b/c/d') }) }) @@ -559,7 +523,7 @@ describe('resolvePath', () => { ] as const)( "normalizes repeated slashes with trailingSlash '%s'", (trailingSlash, to, expected) => { - expect(resolvePath({ base: '/', to, trailingSlash })).toBe(expected) + expect(resolvePath('/', to, trailingSlash)).toBe(expected) }, ) }) @@ -585,13 +549,7 @@ describe('resolvePath', () => { }, ])('$name', ({ to }) => { const candidate = base + trimPathLeft(to) - expect( - resolvePath({ - base, - to: candidate, - trailingSlash: 'never', - }), - ).toEqual(candidate) + expect(resolvePath(base, candidate, 'never')).toEqual(candidate) }) }) @@ -613,42 +571,28 @@ describe('resolvePath', () => { }, ])('$name', ({ to }) => { const candidate = base + trimPathLeft(to) - expect( - resolvePath({ - base, - to: candidate, - trailingSlash: 'never', - }), - ).toEqual(candidate) + expect(resolvePath(base, candidate, 'never')).toEqual(candidate) }) }) }, ) it('preserves explicit route-template param syntax', () => { - expect( - resolvePath({ - base: '/{$language}', - to: '.', - }), - ).toBe('/{$language}') + expect(resolvePath('/{$language}', '.')).toBe('/{$language}') - expect( - resolvePath({ - base: '/{$language}/posts', - to: '../{$language}', - }), - ).toBe('/{$language}/{$language}') + expect(resolvePath('/{$language}/posts', '../{$language}')).toBe( + '/{$language}/{$language}', + ) }) it('caches route-template paths without changing param syntax', () => { const cache = createSieveCache(10) const set = vi.spyOn(cache, 'set') - expect(resolvePath({ base: '/', to: '{$id}', cache })).toBe('/{$id}') - expect(resolvePath({ base: '/', to: '$id', cache })).toBe('/$id') - expect(resolvePath({ base: '/', to: '{$id}', cache })).toBe('/{$id}') - expect(resolvePath({ base: '/', to: '$id', cache })).toBe('/$id') + expect(resolvePath('/', '{$id}', undefined, cache)).toBe('/{$id}') + expect(resolvePath('/', '$id', undefined, cache)).toBe('/$id') + expect(resolvePath('/', '{$id}', undefined, cache)).toBe('/{$id}') + expect(resolvePath('/', '$id', undefined, cache)).toBe('/$id') expect(set).toHaveBeenCalledTimes(2) }) }) @@ -1073,16 +1017,8 @@ describe('interpolatePath', () => { (trailingSlash) => { const tail = trailingSlash === 'always' ? '/' : '' const defaultedFromPath = '/' - const fromPath = resolvePath({ - base: defaultedFromPath, - to: '.', - trailingSlash, - }) - const nextTo = resolvePath({ - base: fromPath, - to: '/splat/$', - trailingSlash, - }) + const fromPath = resolvePath(defaultedFromPath, '.', trailingSlash) + const nextTo = resolvePath(fromPath, '/splat/$', trailingSlash) const nextParams = { _splat: '' } const interpolatedNextTo = interpolatePath( nextTo, From 1ca361ba52a627d2f76ab33323bd83d1d0aa65a3 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Wed, 16 Sep 2026 00:42:50 +0200 Subject: [PATCH 041/175] refactor(router-core): parse masked locations without mutating shared state (#8421) * refactor(router-core): parse masked locations without mutating shared state `parseLocation` built the presented location of a masked entry by parsing the stored `__tempLocation` and then patching and `delete`-ing keys on the resulting `state`, which `replaceEqualDeep` may have shared with the previous location, before spreading the result once more. The inner parser now takes the state to use, so the masked branch passes the intended state up front and assigns `maskedLocation` on the fresh object. The slow parsing path only runs the input rewrite when one is configured, and `resolvePathWithBase` is inlined into its two callers. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> (cherry picked from commit cc6159628cd22faf9c16e6e432cb35093b2826a8) * refactor(router-core): remove redundant input rewrite guard --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/whole-coins-sin.md | 5 +++ packages/router-core/src/router.ts | 64 +++++++++++++----------------- 2 files changed, 33 insertions(+), 36 deletions(-) create mode 100644 .changeset/whole-coins-sin.md diff --git a/.changeset/whole-coins-sin.md b/.changeset/whole-coins-sin.md new file mode 100644 index 0000000000..af28b8b0d5 --- /dev/null +++ b/.changeset/whole-coins-sin.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Parse masked locations without mutating shared state and simplify input rewrite handling. diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 7f951d77bd..18de1cf47f 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -1442,13 +1442,10 @@ export class RouterCore< locationToParse, previousLocation, ) => { - const parse = ({ - pathname, - search, - hash, - href, - state, - }: HistoryLocation): ParsedLocation> => { + const parse = ( + { pathname, search, hash, href }: HistoryLocation, + state: HistoryLocation['state'], + ): ParsedLocation> => { // Fast path: no rewrite configured and pathname doesn't need encoding // Characters that need encoding: space, high unicode, control chars // eslint-disable-next-line no-control-regex @@ -1471,11 +1468,9 @@ export class RouterCore< } } - // Before we do any processing, we need to allow rewrites to modify the URL - // build up the full URL by combining the href from history with the router's origin - const fullUrl = new URL(href, this.origin) - - const url = executeRewriteInput(this.rewrite, fullUrl) + // The URL constructor normalizes the encoding of the history href; an + // input rewrite may then change the URL before it is parsed. + const url = executeRewriteInput(this.rewrite, new URL(href, this.origin)) const parsedSearch = this.options.parseSearch(url.search) const searchStr = this.options.stringifySearch(parsedSearch) @@ -1500,36 +1495,26 @@ export class RouterCore< } } - const location = parse(locationToParse) + const location = parse(locationToParse, locationToParse.state) const { __tempLocation, __tempKey } = location.state if (__tempLocation && (!__tempKey || __tempKey === this.tempLocationKey)) { - // Sync up the location keys - const parsedTempLocation = parse(__tempLocation) as any - parsedTempLocation.state.key = location.state.key // TODO: Remove in v2 - use __TSR_key instead - parsedTempLocation.state.__TSR_key = location.state.__TSR_key - - delete parsedTempLocation.state.__tempLocation - - return { - ...parsedTempLocation, - maskedLocation: location, - } + // A masked entry stores the real location in its state. That location is + // presented, adopting the committed entry's keys, while the URL that was + // written to history remains available as `maskedLocation`. + const parsedTempLocation = parse(__tempLocation, { + ...__tempLocation.state, + __tempLocation: undefined, + key: location.state.key, // TODO: Remove in v2 - use __TSR_key instead + __TSR_key: location.state.__TSR_key, + }) + parsedTempLocation.maskedLocation = location + return parsedTempLocation } return location } - /** Resolve a path using the router's trailing-slash policy. */ - resolvePathWithBase = (from: string, path: string) => { - return resolvePath( - from, - path, - this.options.trailingSlash, - this.resolvePathCache, - ) - } - matchRoutes: MatchRoutesFn = ( pathnameOrNext: string | ParsedLocation, locationSearchOrOpts?: AnySchema | MatchRoutesOpts, @@ -1957,7 +1942,7 @@ export class RouterCore< } const to = dest.to ? `${dest.to}` : '.' - const nextTo = this.resolvePathWithBase( + const nextTo = resolvePath( // Absolute destinations resolve without a base. to[0] === '/' ? '' @@ -1965,6 +1950,8 @@ export class RouterCore< ? current().pathname : (dest.from ?? currentMatch()[1 /* fullPath */]), to, + this.options.trailingSlash, + this.resolvePathCache, ) const destRoute = this.routesByPath[ @@ -2677,7 +2664,12 @@ export class RouterCore< const matchLocation = { ...location, to: location.to - ? this.resolvePathWithBase(location.from || '', location.to as string) + ? resolvePath( + location.from || '', + location.to as string, + this.options.trailingSlash, + this.resolvePathCache, + ) : undefined, params: location.params || {}, leaveParams: true, From cbbfbe37ab1dbe328c343cb437c5660769cc9f26 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Wed, 16 Sep 2026 22:38:25 +0200 Subject: [PATCH 042/175] optimize streaming (#8204) --- .changeset/quiet-ssr-hotspots.md | 6 + .changeset/steady-streams-flow.md | 35 + .../control-flow/vue/src/routeTree.gen.ts | 88 +- .../ssr/scenarios/global-middleware/bench.ts | 31 +- ...obal-mw-server-route-0-middleware.bench.ts | 27 + ...obal-mw-server-route-1-middleware.bench.ts | 27 + ...obal-mw-server-route-2-middleware.bench.ts | 27 + .../speed.global-mw-server-route.bench.ts | 4 +- .../global-middleware/react/src/start.ts | 14 +- .../ssr/scenarios/global-middleware/shared.ts | 30 + ...obal-mw-server-route-0-middleware.bench.ts | 27 + ...obal-mw-server-route-1-middleware.bench.ts | 27 + ...obal-mw-server-route-2-middleware.bench.ts | 27 + .../speed.global-mw-server-route.bench.ts | 4 +- .../global-middleware/solid/src/start.ts | 14 +- ...obal-mw-server-route-0-middleware.bench.ts | 27 + ...obal-mw-server-route-1-middleware.bench.ts | 27 + ...obal-mw-server-route-2-middleware.bench.ts | 27 + .../vue/speed.global-mw-server-route.bench.ts | 4 +- .../vue/src/routeTree.gen.ts | 26 +- .../global-middleware/vue/src/start.ts | 14 +- .../serialization/vue/src/routeTree.gen.ts | 26 +- .../server-fns/vue/src/routeTree.gen.ts | 26 +- docs/router/api/router/RouterEventsType.md | 5 +- docs/router/guide/ssr.md | 5 + .../src/routeTree.gen.ts | 24 +- .../src/routes/__root.tsx | 3 + .../src/routes/raw-stream.tsx | 29 + .../static-server-functions/tests/app.spec.ts | 27 + e2e/react-start/streaming-ssr/package.json | 39 +- .../streaming-ssr/src/routeTree.gen.ts | 21 + .../streaming-ssr/src/routes/concurrent.tsx | 52 +- .../src/routes/deferred-rejection.tsx | 8 +- .../streaming-ssr/src/routes/deferred.tsx | 58 +- .../streaming-ssr/src/routes/fast-serial.tsx | 23 +- .../src/routes/many-promises.tsx | 47 +- .../src/routes/nested-deferred.tsx | 30 +- .../streaming-ssr/src/routes/query-heavy.tsx | 200 +- .../src/routes/router-html-buffer.tsx | 58 + .../streaming-ssr/src/routes/slow-render.tsx | 52 +- .../streaming-ssr/src/routes/stream.tsx | 27 +- .../streaming-ssr/src/routes/sync-only.tsx | 18 +- .../tests/client-navigation.spec.ts | 373 +-- .../streaming-ssr/tests/concurrent.spec.ts | 101 +- .../tests/deferred-rejection.spec.ts | 22 +- .../streaming-ssr/tests/deferred.spec.ts | 121 +- .../streaming-ssr/tests/fast-serial.spec.ts | 73 +- .../streaming-ssr/tests/fixtures.ts | 90 - .../streaming-ssr/tests/home.spec.ts | 35 +- .../streaming-ssr/tests/many-promises.spec.ts | 94 +- .../tests/nested-deferred.spec.ts | 78 +- .../tests/preview-streaming.spec.ts | 22 +- .../streaming-ssr/tests/query-heavy.spec.ts | 180 +- .../tests/router-html-buffer.spec.ts | 34 + .../streaming-ssr/tests/slow-render.spec.ts | 74 +- .../streaming-ssr/tests/stream.spec.ts | 47 +- .../streaming-ssr/tests/sync-only.spec.ts | 85 +- e2e/react-start/streaming-ssr/vite.config.ts | 3 +- e2e/solid-start/streaming-ssr/package.json | 59 + .../streaming-ssr/playwright.config.ts | 38 + .../streaming-ssr/src/routeTree.gen.ts | 282 ++ e2e/solid-start/streaming-ssr/src/router.tsx | 18 + .../streaming-ssr/src/routes/__root.tsx | 99 + .../streaming-ssr/src/routes/concurrent.tsx | 47 + .../src/routes/deferred-rejection.tsx | 40 + .../streaming-ssr/src/routes/deferred.tsx | 87 + .../streaming-ssr/src/routes/fast-serial.tsx | 48 + .../streaming-ssr/src/routes/index.tsx | 58 + .../src/routes/many-promises.tsx | 91 + .../src/routes/nested-deferred.tsx | 118 + .../streaming-ssr/src/routes/query-heavy.tsx | 150 + .../streaming-ssr/src/routes/slow-render.tsx | 72 + .../streaming-ssr/src/routes/stream.tsx | 85 + .../streaming-ssr/src/routes/sync-only.tsx | 25 + .../tests/client-navigation.spec.ts | 1 + .../streaming-ssr/tests/concurrent.spec.ts | 1 + .../tests/deferred-rejection.spec.ts | 1 + .../streaming-ssr/tests/deferred.spec.ts | 1 + .../streaming-ssr/tests/fast-serial.spec.ts | 1 + .../streaming-ssr/tests/home.spec.ts | 1 + .../streaming-ssr/tests/many-promises.spec.ts | 1 + .../tests/nested-deferred.spec.ts | 1 + .../tests/preview-streaming.spec.ts | 1 + .../streaming-ssr/tests/query-heavy.spec.ts | 1 + .../streaming-ssr/tests/slow-render.spec.ts | 1 + .../streaming-ssr/tests/stream.spec.ts | 1 + .../streaming-ssr/tests/sync-only.spec.ts | 1 + e2e/solid-start/streaming-ssr/tsconfig.json | 22 + e2e/solid-start/streaming-ssr/vite.config.ts | 10 + e2e/streaming-ssr-assertions.ts | 143 + e2e/streaming-ssr-fixtures/index.ts | 381 +++ e2e/streaming-ssr-specs/client-navigation.ts | 372 +++ e2e/streaming-ssr-specs/concurrent.ts | 86 + e2e/streaming-ssr-specs/deferred-rejection.ts | 21 + e2e/streaming-ssr-specs/deferred.ts | 113 + e2e/streaming-ssr-specs/fast-serial.ts | 74 + e2e/streaming-ssr-specs/home.ts | 34 + e2e/streaming-ssr-specs/many-promises.ts | 82 + e2e/streaming-ssr-specs/nested-deferred.ts | 52 + e2e/streaming-ssr-specs/preview-streaming.ts | 13 + e2e/streaming-ssr-specs/query-heavy.ts | 142 + e2e/streaming-ssr-specs/slow-render.ts | 71 + e2e/streaming-ssr-specs/stream.ts | 55 + e2e/streaming-ssr-specs/sync-only.ts | 80 + e2e/vue-start/streaming-ssr/package.json | 59 + .../streaming-ssr/playwright.config.ts | 39 + .../streaming-ssr/src/routeTree.gen.ts | 282 ++ e2e/vue-start/streaming-ssr/src/router.tsx | 18 + .../streaming-ssr/src/routes/__root.tsx | 103 + .../streaming-ssr/src/routes/concurrent.tsx | 54 + .../src/routes/deferred-rejection.tsx | 49 + .../streaming-ssr/src/routes/deferred.tsx | 100 + .../streaming-ssr/src/routes/fast-serial.tsx | 49 + .../streaming-ssr/src/routes/index.tsx | 58 + .../src/routes/many-promises.tsx | 94 + .../src/routes/nested-deferred.tsx | 143 + .../streaming-ssr/src/routes/query-heavy.tsx | 168 ++ .../streaming-ssr/src/routes/slow-render.tsx | 77 + .../streaming-ssr/src/routes/stream.tsx | 171 ++ .../streaming-ssr/src/routes/sync-only.tsx | 25 + .../tests/client-navigation.spec.ts | 1 + .../streaming-ssr/tests/concurrent.spec.ts | 1 + .../tests/deferred-rejection.spec.ts | 1 + .../streaming-ssr/tests/deferred.spec.ts | 1 + .../streaming-ssr/tests/fast-serial.spec.ts | 1 + .../streaming-ssr/tests/home.spec.ts | 1 + .../streaming-ssr/tests/many-promises.spec.ts | 1 + .../tests/nested-deferred.spec.ts | 1 + .../tests/preview-streaming.spec.ts | 1 + .../streaming-ssr/tests/query-heavy.spec.ts | 1 + .../streaming-ssr/tests/slow-render.spec.ts | 1 + .../streaming-ssr/tests/stream.spec.ts | 22 + .../streaming-ssr/tests/sync-only.spec.ts | 7 + e2e/vue-start/streaming-ssr/tsconfig.json | 22 + e2e/vue-start/streaming-ssr/vite.config.ts | 10 + nx.json | 5 + packages/react-router-ssr-query/package.json | 2 +- packages/react-router/src/Scripts.tsx | 92 +- packages/react-router/src/index.tsx | 1 - .../src/ssr/renderRouterToStream.tsx | 282 +- .../src/ssr/renderRouterToString.tsx | 31 +- packages/react-router/src/useRouter.tsx | 18 +- .../tests/errorComponent.test.tsx | 30 +- .../react-router/tests/not-found.test.tsx | 16 + .../renderRouterToStream.react19.test.tsx | 227 ++ .../tests/renderRouterToStream.test.tsx | 913 +++++- packages/router-core/INTERNALS.md | 3 + .../benchmarks/ssr-streaming/.gitignore | 1 + .../benchmarks/ssr-streaming/README.md | 162 + .../benchmarks/ssr-streaming/run.mjs | 860 ++++++ .../benchmarks/ssr-streaming/worker.ts | 2254 ++++++++++++++ packages/router-core/src/await-signal.ts | 54 +- packages/router-core/src/index.ts | 18 +- packages/router-core/src/load-client.ts | 5 +- packages/router-core/src/load-server.ts | 47 +- packages/router-core/src/router.ts | 67 +- packages/router-core/src/ssr/STREAMING.md | 617 ++++ packages/router-core/src/ssr/bodyScripts.ts | 57 + packages/router-core/src/ssr/client.ts | 8 + packages/router-core/src/ssr/constants.ts | 1 - .../src/ssr/createRequestHandler.ts | 114 +- .../router-core/src/ssr/handlerCallback.ts | 113 +- .../src/ssr/htmlBoundaryScanner.ts | 138 + .../router-core/src/ssr/hydrationScripts.ts | 689 +++++ .../src/ssr/renderSsrHtmlResponse.ts | 29 + .../src/ssr/serializer/RawStream.ts | 441 +-- .../src/ssr/serializer/RawStreamJSONPlugin.ts | 64 + .../src/ssr/serializer/RawStreamRPCPlugin.ts | 47 + .../src/ssr/serializer/RawStreamSSRPlugin.ts | 97 + .../src/ssr/serializer/makeSerovalPlugin.ts | 31 + .../ssr/serializer/makeSsrSerovalPlugin.ts | 40 + .../src/ssr/serializer/rawStreamCodec.ts | 163 ++ .../src/ssr/serializer/seroval-plugins.ssr.ts | 11 + .../src/ssr/serializer/seroval-plugins.ts | 40 +- .../src/ssr/serializer/transformer.ts | 92 +- packages/router-core/src/ssr/server.ts | 8 +- packages/router-core/src/ssr/ssr-server.ts | 626 ++-- .../src/ssr/transformStreamWithRouter.ts | 1730 +++++------ packages/router-core/tests/RawStream.test.ts | 508 +++- .../tests/client-lane-adversarial.test.ts | 39 +- .../tests/htmlBoundaryScanner.test.ts | 256 ++ packages/router-core/tests/hydrate.test.ts | 111 +- .../tests/hydrated-stay-match-data.test.ts | 29 +- .../hydration-asset-context-order.test.ts | 30 +- .../tests/hydration-boundary-chunks.test.ts | 31 +- .../tests/hydration-currentness.test.ts | 32 +- ...ydration-terminal-error-child-head.test.ts | 31 +- .../router-core/tests/hydrationQueue.bench.ts | 103 + .../tests/hydrationScripts.test.ts | 808 +++++ .../tests/issue-7942-repro.test.ts | 271 ++ .../tests/load-client-wait-for.test.ts | 176 +- .../tests/public-hydration-contract.test.ts | 39 +- packages/router-core/tests/routerTestUtils.ts | 44 +- .../tests/server-loader-abort-error.test.ts | 153 +- .../tests/ssr-server-cleanup.test.ts | 1108 +++++-- .../tests/ssr-server-manifest.test.ts | 179 +- .../transformStreamBackpressure.perf.test.ts | 388 ++- .../tests/transformStreamWithRouter.test.ts | 2594 ++++++++++++++--- packages/router-core/tsconfig.json | 8 +- packages/router-ssr-query-core/package.json | 4 +- packages/router-ssr-query-core/src/index.ts | 50 +- .../router-ssr-query-core/tests/index.test.ts | 110 + packages/solid-router-ssr-query/package.json | 2 +- packages/solid-router/src/CatchBoundary.tsx | 43 +- packages/solid-router/src/Scripts.tsx | 54 +- packages/solid-router/src/awaited.tsx | 22 +- packages/solid-router/src/index.tsx | 1 - .../solid-router/src/lazyRouteComponent.tsx | 43 +- .../solid-router/src/ssr/RouterServer.tsx | 4 - .../solid-router/src/ssr/renderOptions.ts | 29 + .../src/ssr/renderRouterToStream.tsx | 205 +- .../src/ssr/renderRouterToString.tsx | 45 +- packages/solid-router/tests/Await.test.tsx | 28 + .../solid-router/tests/CatchBoundary.test.tsx | 131 + .../tests/component-preload-retry.test.tsx | 90 +- .../tests/issue-8115-context.test.tsx | 13 +- .../lazyRouteComponent.production.test.tsx | 135 + .../tests/renderRouterToStream.test.tsx | 364 ++- .../solid-router/tests/server/Await.test.tsx | 72 + .../tests/server/doctype.test.tsx | 44 + .../tests/server/errorComponent.test.tsx | 148 +- .../tests/server/lazyRouteComponent.test.tsx | 148 + .../server/renderRouterToStream.test.tsx | 74 + .../server/renderRouterToString.test.tsx | 52 + .../server/renderToStreamRecords.test.tsx | 61 + .../src/defaultStreamHandler.tsx | 4 +- .../src/client-rpc/frame-decoder.ts | 602 ++-- .../start-client-core/src/client-rpc/index.ts | 10 + .../src/client-rpc/serverFnFetcher.ts | 272 +- packages/start-client-core/src/constants.ts | 60 +- .../src/getDefaultSerovalPlugins.ts | 29 +- packages/start-client-core/src/index.tsx | 20 +- .../tests/frame-decoder.test.ts | 1180 +++++++- .../src/rsbuild/virtual-modules.ts | 1 + .../server-fn-resolver-module.ts | 148 +- .../src/vite/start-compiler-plugin/plugin.ts | 2 + .../tests/server-fn-resolver-module.test.ts | 71 + packages/start-server-core/INTERNALS.md | 89 + .../src/createStartHandler.ts | 836 +++--- .../start-server-core/src/frame-protocol.ts | 414 ++- packages/start-server-core/src/index.tsx | 5 +- .../src/server-functions-handler.ts | 775 ++--- .../tests/createStartHandler.test.ts | 1442 +++++++-- .../tests/frame-protocol.test.ts | 924 +++--- .../tests/server-functions-handler.test.ts | 555 ++++ .../src/staticFunctionMiddleware.ts | 54 +- packages/vue-router-ssr-query/package.json | 2 +- packages/vue-router-ssr-query/src/index.tsx | 7 + packages/vue-router/src/Scripts.tsx | 72 +- packages/vue-router/src/index.tsx | 1 - .../src/ssr/defaultStreamHandler.tsx | 4 +- .../src/ssr/renderRouterToStream.tsx | 243 +- .../src/ssr/renderRouterToString.tsx | 39 +- .../tests/renderRouterToStream.test.tsx | 373 ++- packages/vue-router/tests/ssr-test-utils.ts | 8 +- .../src/defaultStreamHandler.tsx | 4 +- pnpm-lock.yaml | 113 +- tsconfig.json | 2 +- 258 files changed, 26440 insertions(+), 8440 deletions(-) create mode 100644 .changeset/quiet-ssr-hotspots.md create mode 100644 .changeset/steady-streams-flow.md create mode 100644 benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts create mode 100644 benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts create mode 100644 benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts create mode 100644 benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts create mode 100644 benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts create mode 100644 benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts create mode 100644 benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts create mode 100644 benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts create mode 100644 benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts create mode 100644 e2e/react-start/static-server-functions/src/routes/raw-stream.tsx create mode 100644 e2e/react-start/streaming-ssr/src/routes/router-html-buffer.tsx delete mode 100644 e2e/react-start/streaming-ssr/tests/fixtures.ts create mode 100644 e2e/react-start/streaming-ssr/tests/router-html-buffer.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/package.json create mode 100644 e2e/solid-start/streaming-ssr/playwright.config.ts create mode 100644 e2e/solid-start/streaming-ssr/src/routeTree.gen.ts create mode 100644 e2e/solid-start/streaming-ssr/src/router.tsx create mode 100644 e2e/solid-start/streaming-ssr/src/routes/__root.tsx create mode 100644 e2e/solid-start/streaming-ssr/src/routes/concurrent.tsx create mode 100644 e2e/solid-start/streaming-ssr/src/routes/deferred-rejection.tsx create mode 100644 e2e/solid-start/streaming-ssr/src/routes/deferred.tsx create mode 100644 e2e/solid-start/streaming-ssr/src/routes/fast-serial.tsx create mode 100644 e2e/solid-start/streaming-ssr/src/routes/index.tsx create mode 100644 e2e/solid-start/streaming-ssr/src/routes/many-promises.tsx create mode 100644 e2e/solid-start/streaming-ssr/src/routes/nested-deferred.tsx create mode 100644 e2e/solid-start/streaming-ssr/src/routes/query-heavy.tsx create mode 100644 e2e/solid-start/streaming-ssr/src/routes/slow-render.tsx create mode 100644 e2e/solid-start/streaming-ssr/src/routes/stream.tsx create mode 100644 e2e/solid-start/streaming-ssr/src/routes/sync-only.tsx create mode 100644 e2e/solid-start/streaming-ssr/tests/client-navigation.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tests/concurrent.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tests/deferred-rejection.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tests/deferred.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tests/fast-serial.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tests/home.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tests/many-promises.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tests/nested-deferred.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tests/preview-streaming.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tests/query-heavy.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tests/slow-render.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tests/stream.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tests/sync-only.spec.ts create mode 100644 e2e/solid-start/streaming-ssr/tsconfig.json create mode 100644 e2e/solid-start/streaming-ssr/vite.config.ts create mode 100644 e2e/streaming-ssr-assertions.ts create mode 100644 e2e/streaming-ssr-fixtures/index.ts create mode 100644 e2e/streaming-ssr-specs/client-navigation.ts create mode 100644 e2e/streaming-ssr-specs/concurrent.ts create mode 100644 e2e/streaming-ssr-specs/deferred-rejection.ts create mode 100644 e2e/streaming-ssr-specs/deferred.ts create mode 100644 e2e/streaming-ssr-specs/fast-serial.ts create mode 100644 e2e/streaming-ssr-specs/home.ts create mode 100644 e2e/streaming-ssr-specs/many-promises.ts create mode 100644 e2e/streaming-ssr-specs/nested-deferred.ts create mode 100644 e2e/streaming-ssr-specs/preview-streaming.ts create mode 100644 e2e/streaming-ssr-specs/query-heavy.ts create mode 100644 e2e/streaming-ssr-specs/slow-render.ts create mode 100644 e2e/streaming-ssr-specs/stream.ts create mode 100644 e2e/streaming-ssr-specs/sync-only.ts create mode 100644 e2e/vue-start/streaming-ssr/package.json create mode 100644 e2e/vue-start/streaming-ssr/playwright.config.ts create mode 100644 e2e/vue-start/streaming-ssr/src/routeTree.gen.ts create mode 100644 e2e/vue-start/streaming-ssr/src/router.tsx create mode 100644 e2e/vue-start/streaming-ssr/src/routes/__root.tsx create mode 100644 e2e/vue-start/streaming-ssr/src/routes/concurrent.tsx create mode 100644 e2e/vue-start/streaming-ssr/src/routes/deferred-rejection.tsx create mode 100644 e2e/vue-start/streaming-ssr/src/routes/deferred.tsx create mode 100644 e2e/vue-start/streaming-ssr/src/routes/fast-serial.tsx create mode 100644 e2e/vue-start/streaming-ssr/src/routes/index.tsx create mode 100644 e2e/vue-start/streaming-ssr/src/routes/many-promises.tsx create mode 100644 e2e/vue-start/streaming-ssr/src/routes/nested-deferred.tsx create mode 100644 e2e/vue-start/streaming-ssr/src/routes/query-heavy.tsx create mode 100644 e2e/vue-start/streaming-ssr/src/routes/slow-render.tsx create mode 100644 e2e/vue-start/streaming-ssr/src/routes/stream.tsx create mode 100644 e2e/vue-start/streaming-ssr/src/routes/sync-only.tsx create mode 100644 e2e/vue-start/streaming-ssr/tests/client-navigation.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tests/concurrent.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tests/deferred-rejection.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tests/deferred.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tests/fast-serial.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tests/home.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tests/many-promises.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tests/nested-deferred.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tests/preview-streaming.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tests/query-heavy.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tests/slow-render.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tests/stream.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tests/sync-only.spec.ts create mode 100644 e2e/vue-start/streaming-ssr/tsconfig.json create mode 100644 e2e/vue-start/streaming-ssr/vite.config.ts create mode 100644 packages/react-router/tests/renderRouterToStream.react19.test.tsx create mode 100644 packages/router-core/benchmarks/ssr-streaming/.gitignore create mode 100644 packages/router-core/benchmarks/ssr-streaming/README.md create mode 100644 packages/router-core/benchmarks/ssr-streaming/run.mjs create mode 100644 packages/router-core/benchmarks/ssr-streaming/worker.ts create mode 100644 packages/router-core/src/ssr/STREAMING.md create mode 100644 packages/router-core/src/ssr/bodyScripts.ts create mode 100644 packages/router-core/src/ssr/htmlBoundaryScanner.ts create mode 100644 packages/router-core/src/ssr/hydrationScripts.ts create mode 100644 packages/router-core/src/ssr/renderSsrHtmlResponse.ts create mode 100644 packages/router-core/src/ssr/serializer/RawStreamJSONPlugin.ts create mode 100644 packages/router-core/src/ssr/serializer/RawStreamRPCPlugin.ts create mode 100644 packages/router-core/src/ssr/serializer/RawStreamSSRPlugin.ts create mode 100644 packages/router-core/src/ssr/serializer/makeSerovalPlugin.ts create mode 100644 packages/router-core/src/ssr/serializer/makeSsrSerovalPlugin.ts create mode 100644 packages/router-core/src/ssr/serializer/rawStreamCodec.ts create mode 100644 packages/router-core/src/ssr/serializer/seroval-plugins.ssr.ts create mode 100644 packages/router-core/tests/htmlBoundaryScanner.test.ts create mode 100644 packages/router-core/tests/hydrationQueue.bench.ts create mode 100644 packages/router-core/tests/hydrationScripts.test.ts create mode 100644 packages/router-core/tests/issue-7942-repro.test.ts create mode 100644 packages/solid-router/src/ssr/renderOptions.ts create mode 100644 packages/solid-router/tests/Await.test.tsx create mode 100644 packages/solid-router/tests/CatchBoundary.test.tsx create mode 100644 packages/solid-router/tests/lazyRouteComponent.production.test.tsx create mode 100644 packages/solid-router/tests/server/Await.test.tsx create mode 100644 packages/solid-router/tests/server/doctype.test.tsx create mode 100644 packages/solid-router/tests/server/lazyRouteComponent.test.tsx create mode 100644 packages/solid-router/tests/server/renderRouterToStream.test.tsx create mode 100644 packages/solid-router/tests/server/renderRouterToString.test.tsx create mode 100644 packages/solid-router/tests/server/renderToStreamRecords.test.tsx create mode 100644 packages/start-plugin-core/tests/server-fn-resolver-module.test.ts create mode 100644 packages/start-server-core/INTERNALS.md create mode 100644 packages/start-server-core/tests/server-functions-handler.test.ts diff --git a/.changeset/quiet-ssr-hotspots.md b/.changeset/quiet-ssr-hotspots.md new file mode 100644 index 0000000000..aa2278fb19 --- /dev/null +++ b/.changeset/quiet-ssr-hotspots.md @@ -0,0 +1,6 @@ +--- +'@tanstack/router-core': patch +'@tanstack/start-plugin-core': patch +--- + +Reduce per-request SSR overhead: abort settled route matches with one shared `AbortError`-shaped reason instead of building a stack-capturing `DOMException` per match, skip `JSON.parse` for search values that cannot start JSON, wait on request signals with one listener per wait, and keep resolved server-function modules in production builds instead of re-importing them on every call. diff --git a/.changeset/steady-streams-flow.md b/.changeset/steady-streams-flow.md new file mode 100644 index 0000000000..de779b8c95 --- /dev/null +++ b/.changeset/steady-streams-flow.md @@ -0,0 +1,35 @@ +--- +'@tanstack/router-core': patch +'@tanstack/router-ssr-query-core': patch +'@tanstack/react-router': patch +'@tanstack/react-router-ssr-query': patch +'@tanstack/solid-router': patch +'@tanstack/solid-router-ssr-query': patch +'@tanstack/solid-start-server': patch +'@tanstack/start-client-core': patch +'@tanstack/start-server-core': patch +'@tanstack/start-static-server-functions': patch +'@tanstack/vue-router': patch +'@tanstack/vue-router-ssr-query': patch +'@tanstack/vue-start-server': patch +--- + +Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + +Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + +Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + +The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + +The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + +Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + +Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + +Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + +Static server functions decode cached `RawStream` values with the client deserializer plugins. + +SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. diff --git a/benchmarks/ssr/scenarios/control-flow/vue/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/control-flow/vue/src/routeTree.gen.ts index f5063d1c09..6dcf0d095e 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/control-flow/vue/src/routeTree.gen.ts @@ -10,30 +10,20 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' -import { Route as TargetIdRouteImport } from './routes/target.$id' -import { Route as MissingIdRouteImport } from './routes/missing.$id' -import { Route as HeadersIdRouteImport } from './routes/headers.$id' -import { Route as FromIdRouteImport } from './routes/from.$id' import { Route as BoomIdRouteImport } from './routes/boom.$id' +import { Route as FromIdRouteImport } from './routes/from.$id' +import { Route as HeadersIdRouteImport } from './routes/headers.$id' +import { Route as MissingIdRouteImport } from './routes/missing.$id' +import { Route as TargetIdRouteImport } from './routes/target.$id' const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const TargetIdRoute = TargetIdRouteImport.update({ - id: '/target/$id', - path: '/target/$id', - getParentRoute: () => rootRouteImport, -} as any) -const MissingIdRoute = MissingIdRouteImport.update({ - id: '/missing/$id', - path: '/missing/$id', - getParentRoute: () => rootRouteImport, -} as any) -const HeadersIdRoute = HeadersIdRouteImport.update({ - id: '/headers/$id', - path: '/headers/$id', +const BoomIdRoute = BoomIdRouteImport.update({ + id: '/boom/$id', + path: '/boom/$id', getParentRoute: () => rootRouteImport, } as any) const FromIdRoute = FromIdRouteImport.update({ @@ -41,9 +31,19 @@ const FromIdRoute = FromIdRouteImport.update({ path: '/from/$id', getParentRoute: () => rootRouteImport, } as any) -const BoomIdRoute = BoomIdRouteImport.update({ - id: '/boom/$id', - path: '/boom/$id', +const HeadersIdRoute = HeadersIdRouteImport.update({ + id: '/headers/$id', + path: '/headers/$id', + getParentRoute: () => rootRouteImport, +} as any) +const MissingIdRoute = MissingIdRouteImport.update({ + id: '/missing/$id', + path: '/missing/$id', + getParentRoute: () => rootRouteImport, +} as any) +const TargetIdRoute = TargetIdRouteImport.update({ + id: '/target/$id', + path: '/target/$id', getParentRoute: () => rootRouteImport, } as any) @@ -117,25 +117,11 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/target/$id': { - id: '/target/$id' - path: '/target/$id' - fullPath: '/target/$id' - preLoaderRoute: typeof TargetIdRouteImport - parentRoute: typeof rootRouteImport - } - '/missing/$id': { - id: '/missing/$id' - path: '/missing/$id' - fullPath: '/missing/$id' - preLoaderRoute: typeof MissingIdRouteImport - parentRoute: typeof rootRouteImport - } - '/headers/$id': { - id: '/headers/$id' - path: '/headers/$id' - fullPath: '/headers/$id' - preLoaderRoute: typeof HeadersIdRouteImport + '/boom/$id': { + id: '/boom/$id' + path: '/boom/$id' + fullPath: '/boom/$id' + preLoaderRoute: typeof BoomIdRouteImport parentRoute: typeof rootRouteImport } '/from/$id': { @@ -145,11 +131,25 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof FromIdRouteImport parentRoute: typeof rootRouteImport } - '/boom/$id': { - id: '/boom/$id' - path: '/boom/$id' - fullPath: '/boom/$id' - preLoaderRoute: typeof BoomIdRouteImport + '/headers/$id': { + id: '/headers/$id' + path: '/headers/$id' + fullPath: '/headers/$id' + preLoaderRoute: typeof HeadersIdRouteImport + parentRoute: typeof rootRouteImport + } + '/missing/$id': { + id: '/missing/$id' + path: '/missing/$id' + fullPath: '/missing/$id' + preLoaderRoute: typeof MissingIdRouteImport + parentRoute: typeof rootRouteImport + } + '/target/$id': { + id: '/target/$id' + path: '/target/$id' + fullPath: '/target/$id' + preLoaderRoute: typeof TargetIdRouteImport parentRoute: typeof rootRouteImport } } diff --git a/benchmarks/ssr/scenarios/global-middleware/bench.ts b/benchmarks/ssr/scenarios/global-middleware/bench.ts index a89d03cabb..d2784aed38 100644 --- a/benchmarks/ssr/scenarios/global-middleware/bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/bench.ts @@ -7,10 +7,13 @@ import { import { expectedFunctionTotal, expectedRequestTotal, + getExpectedRequestContext, makeDocumentMarker, makeServerFnMarker, makeServerRouteMarker, + setRequestMiddlewareCount, } from './shared' +import type { RequestMiddlewareCount } from './shared' import type { StartRequestHandler } from '../../bench-utils' export type { StartRequestHandler } @@ -140,6 +143,7 @@ function buildPostRequest(urls: FnUrls, bodies: Array, index: number) { export async function setupGlobalMiddlewareBench( handler: StartRequestHandler, ): Promise { + setRequestMiddlewareCount(3) const urls = await discoverUrls(handler) const payloads = createPayloads() const bodies = await createBodies(payloads) @@ -154,6 +158,7 @@ export async function setupGlobalMiddlewareBench( } async function assertDocumentResponse(handler: StartRequestHandler) { + setRequestMiddlewareCount(3) const id = 'page-sanity' const response = await handler.fetch( new Request(`${origin}/page/${id}`, documentRequestInit), @@ -175,7 +180,11 @@ async function assertDocumentResponse(handler: StartRequestHandler) { } } -async function assertServerRouteResponse(handler: StartRequestHandler) { +async function assertServerRouteResponseForCount( + handler: StartRequestHandler, + count: RequestMiddlewareCount, +) { + setRequestMiddlewareCount(count) const id = 'route-sanity' const response = await handler.fetch( new Request(`${origin}/api/ping/${id}`, apiRequestInit), @@ -199,10 +208,8 @@ async function assertServerRouteResponse(handler: StartRequestHandler) { marker?: string requestTotal?: number } - const expectedMarker = makeServerRouteMarker(id, { - requestTrace: 'req.r1.r2.r3', - requestTotal: expectedRequestTotal, - }) + const expectedContext = getExpectedRequestContext(count) + const expectedMarker = makeServerRouteMarker(id, expectedContext) if (body.marker !== expectedMarker) { throw new Error( @@ -210,9 +217,9 @@ async function assertServerRouteResponse(handler: StartRequestHandler) { ) } - if (body.requestTotal !== expectedRequestTotal) { + if (body.requestTotal !== expectedContext.requestTotal) { throw new Error( - `Expected server route requestTotal ${expectedRequestTotal}, received ${body.requestTotal}`, + `Expected server route requestTotal ${expectedContext.requestTotal}, received ${body.requestTotal}`, ) } } @@ -221,6 +228,7 @@ async function assertServerFnResponse( handler: StartRequestHandler, context: GlobalMiddlewareBenchContext, ) { + setRequestMiddlewareCount(3) const response = await handler.fetch( buildPostRequest(context.urls, context.bodies, 0), ) @@ -257,10 +265,14 @@ export async function assertGlobalMiddlewareScenario( ) { await assertDocumentResponse(handler) await assertServerFnResponse(handler, context) - await assertServerRouteResponse(handler) + for (const count of [0, 1, 2, 3] as const) { + await assertServerRouteResponseForCount(handler, count) + } + setRequestMiddlewareCount(3) } export function runGlobalMiddlewareDocumentLoop(handler: StartRequestHandler) { + setRequestMiddlewareCount(3) return runRequestLoop(handler, { seed: benchmarkSeed, concurrency: 16, @@ -273,6 +285,7 @@ export function runGlobalMiddlewareServerFnLoop( handler: StartRequestHandler, context: GlobalMiddlewareBenchContext, ) { + setRequestMiddlewareCount(3) return runRequestLoop(handler, { seed: benchmarkSeed, concurrency: 16, @@ -284,7 +297,9 @@ export function runGlobalMiddlewareServerFnLoop( export function runGlobalMiddlewareServerRouteLoop( handler: StartRequestHandler, + count: RequestMiddlewareCount = 3, ) { + setRequestMiddlewareCount(count) return runRequestLoop(handler, { seed: benchmarkSeed, concurrency: 16, diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts new file mode 100644 index 0000000000..2a784ec987 --- /dev/null +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts @@ -0,0 +1,27 @@ +import { bench, describe } from 'vitest' +import { + assertGlobalMiddlewareScenario, + globalMiddlewareBenchOptions, + runGlobalMiddlewareServerRouteLoop, + setupGlobalMiddlewareBench, +} from '../bench' +import type { StartRequestHandler } from '../bench' + +const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href + +const { default: handler } = (await import( + /* @vite-ignore */ appModuleUrl +)) as { + default: StartRequestHandler +} +const context = await setupGlobalMiddlewareBench(handler) + +await assertGlobalMiddlewareScenario(handler, context) + +describe('ssr', () => { + bench( + 'ssr global-mw server-route 0 middleware (react)', + () => runGlobalMiddlewareServerRouteLoop(handler, 0), + globalMiddlewareBenchOptions, + ) +}) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts new file mode 100644 index 0000000000..64e18cfe61 --- /dev/null +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts @@ -0,0 +1,27 @@ +import { bench, describe } from 'vitest' +import { + assertGlobalMiddlewareScenario, + globalMiddlewareBenchOptions, + runGlobalMiddlewareServerRouteLoop, + setupGlobalMiddlewareBench, +} from '../bench' +import type { StartRequestHandler } from '../bench' + +const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href + +const { default: handler } = (await import( + /* @vite-ignore */ appModuleUrl +)) as { + default: StartRequestHandler +} +const context = await setupGlobalMiddlewareBench(handler) + +await assertGlobalMiddlewareScenario(handler, context) + +describe('ssr', () => { + bench( + 'ssr global-mw server-route 1 middleware (react)', + () => runGlobalMiddlewareServerRouteLoop(handler, 1), + globalMiddlewareBenchOptions, + ) +}) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts new file mode 100644 index 0000000000..4418f0867e --- /dev/null +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts @@ -0,0 +1,27 @@ +import { bench, describe } from 'vitest' +import { + assertGlobalMiddlewareScenario, + globalMiddlewareBenchOptions, + runGlobalMiddlewareServerRouteLoop, + setupGlobalMiddlewareBench, +} from '../bench' +import type { StartRequestHandler } from '../bench' + +const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href + +const { default: handler } = (await import( + /* @vite-ignore */ appModuleUrl +)) as { + default: StartRequestHandler +} +const context = await setupGlobalMiddlewareBench(handler) + +await assertGlobalMiddlewareScenario(handler, context) + +describe('ssr', () => { + bench( + 'ssr global-mw server-route 2 middlewares (react)', + () => runGlobalMiddlewareServerRouteLoop(handler, 2), + globalMiddlewareBenchOptions, + ) +}) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route.bench.ts index 9dc19cf943..189f3b7ef6 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route.bench.ts @@ -20,8 +20,8 @@ await assertGlobalMiddlewareScenario(handler, context) describe('ssr', () => { bench( - 'ssr global-mw server-route (react)', - () => runGlobalMiddlewareServerRouteLoop(handler), + 'ssr global-mw server-route 3 middlewares (react)', + () => runGlobalMiddlewareServerRouteLoop(handler, 3), globalMiddlewareBenchOptions, ) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/src/start.ts b/benchmarks/ssr/scenarios/global-middleware/react/src/start.ts index 6b59e8035b..8dfb2dd3c4 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/src/start.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/src/start.ts @@ -1,4 +1,5 @@ import { createMiddleware, createStart } from '@tanstack/react-start' +import { getRequestMiddlewareCount } from '../../shared' import type { GlobalMiddlewareContext } from '../../shared' function appendTrace( @@ -48,6 +49,13 @@ const requestMiddlewareC = createMiddleware({ type: 'request' }).server( }, ) +const requestMiddlewareSets: Array> = [ + [], + [requestMiddlewareA], + [requestMiddlewareA, requestMiddlewareB], + [requestMiddlewareA, requestMiddlewareB, requestMiddlewareC], +] + const functionMiddlewareA = createMiddleware({ type: 'function' }).server( ({ next, context }) => { const ctx = (context ?? {}) as GlobalMiddlewareContext @@ -75,10 +83,6 @@ const functionMiddlewareB = createMiddleware({ type: 'function' }).server( ) export const startInstance = createStart(() => ({ - requestMiddleware: [ - requestMiddlewareA, - requestMiddlewareB, - requestMiddlewareC, - ], + requestMiddleware: requestMiddlewareSets[getRequestMiddlewareCount()], functionMiddleware: [functionMiddlewareA, functionMiddlewareB], })) diff --git a/benchmarks/ssr/scenarios/global-middleware/shared.ts b/benchmarks/ssr/scenarios/global-middleware/shared.ts index f90fa9b233..8fbe788911 100644 --- a/benchmarks/ssr/scenarios/global-middleware/shared.ts +++ b/benchmarks/ssr/scenarios/global-middleware/shared.ts @@ -10,11 +10,41 @@ export interface GlobalMiddlewareRouteContext extends GlobalMiddlewareContext { globalMiddlewareContext?: GlobalMiddlewareContext } +export type RequestMiddlewareCount = 0 | 1 | 2 | 3 + +const requestMiddlewareCountKey = '__TSR_SSR_BENCH_REQUEST_MIDDLEWARE_COUNT__' + +type BenchmarkGlobal = typeof globalThis & { + [requestMiddlewareCountKey]?: RequestMiddlewareCount +} + +const expectedRequestContexts: ReadonlyArray = [ + {}, + { requestTrace: 'req.r1', requestTotal: 1 }, + { requestTrace: 'req.r1.r2', requestTotal: 3 }, + { requestTrace: 'req.r1.r2.r3', requestTotal: 6 }, +] + export const expectedRequestTrace = 'req.r1.r2.r3' export const expectedRequestTotal = 6 export const expectedFunctionTrace = 'fn.f1.f2' export const expectedFunctionTotal = 30 +export function setRequestMiddlewareCount(count: RequestMiddlewareCount) { + const benchmarkGlobal = globalThis as BenchmarkGlobal + benchmarkGlobal[requestMiddlewareCountKey] = count +} + +export function getRequestMiddlewareCount(): RequestMiddlewareCount { + return (globalThis as BenchmarkGlobal)[requestMiddlewareCountKey] ?? 3 +} + +export function getExpectedRequestContext( + count: RequestMiddlewareCount, +): GlobalMiddlewareContext { + return expectedRequestContexts[count]! +} + export function makeDocumentMarker( id: string, context: GlobalMiddlewareContext, diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts new file mode 100644 index 0000000000..c7485b4ef4 --- /dev/null +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts @@ -0,0 +1,27 @@ +import { bench, describe } from 'vitest' +import { + assertGlobalMiddlewareScenario, + globalMiddlewareBenchOptions, + runGlobalMiddlewareServerRouteLoop, + setupGlobalMiddlewareBench, +} from '../bench' +import type { StartRequestHandler } from '../bench' + +const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href + +const { default: handler } = (await import( + /* @vite-ignore */ appModuleUrl +)) as { + default: StartRequestHandler +} +const context = await setupGlobalMiddlewareBench(handler) + +await assertGlobalMiddlewareScenario(handler, context) + +describe('ssr', () => { + bench( + 'ssr global-mw server-route 0 middleware (solid)', + () => runGlobalMiddlewareServerRouteLoop(handler, 0), + globalMiddlewareBenchOptions, + ) +}) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts new file mode 100644 index 0000000000..ac18e0ca79 --- /dev/null +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts @@ -0,0 +1,27 @@ +import { bench, describe } from 'vitest' +import { + assertGlobalMiddlewareScenario, + globalMiddlewareBenchOptions, + runGlobalMiddlewareServerRouteLoop, + setupGlobalMiddlewareBench, +} from '../bench' +import type { StartRequestHandler } from '../bench' + +const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href + +const { default: handler } = (await import( + /* @vite-ignore */ appModuleUrl +)) as { + default: StartRequestHandler +} +const context = await setupGlobalMiddlewareBench(handler) + +await assertGlobalMiddlewareScenario(handler, context) + +describe('ssr', () => { + bench( + 'ssr global-mw server-route 1 middleware (solid)', + () => runGlobalMiddlewareServerRouteLoop(handler, 1), + globalMiddlewareBenchOptions, + ) +}) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts new file mode 100644 index 0000000000..7c2be97b01 --- /dev/null +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts @@ -0,0 +1,27 @@ +import { bench, describe } from 'vitest' +import { + assertGlobalMiddlewareScenario, + globalMiddlewareBenchOptions, + runGlobalMiddlewareServerRouteLoop, + setupGlobalMiddlewareBench, +} from '../bench' +import type { StartRequestHandler } from '../bench' + +const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href + +const { default: handler } = (await import( + /* @vite-ignore */ appModuleUrl +)) as { + default: StartRequestHandler +} +const context = await setupGlobalMiddlewareBench(handler) + +await assertGlobalMiddlewareScenario(handler, context) + +describe('ssr', () => { + bench( + 'ssr global-mw server-route 2 middlewares (solid)', + () => runGlobalMiddlewareServerRouteLoop(handler, 2), + globalMiddlewareBenchOptions, + ) +}) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route.bench.ts index 495c57112a..7d21d72067 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route.bench.ts @@ -20,8 +20,8 @@ await assertGlobalMiddlewareScenario(handler, context) describe('ssr', () => { bench( - 'ssr global-mw server-route (solid)', - () => runGlobalMiddlewareServerRouteLoop(handler), + 'ssr global-mw server-route 3 middlewares (solid)', + () => runGlobalMiddlewareServerRouteLoop(handler, 3), globalMiddlewareBenchOptions, ) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/src/start.ts b/benchmarks/ssr/scenarios/global-middleware/solid/src/start.ts index 8c4168d574..a6f6214b82 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/src/start.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/src/start.ts @@ -1,4 +1,5 @@ import { createMiddleware, createStart } from '@tanstack/solid-start' +import { getRequestMiddlewareCount } from '../../shared' import type { GlobalMiddlewareContext } from '../../shared' function appendTrace( @@ -48,6 +49,13 @@ const requestMiddlewareC = createMiddleware({ type: 'request' }).server( }, ) +const requestMiddlewareSets: Array> = [ + [], + [requestMiddlewareA], + [requestMiddlewareA, requestMiddlewareB], + [requestMiddlewareA, requestMiddlewareB, requestMiddlewareC], +] + const functionMiddlewareA = createMiddleware({ type: 'function' }).server( ({ next, context }) => { const ctx = (context ?? {}) as GlobalMiddlewareContext @@ -75,10 +83,6 @@ const functionMiddlewareB = createMiddleware({ type: 'function' }).server( ) export const startInstance = createStart(() => ({ - requestMiddleware: [ - requestMiddlewareA, - requestMiddlewareB, - requestMiddlewareC, - ], + requestMiddleware: requestMiddlewareSets[getRequestMiddlewareCount()], functionMiddleware: [functionMiddlewareA, functionMiddlewareB], })) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts new file mode 100644 index 0000000000..c334af8b65 --- /dev/null +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts @@ -0,0 +1,27 @@ +import { bench, describe } from 'vitest' +import { + assertGlobalMiddlewareScenario, + globalMiddlewareBenchOptions, + runGlobalMiddlewareServerRouteLoop, + setupGlobalMiddlewareBench, +} from '../bench' +import type { StartRequestHandler } from '../bench' + +const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href + +const { default: handler } = (await import( + /* @vite-ignore */ appModuleUrl +)) as { + default: StartRequestHandler +} +const context = await setupGlobalMiddlewareBench(handler) + +await assertGlobalMiddlewareScenario(handler, context) + +describe('ssr', () => { + bench( + 'ssr global-mw server-route 0 middleware (vue)', + () => runGlobalMiddlewareServerRouteLoop(handler, 0), + globalMiddlewareBenchOptions, + ) +}) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts new file mode 100644 index 0000000000..7c1b91a0ea --- /dev/null +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts @@ -0,0 +1,27 @@ +import { bench, describe } from 'vitest' +import { + assertGlobalMiddlewareScenario, + globalMiddlewareBenchOptions, + runGlobalMiddlewareServerRouteLoop, + setupGlobalMiddlewareBench, +} from '../bench' +import type { StartRequestHandler } from '../bench' + +const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href + +const { default: handler } = (await import( + /* @vite-ignore */ appModuleUrl +)) as { + default: StartRequestHandler +} +const context = await setupGlobalMiddlewareBench(handler) + +await assertGlobalMiddlewareScenario(handler, context) + +describe('ssr', () => { + bench( + 'ssr global-mw server-route 1 middleware (vue)', + () => runGlobalMiddlewareServerRouteLoop(handler, 1), + globalMiddlewareBenchOptions, + ) +}) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts new file mode 100644 index 0000000000..5b00bd3ca9 --- /dev/null +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts @@ -0,0 +1,27 @@ +import { bench, describe } from 'vitest' +import { + assertGlobalMiddlewareScenario, + globalMiddlewareBenchOptions, + runGlobalMiddlewareServerRouteLoop, + setupGlobalMiddlewareBench, +} from '../bench' +import type { StartRequestHandler } from '../bench' + +const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href + +const { default: handler } = (await import( + /* @vite-ignore */ appModuleUrl +)) as { + default: StartRequestHandler +} +const context = await setupGlobalMiddlewareBench(handler) + +await assertGlobalMiddlewareScenario(handler, context) + +describe('ssr', () => { + bench( + 'ssr global-mw server-route 2 middlewares (vue)', + () => runGlobalMiddlewareServerRouteLoop(handler, 2), + globalMiddlewareBenchOptions, + ) +}) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route.bench.ts index e7fd4cd205..6cdc34241e 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route.bench.ts @@ -20,8 +20,8 @@ await assertGlobalMiddlewareScenario(handler, context) describe('ssr', () => { bench( - 'ssr global-mw server-route (vue)', - () => runGlobalMiddlewareServerRouteLoop(handler), + 'ssr global-mw server-route 3 middlewares (vue)', + () => runGlobalMiddlewareServerRouteLoop(handler, 3), globalMiddlewareBenchOptions, ) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/global-middleware/vue/src/routeTree.gen.ts index aae3329420..3118848e4d 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/src/routeTree.gen.ts @@ -10,8 +10,8 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' -import { Route as PageIdRouteImport } from './routes/page.$id' import { Route as ApiFnUrlsRouteImport } from './routes/api.fn-urls' +import { Route as PageIdRouteImport } from './routes/page.$id' import { Route as ApiPingIdRouteImport } from './routes/api.ping.$id' const IndexRoute = IndexRouteImport.update({ @@ -19,16 +19,16 @@ const IndexRoute = IndexRouteImport.update({ path: '/', getParentRoute: () => rootRouteImport, } as any) -const PageIdRoute = PageIdRouteImport.update({ - id: '/page/$id', - path: '/page/$id', - getParentRoute: () => rootRouteImport, -} as any) const ApiFnUrlsRoute = ApiFnUrlsRouteImport.update({ id: '/api/fn-urls', path: '/api/fn-urls', getParentRoute: () => rootRouteImport, } as any) +const PageIdRoute = PageIdRouteImport.update({ + id: '/page/$id', + path: '/page/$id', + getParentRoute: () => rootRouteImport, +} as any) const ApiPingIdRoute = ApiPingIdRouteImport.update({ id: '/api/ping/$id', path: '/api/ping/$id', @@ -78,13 +78,6 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/page/$id': { - id: '/page/$id' - path: '/page/$id' - fullPath: '/page/$id' - preLoaderRoute: typeof PageIdRouteImport - parentRoute: typeof rootRouteImport - } '/api/fn-urls': { id: '/api/fn-urls' path: '/api/fn-urls' @@ -92,6 +85,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof ApiFnUrlsRouteImport parentRoute: typeof rootRouteImport } + '/page/$id': { + id: '/page/$id' + path: '/page/$id' + fullPath: '/page/$id' + preLoaderRoute: typeof PageIdRouteImport + parentRoute: typeof rootRouteImport + } '/api/ping/$id': { id: '/api/ping/$id' path: '/api/ping/$id' diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/src/start.ts b/benchmarks/ssr/scenarios/global-middleware/vue/src/start.ts index dc3f142e27..6e4eb2c5ef 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/src/start.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/src/start.ts @@ -1,4 +1,5 @@ import { createMiddleware, createStart } from '@tanstack/vue-start' +import { getRequestMiddlewareCount } from '../../shared' import type { GlobalMiddlewareContext } from '../../shared' function appendTrace( @@ -48,6 +49,13 @@ const requestMiddlewareC = createMiddleware({ type: 'request' }).server( }, ) +const requestMiddlewareSets: Array> = [ + [], + [requestMiddlewareA], + [requestMiddlewareA, requestMiddlewareB], + [requestMiddlewareA, requestMiddlewareB, requestMiddlewareC], +] + const functionMiddlewareA = createMiddleware({ type: 'function' }).server( ({ next, context }) => { const ctx = (context ?? {}) as GlobalMiddlewareContext @@ -75,10 +83,6 @@ const functionMiddlewareB = createMiddleware({ type: 'function' }).server( ) export const startInstance = createStart(() => ({ - requestMiddleware: [ - requestMiddlewareA, - requestMiddlewareB, - requestMiddlewareC, - ], + requestMiddleware: requestMiddlewareSets[getRequestMiddlewareCount()], functionMiddleware: [functionMiddlewareA, functionMiddlewareB], })) diff --git a/benchmarks/ssr/scenarios/serialization/vue/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/serialization/vue/src/routeTree.gen.ts index 02268c2c3c..cd7b0b449b 100644 --- a/benchmarks/ssr/scenarios/serialization/vue/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/serialization/vue/src/routeTree.gen.ts @@ -9,19 +9,19 @@ // 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 RichIdRouteImport } from './routes/rich.$id' import { Route as PlainIdRouteImport } from './routes/plain.$id' +import { Route as RichIdRouteImport } from './routes/rich.$id' -const RichIdRoute = RichIdRouteImport.update({ - id: '/rich/$id', - path: '/rich/$id', - getParentRoute: () => rootRouteImport, -} as any) const PlainIdRoute = PlainIdRouteImport.update({ id: '/plain/$id', path: '/plain/$id', getParentRoute: () => rootRouteImport, } as any) +const RichIdRoute = RichIdRouteImport.update({ + id: '/rich/$id', + path: '/rich/$id', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/plain/$id': typeof PlainIdRoute @@ -51,13 +51,6 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/rich/$id': { - id: '/rich/$id' - path: '/rich/$id' - fullPath: '/rich/$id' - preLoaderRoute: typeof RichIdRouteImport - parentRoute: typeof rootRouteImport - } '/plain/$id': { id: '/plain/$id' path: '/plain/$id' @@ -65,6 +58,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof PlainIdRouteImport parentRoute: typeof rootRouteImport } + '/rich/$id': { + id: '/rich/$id' + path: '/rich/$id' + fullPath: '/rich/$id' + preLoaderRoute: typeof RichIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/ssr/scenarios/server-fns/vue/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/server-fns/vue/src/routeTree.gen.ts index fa27fb1a5d..0e24cd9c15 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/src/routeTree.gen.ts @@ -10,24 +10,24 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' -import { Route as SsrCallIdRouteImport } from './routes/ssr-call.$id' import { Route as ApiFnUrlsRouteImport } from './routes/api.fn-urls' +import { Route as SsrCallIdRouteImport } from './routes/ssr-call.$id' const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const SsrCallIdRoute = SsrCallIdRouteImport.update({ - id: '/ssr-call/$id', - path: '/ssr-call/$id', - getParentRoute: () => rootRouteImport, -} as any) const ApiFnUrlsRoute = ApiFnUrlsRouteImport.update({ id: '/api/fn-urls', path: '/api/fn-urls', getParentRoute: () => rootRouteImport, } as any) +const SsrCallIdRoute = SsrCallIdRouteImport.update({ + id: '/ssr-call/$id', + path: '/ssr-call/$id', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -68,13 +68,6 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/ssr-call/$id': { - id: '/ssr-call/$id' - path: '/ssr-call/$id' - fullPath: '/ssr-call/$id' - preLoaderRoute: typeof SsrCallIdRouteImport - parentRoute: typeof rootRouteImport - } '/api/fn-urls': { id: '/api/fn-urls' path: '/api/fn-urls' @@ -82,6 +75,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof ApiFnUrlsRouteImport parentRoute: typeof rootRouteImport } + '/ssr-call/$id': { + id: '/ssr-call/$id' + path: '/ssr-call/$id' + fullPath: '/ssr-call/$id' + preLoaderRoute: typeof SsrCallIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/docs/router/api/router/RouterEventsType.md b/docs/router/api/router/RouterEventsType.md index c79bb47f81..c27887fba1 100644 --- a/docs/router/api/router/RouterEventsType.md +++ b/docs/router/api/router/RouterEventsType.md @@ -47,9 +47,6 @@ type RouterEvents = { hrefChanged: boolean hashChanged: boolean } - onInjectedHtml: { - type: 'onInjectedHtml' - } onRendered: { type: 'onRendered' fromLocation?: ParsedLocation @@ -67,7 +64,7 @@ Once an event is emitted, the following properties will be present on the event ### `type` property -- Type: `onBeforeNavigate | onBeforeLoad | onLoad | onBeforeRouteMount | onResolved | onRendered | onInjectedHtml` +- Type: `onBeforeNavigate | onBeforeLoad | onLoad | onBeforeRouteMount | onResolved | onRendered` - The type of the event - This is useful for discriminating between events in a listener function. diff --git a/docs/router/guide/ssr.md b/docs/router/guide/ssr.md index ae3cdbef7c..46a0941e7c 100644 --- a/docs/router/guide/ssr.md +++ b/docs/router/guide/ssr.md @@ -158,6 +158,8 @@ export async function render({ request }: { request: Request }) { using `renderRouterToString` +React and Solid use their native synchronous string renderers. Suspended components render their Suspense fallback without waiting for the component to resolve. The router still finishes serializing hydration data before returning the response. Use `renderRouterToStream` when you need the server to render suspended content after it resolves. + # React @@ -260,6 +262,9 @@ This pattern can be useful for pages that have slow or high-latency data fetchin > [!NOTE] > This streaming pattern is all automatic as long as you are using either `defaultStreamHandler` or `renderRouterToStream`. +> [!IMPORTANT] +> Render [``](./document-head-management.md#scripts) inside `` of your root route. It emits the route scripts and marks where the router inserts streamed hydration data. Without it the response still completes, but the page cannot hydrate. + using `defaultStreamHandler` diff --git a/e2e/react-start/static-server-functions/src/routeTree.gen.ts b/e2e/react-start/static-server-functions/src/routeTree.gen.ts index ea6a6a3806..558b1ab4d9 100644 --- a/e2e/react-start/static-server-functions/src/routeTree.gen.ts +++ b/e2e/react-start/static-server-functions/src/routeTree.gen.ts @@ -11,6 +11,7 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' import { Route as PostsRouteImport } from './routes/posts' +import { Route as RawStreamRouteImport } from './routes/raw-stream' import { Route as PostsIndexRouteImport } from './routes/posts.index' const IndexRoute = IndexRouteImport.update({ @@ -23,6 +24,11 @@ const PostsRoute = PostsRouteImport.update({ path: '/posts', getParentRoute: () => rootRouteImport, } as any) +const RawStreamRoute = RawStreamRouteImport.update({ + id: '/raw-stream', + path: '/raw-stream', + getParentRoute: () => rootRouteImport, +} as any) const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', @@ -32,29 +38,33 @@ const PostsIndexRoute = PostsIndexRouteImport.update({ export interface FileRoutesByFullPath { '/': typeof IndexRoute '/posts': typeof PostsRouteWithChildren + '/raw-stream': typeof RawStreamRoute '/posts/': typeof PostsIndexRoute } export interface FileRoutesByTo { '/': typeof IndexRoute + '/raw-stream': typeof RawStreamRoute '/posts': typeof PostsIndexRoute } export interface FileRoutesById { __root__: typeof rootRouteImport '/': typeof IndexRoute '/posts': typeof PostsRouteWithChildren + '/raw-stream': typeof RawStreamRoute '/posts/': typeof PostsIndexRoute } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: '/' | '/posts' | '/posts/' + fullPaths: '/' | '/posts' | '/raw-stream' | '/posts/' fileRoutesByTo: FileRoutesByTo - to: '/' | '/posts' - id: '__root__' | '/' | '/posts' | '/posts/' + to: '/' | '/raw-stream' | '/posts' + id: '__root__' | '/' | '/posts' | '/raw-stream' | '/posts/' fileRoutesById: FileRoutesById } export interface RootRouteChildren { IndexRoute: typeof IndexRoute PostsRoute: typeof PostsRouteWithChildren + RawStreamRoute: typeof RawStreamRoute } declare module '@tanstack/react-router' { @@ -73,6 +83,13 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRouteImport } + '/raw-stream': { + id: '/raw-stream' + path: '/raw-stream' + fullPath: '/raw-stream' + preLoaderRoute: typeof RawStreamRouteImport + parentRoute: typeof rootRouteImport + } '/posts/': { id: '/posts/' path: '/' @@ -96,6 +113,7 @@ const PostsRouteWithChildren = PostsRoute._addFileChildren(PostsRouteChildren) const rootRouteChildren: RootRouteChildren = { IndexRoute: IndexRoute, PostsRoute: PostsRouteWithChildren, + RawStreamRoute: RawStreamRoute, } export const routeTree = rootRouteImport ._addFileChildren(rootRouteChildren) diff --git a/e2e/react-start/static-server-functions/src/routes/__root.tsx b/e2e/react-start/static-server-functions/src/routes/__root.tsx index b768e8b9a1..a300613fa8 100644 --- a/e2e/react-start/static-server-functions/src/routes/__root.tsx +++ b/e2e/react-start/static-server-functions/src/routes/__root.tsx @@ -30,6 +30,9 @@ function RootComponent() { Posts + + Raw Stream +

diff --git a/e2e/react-start/static-server-functions/src/routes/raw-stream.tsx b/e2e/react-start/static-server-functions/src/routes/raw-stream.tsx new file mode 100644 index 0000000000..df898d2907 --- /dev/null +++ b/e2e/react-start/static-server-functions/src/routes/raw-stream.tsx @@ -0,0 +1,29 @@ +import { createFileRoute } from '@tanstack/react-router' +import { RawStream, createServerFn } from '@tanstack/react-start' +import { staticFunctionMiddleware } from '@tanstack/start-static-server-functions' + +const fetchRawStream = createServerFn({ method: 'GET' }) + .middleware([staticFunctionMiddleware]) + .handler(async () => { + return new RawStream(new Response('Static cache stream').body!, { + hint: 'text', + }) + }) + +export const Route = createFileRoute('/raw-stream')({ + loader: async () => { + const result = await fetchRawStream() + if (typeof document === 'undefined') { + return '' + } + const stream = result as RawStream | ReadableStream + return new Response( + stream instanceof RawStream ? stream.stream : stream, + ).text() + }, + component: RawStreamComponent, +}) + +function RawStreamComponent() { + return

{Route.useLoaderData()}

+} diff --git a/e2e/react-start/static-server-functions/tests/app.spec.ts b/e2e/react-start/static-server-functions/tests/app.spec.ts index 895566aa35..d86fd61a75 100644 --- a/e2e/react-start/static-server-functions/tests/app.spec.ts +++ b/e2e/react-start/static-server-functions/tests/app.spec.ts @@ -59,5 +59,32 @@ test.describe('Static Server Functions with Nitro', () => { await expect(page.getByTestId('post-2')).toHaveText('Second Post') await expect(page.getByTestId('post-3')).toHaveText('Third Post') }) + + test('should decode a cached RawStream during client navigation', async ({ + page, + }) => { + await page.goto('/') + // Nitro snapshots public assets before Start prerenders (see #6787). + // Serve the generated file as a static host would to isolate decoding. + await page.route('**/__tsr/staticServerFnCache/*.json', (route) => + route.fulfill({ + path: join( + process.cwd(), + '.output', + 'public', + new URL(route.request().url()).pathname, + ), + }), + ) + const cacheResponse = page.waitForResponse((response) => + response.url().includes('/__tsr/staticServerFnCache/'), + ) + await page.getByTestId('link-raw-stream').click() + const response = await cacheResponse + expect(response.status(), response.url()).toBe(200) + await expect(page.getByTestId('raw-stream')).toHaveText( + 'Static cache stream', + ) + }) }) }) diff --git a/e2e/react-start/streaming-ssr/package.json b/e2e/react-start/streaming-ssr/package.json index 3e85f5e78c..d0e3757175 100644 --- a/e2e/react-start/streaming-ssr/package.json +++ b/e2e/react-start/streaming-ssr/package.json @@ -10,7 +10,8 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js", "preview": "vite preview", "test:e2e": "playwright test --project=chromium", - "test:e2e:preview": "MODE=preview playwright test preview-streaming.spec.ts --project=chromium" + "test:e2e:preview": "MODE=preview playwright test preview-streaming.spec.ts --project=chromium", + "test:e2e:buffer-repro": "RUN_SSR_ROUTER_HTML_BUFFER_REPRO=true playwright test router-html-buffer.spec.ts --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.80.7", @@ -26,9 +27,45 @@ "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", + "@vitejs/plugin-react": "^6.0.1", "srvx": "^0.11.9", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" + }, + "nx": { + "targets": { + "build": { + "inputs": [ + "buildProduction", + "^buildProduction", + "dependentTaskOutputs", + "streamingSsrTests" + ] + }, + "test:e2e": { + "inputs": [ + "default", + "^production", + "dependentTaskOutputs", + "streamingSsrTests" + ] + }, + "test:e2e:preview": { + "inputs": [ + "default", + "^production", + "streamingSsrTests" + ] + }, + "test:e2e:buffer-repro": { + "inputs": [ + "default", + "^production", + "dependentTaskOutputs", + "streamingSsrTests" + ] + } + } } } diff --git a/e2e/react-start/streaming-ssr/src/routeTree.gen.ts b/e2e/react-start/streaming-ssr/src/routeTree.gen.ts index c1a51b62f8..169121003d 100644 --- a/e2e/react-start/streaming-ssr/src/routeTree.gen.ts +++ b/e2e/react-start/streaming-ssr/src/routeTree.gen.ts @@ -17,6 +17,7 @@ import { Route as FastSerialRouteImport } from './routes/fast-serial' import { Route as ManyPromisesRouteImport } from './routes/many-promises' import { Route as NestedDeferredRouteImport } from './routes/nested-deferred' import { Route as QueryHeavyRouteImport } from './routes/query-heavy' +import { Route as RouterHtmlBufferRouteImport } from './routes/router-html-buffer' import { Route as SlowRenderRouteImport } from './routes/slow-render' import { Route as StreamRouteImport } from './routes/stream' import { Route as SyncOnlyRouteImport } from './routes/sync-only' @@ -61,6 +62,11 @@ const QueryHeavyRoute = QueryHeavyRouteImport.update({ path: '/query-heavy', getParentRoute: () => rootRouteImport, } as any) +const RouterHtmlBufferRoute = RouterHtmlBufferRouteImport.update({ + id: '/router-html-buffer', + path: '/router-html-buffer', + getParentRoute: () => rootRouteImport, +} as any) const SlowRenderRoute = SlowRenderRouteImport.update({ id: '/slow-render', path: '/slow-render', @@ -86,6 +92,7 @@ export interface FileRoutesByFullPath { '/many-promises': typeof ManyPromisesRoute '/nested-deferred': typeof NestedDeferredRoute '/query-heavy': typeof QueryHeavyRoute + '/router-html-buffer': typeof RouterHtmlBufferRoute '/slow-render': typeof SlowRenderRoute '/stream': typeof StreamRoute '/sync-only': typeof SyncOnlyRoute @@ -99,6 +106,7 @@ export interface FileRoutesByTo { '/many-promises': typeof ManyPromisesRoute '/nested-deferred': typeof NestedDeferredRoute '/query-heavy': typeof QueryHeavyRoute + '/router-html-buffer': typeof RouterHtmlBufferRoute '/slow-render': typeof SlowRenderRoute '/stream': typeof StreamRoute '/sync-only': typeof SyncOnlyRoute @@ -113,6 +121,7 @@ export interface FileRoutesById { '/many-promises': typeof ManyPromisesRoute '/nested-deferred': typeof NestedDeferredRoute '/query-heavy': typeof QueryHeavyRoute + '/router-html-buffer': typeof RouterHtmlBufferRoute '/slow-render': typeof SlowRenderRoute '/stream': typeof StreamRoute '/sync-only': typeof SyncOnlyRoute @@ -128,6 +137,7 @@ export interface FileRouteTypes { | '/many-promises' | '/nested-deferred' | '/query-heavy' + | '/router-html-buffer' | '/slow-render' | '/stream' | '/sync-only' @@ -141,6 +151,7 @@ export interface FileRouteTypes { | '/many-promises' | '/nested-deferred' | '/query-heavy' + | '/router-html-buffer' | '/slow-render' | '/stream' | '/sync-only' @@ -154,6 +165,7 @@ export interface FileRouteTypes { | '/many-promises' | '/nested-deferred' | '/query-heavy' + | '/router-html-buffer' | '/slow-render' | '/stream' | '/sync-only' @@ -168,6 +180,7 @@ export interface RootRouteChildren { ManyPromisesRoute: typeof ManyPromisesRoute NestedDeferredRoute: typeof NestedDeferredRoute QueryHeavyRoute: typeof QueryHeavyRoute + RouterHtmlBufferRoute: typeof RouterHtmlBufferRoute SlowRenderRoute: typeof SlowRenderRoute StreamRoute: typeof StreamRoute SyncOnlyRoute: typeof SyncOnlyRoute @@ -231,6 +244,13 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof QueryHeavyRouteImport parentRoute: typeof rootRouteImport } + '/router-html-buffer': { + id: '/router-html-buffer' + path: '/router-html-buffer' + fullPath: '/router-html-buffer' + preLoaderRoute: typeof RouterHtmlBufferRouteImport + parentRoute: typeof rootRouteImport + } '/slow-render': { id: '/slow-render' path: '/slow-render' @@ -264,6 +284,7 @@ const rootRouteChildren: RootRouteChildren = { ManyPromisesRoute: ManyPromisesRoute, NestedDeferredRoute: NestedDeferredRoute, QueryHeavyRoute: QueryHeavyRoute, + RouterHtmlBufferRoute: RouterHtmlBufferRoute, SlowRenderRoute: SlowRenderRoute, StreamRoute: StreamRoute, SyncOnlyRoute: SyncOnlyRoute, diff --git a/e2e/react-start/streaming-ssr/src/routes/concurrent.tsx b/e2e/react-start/streaming-ssr/src/routes/concurrent.tsx index a1bed0fe07..c04155aa59 100644 --- a/e2e/react-start/streaming-ssr/src/routes/concurrent.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/concurrent.tsx @@ -1,54 +1,9 @@ import { Await, createFileRoute } from '@tanstack/react-router' import { Suspense } from 'react' - -/** - * Tests concurrent promise resolution - multiple promises resolving at the exact same time. - * This can stress the serialization system and reveal race conditions. - */ - -// Shared delay function that resolves multiple promises at the same instant -function createConcurrentPromises( - count: number, - delayMs: number, -): Array> { - const sharedPromise = new Promise((resolve) => - setTimeout(resolve, delayMs), - ) - return Array.from({ length: count }, (_, i) => - sharedPromise.then(() => `concurrent-${i + 1}`), - ) -} +import { createConcurrentLoaderData } from '../../../../streaming-ssr-fixtures' export const Route = createFileRoute('/concurrent')({ - loader: async () => { - // Create fresh batches of concurrent promises for each request - const batch1 = createConcurrentPromises(5, 100) // 5 promises resolving at 100ms - const batch2 = createConcurrentPromises(5, 200) // 5 promises resolving at 200ms - const batch3 = createConcurrentPromises(5, 300) // 5 promises resolving at 300ms - - return { - // Batch 1: 5 promises resolving at exactly the same time (100ms) - concurrent1_1: batch1[0], - concurrent1_2: batch1[1], - concurrent1_3: batch1[2], - concurrent1_4: batch1[3], - concurrent1_5: batch1[4], - - // Batch 2: 5 promises resolving at exactly the same time (200ms) - concurrent2_1: batch2[0], - concurrent2_2: batch2[1], - concurrent2_3: batch2[2], - concurrent2_4: batch2[3], - concurrent2_5: batch2[4], - - // Batch 3: 5 promises resolving at exactly the same time (300ms) - concurrent3_1: batch3[0], - concurrent3_2: batch3[1], - concurrent3_3: batch3[2], - concurrent3_4: batch3[3], - concurrent3_5: batch3[4], - } - }, + loader: async () => createConcurrentLoaderData(), component: Concurrent, }) @@ -86,7 +41,6 @@ function Concurrent() { gap: '20px', }} > - {/* Batch 1: 100ms */}

Batch 1 (100ms)

@@ -96,7 +50,6 @@ function Concurrent() {
- {/* Batch 2: 200ms */}

Batch 2 (200ms)

@@ -106,7 +59,6 @@ function Concurrent() {
- {/* Batch 3: 300ms */}

Batch 3 (300ms)

diff --git a/e2e/react-start/streaming-ssr/src/routes/deferred-rejection.tsx b/e2e/react-start/streaming-ssr/src/routes/deferred-rejection.tsx index d9b5305480..3ac1e7fc2d 100644 --- a/e2e/react-start/streaming-ssr/src/routes/deferred-rejection.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/deferred-rejection.tsx @@ -1,7 +1,9 @@ import { Await, createFileRoute } from '@tanstack/react-router' import { Suspense } from 'react' - -const deferredErrorMessage = 'Error in deferred object' +import { + deferredDataDelay, + deferredErrorMessage, +} from '../../../../streaming-ssr-fixtures' export const Route = createFileRoute('/deferred-rejection')({ loader: async () => { @@ -9,7 +11,7 @@ export const Route = createFileRoute('/deferred-rejection')({ deferredData: new Promise((_resolve, reject) => { setTimeout(() => { reject(new Error(deferredErrorMessage)) - }, 1000) + }, deferredDataDelay) }), } }, diff --git a/e2e/react-start/streaming-ssr/src/routes/deferred.tsx b/e2e/react-start/streaming-ssr/src/routes/deferred.tsx index 506efbd345..9f91c0f2d4 100644 --- a/e2e/react-start/streaming-ssr/src/routes/deferred.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/deferred.tsx @@ -1,55 +1,40 @@ import { Await, createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { Suspense } from 'react' +import { + deferredDataDelay, + deferredDataMessage, + deferredImmediateName, + deferredServerDelay, + deferredSlowName, + delay, + makeDeferredMessage, + makeServerData, + sourceMarker, +} from '../../../../streaming-ssr-fixtures' -// Server function that returns immediately const getImmediateData = createServerFn({ method: 'GET' }) .validator((data: { name: string }) => data) - .handler(({ data }) => { - return { - name: data.name, - timestamp: Date.now(), - // Track where this data came from - should always be 'server' if SSR works - source: 'server' as const, - } - }) + .handler(({ data }) => makeServerData(data.name)) -// Server function that takes time to complete const getSlowData = createServerFn({ method: 'GET' }) .validator((data: { name: string; delay: number }) => data) .handler(async ({ data }) => { - await new Promise((r) => setTimeout(r, data.delay)) - return { - name: data.name, - timestamp: Date.now(), - // Track where this data came from - should always be 'server' if SSR works - source: 'server' as const, - } + await delay(data.delay) + return makeServerData(data.name) }) export const Route = createFileRoute('/deferred')({ loader: async () => { return { - // Deferred promise that resolves after 1 second - deferredData: new Promise<{ message: string; source: string }>((r) => - setTimeout( - () => - r({ - message: 'Deferred data loaded!', - // Track where this data came from - should always be 'server' if SSR works - source: typeof window === 'undefined' ? 'server' : 'client', - }), - 1000, - ), - ), - // Deferred server function call + deferredData: makeDeferredMessage(deferredDataMessage, deferredDataDelay), deferredServerData: getSlowData({ - data: { name: 'Slow User', delay: 800 }, + data: { name: deferredSlowName, delay: deferredServerDelay }, }), - // Immediate data (awaited) - immediateData: await getImmediateData({ data: { name: 'Fast User' } }), - // Track where loader ran - should always be 'server' if SSR works - loaderSource: typeof window === 'undefined' ? 'server' : 'client', + immediateData: await getImmediateData({ + data: { name: deferredImmediateName }, + }), + loaderSource: sourceMarker(), } }, component: Deferred, @@ -63,7 +48,6 @@ function Deferred() {

Deferred Data Test

- {/* Immediate data should be available right away */}
Immediate: {immediateData.name} @ {immediateData.timestamp}
@@ -74,7 +58,6 @@ function Deferred() {
Loader source: {loaderSource}
- {/* Deferred promise */} Loading deferred...
} > @@ -88,7 +71,6 @@ function Deferred() { /> - {/* Deferred server function */} Loading server data...
diff --git a/e2e/react-start/streaming-ssr/src/routes/fast-serial.tsx b/e2e/react-start/streaming-ssr/src/routes/fast-serial.tsx index 61a47469f4..cc3f0c2b5c 100644 --- a/e2e/react-start/streaming-ssr/src/routes/fast-serial.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/fast-serial.tsx @@ -1,26 +1,23 @@ import { createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' +import { + fastSerialStaticData, + makeFastSerialSmallData, + sourceMarker, +} from '../../../../streaming-ssr-fixtures' -// Server function that returns immediately with minimal data -const getSmallData = createServerFn({ method: 'GET' }).handler(() => { - return { - value: 'small-data', - timestamp: Date.now(), - // Track where this data came from - should always be 'server' if SSR works - source: 'server' as const, - } -}) +const getSmallData = createServerFn({ method: 'GET' }).handler(() => + makeFastSerialSmallData(), +) export const Route = createFileRoute('/fast-serial')({ loader: async () => { - // All data is awaited immediately - serialization should complete quickly const data = await getSmallData() return { serverData: data, - staticData: 'This is static data', + staticData: fastSerialStaticData, timestamp: Date.now(), - // Track where loader ran - should always be 'server' if SSR works - loaderSource: typeof window === 'undefined' ? 'server' : 'client', + loaderSource: sourceMarker(), } }, component: FastSerial, diff --git a/e2e/react-start/streaming-ssr/src/routes/many-promises.tsx b/e2e/react-start/streaming-ssr/src/routes/many-promises.tsx index a6d0374972..25cb6511c7 100644 --- a/e2e/react-start/streaming-ssr/src/routes/many-promises.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/many-promises.tsx @@ -1,47 +1,9 @@ import { Await, createFileRoute } from '@tanstack/react-router' import { Suspense } from 'react' - -/** - * Tests streaming with many (15+) deferred promises resolving in various orders. - * This stresses the serialization system with concurrent promise resolutions. - */ - -// Helper to create a promise with a specific delay and value -function createDelayedPromise(value: T, delayMs: number): Promise { - return new Promise((resolve) => setTimeout(() => resolve(value), delayMs)) -} +import { createManyPromises } from '../../../../streaming-ssr-fixtures' export const Route = createFileRoute('/many-promises')({ - loader: async () => { - // Create 15 promises with varying delays to test ordering - // Some resolve quickly, some slowly, some at similar times - return { - // Immediate/very fast (0-50ms) - immediate1: createDelayedPromise('immediate-1', 0), - immediate2: createDelayedPromise('immediate-2', 10), - immediate3: createDelayedPromise('immediate-3', 20), - - // Fast (50-150ms) - fast1: createDelayedPromise('fast-1', 50), - fast2: createDelayedPromise('fast-2', 75), - fast3: createDelayedPromise('fast-3', 100), - fast4: createDelayedPromise('fast-4', 125), - - // Medium (150-300ms) - medium1: createDelayedPromise('medium-1', 150), - medium2: createDelayedPromise('medium-2', 200), - medium3: createDelayedPromise('medium-3', 250), - - // Slow (300-600ms) - slow1: createDelayedPromise('slow-1', 300), - slow2: createDelayedPromise('slow-2', 400), - slow3: createDelayedPromise('slow-3', 500), - - // Very slow (600ms+) - verySlow1: createDelayedPromise('very-slow-1', 600), - verySlow2: createDelayedPromise('very-slow-2', 800), - } - }, + loader: async () => createManyPromises(), component: ManyPromises, }) @@ -85,7 +47,6 @@ function ManyPromises() { gap: '10px', }} > - {/* Immediate group */}

Immediate (0-20ms)

- {/* Fast group */}

Fast (50-125ms)

@@ -114,7 +74,6 @@ function ManyPromises() {
- {/* Medium group */}

Medium (150-250ms)

- {/* Slow group */}

Slow (300-500ms)

@@ -142,7 +100,6 @@ function ManyPromises() {
- {/* Very slow group */}

Very Slow (600-800ms)

{ - await new Promise((r) => setTimeout(r, 200)) - return { level: 1, timestamp: Date.now() } + await delay(nestedLevelDelays[0]) + return makeLevelData(1) }) const getLevel2Data = createServerFn({ method: 'GET' }).handler(async () => { - await new Promise((r) => setTimeout(r, 400)) - return { level: 2, timestamp: Date.now() } + await delay(nestedLevelDelays[1]) + return makeLevelData(2) }) const getLevel3Data = createServerFn({ method: 'GET' }).handler(async () => { - await new Promise((r) => setTimeout(r, 600)) - return { level: 3, timestamp: Date.now() } + await delay(nestedLevelDelays[2]) + return makeLevelData(3) }) export const Route = createFileRoute('/nested-deferred')({ loader: async () => { return { - // Multiple deferred promises that resolve at different times level1: getLevel1Data(), level2: getLevel2Data(), level3: getLevel3Data(), - // Also a plain deferred promise - plainDeferred: new Promise((r) => - setTimeout(() => r('Plain deferred resolved!'), 300), - ), + plainDeferred: makeDeferred(nestedPlainMessage, nestedPlainDelay), } }, component: NestedDeferred, }) -// Nested component that renders more Await components function Level1Content({ level2, level3, @@ -106,7 +108,6 @@ function NestedDeferred() { Tests multiple nested deferred promises resolving at different times.

- {/* Plain deferred */} Loading plain...
} > @@ -116,7 +117,6 @@ function NestedDeferred() { /> - {/* Nested structure */}
Loading level 1...
} diff --git a/e2e/react-start/streaming-ssr/src/routes/query-heavy.tsx b/e2e/react-start/streaming-ssr/src/routes/query-heavy.tsx index b20921323c..115ae9f10f 100644 --- a/e2e/react-start/streaming-ssr/src/routes/query-heavy.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/query-heavy.tsx @@ -1,167 +1,48 @@ import { queryOptions, useSuspenseQuery } from '@tanstack/react-query' import { createFileRoute } from '@tanstack/react-router' import { Suspense } from 'react' +import { + delay, + makeQueryData, + queryHeavyItems, +} from '../../../../streaming-ssr-fixtures' +import type { QueryData } from '../../../../streaming-ssr-fixtures' -/** - * Tests multiple useSuspenseQuery calls on a single route. - * Some queries have synchronous queryFn (return immediately), - * some have async queryFn with various delays. - * - * This stresses the SSR query streaming integration. - */ +function makeQueryOptions(item: (typeof queryHeavyItems)[number]) { + return queryOptions({ + queryKey: ['streaming-ssr-query-heavy', item.type, item.id], + queryFn: (): QueryData | Promise => { + if (item.delayMs > 0) { + return delay(item.delayMs).then(() => makeQueryData(item)) + } -// Synchronous query - returns immediately (no await) -const syncQuery1 = queryOptions({ - queryKey: ['sync', 1], - queryFn: () => { - // Synchronous return - no Promise delay - return { - type: 'sync', - id: 1, - value: 'sync-value-1', - source: typeof window === 'undefined' ? 'server' : 'client', - } - }, - staleTime: Infinity, -}) + return makeQueryData(item) + }, + staleTime: Infinity, + }) +} -const syncQuery2 = queryOptions({ - queryKey: ['sync', 2], - queryFn: () => { - return { - type: 'sync', - id: 2, - value: 'sync-value-2', - source: typeof window === 'undefined' ? 'server' : 'client', - } - }, - staleTime: Infinity, -}) +const syncQuery1 = makeQueryOptions(queryHeavyItems[0]) +const syncQuery2 = makeQueryOptions(queryHeavyItems[1]) +const syncQuery3 = makeQueryOptions(queryHeavyItems[2]) +const fastAsyncQuery1 = makeQueryOptions(queryHeavyItems[3]) +const fastAsyncQuery2 = makeQueryOptions(queryHeavyItems[4]) +const fastAsyncQuery3 = makeQueryOptions(queryHeavyItems[5]) +const slowAsyncQuery1 = makeQueryOptions(queryHeavyItems[6]) +const slowAsyncQuery2 = makeQueryOptions(queryHeavyItems[7]) +const slowAsyncQuery3 = makeQueryOptions(queryHeavyItems[8]) -const syncQuery3 = queryOptions({ - queryKey: ['sync', 3], - queryFn: () => { - return { - type: 'sync', - id: 3, - value: 'sync-value-3', - source: typeof window === 'undefined' ? 'server' : 'client', - } - }, - staleTime: Infinity, -}) - -// Fast async queries (50-100ms) -const fastAsyncQuery1 = queryOptions({ - queryKey: ['fast-async', 1], - queryFn: async () => { - await new Promise((r) => setTimeout(r, 50)) - return { - type: 'fast-async', - id: 1, - value: 'fast-async-1', - source: typeof window === 'undefined' ? 'server' : 'client', - } - }, - staleTime: Infinity, -}) - -const fastAsyncQuery2 = queryOptions({ - queryKey: ['fast-async', 2], - queryFn: async () => { - await new Promise((r) => setTimeout(r, 75)) - return { - type: 'fast-async', - id: 2, - value: 'fast-async-2', - source: typeof window === 'undefined' ? 'server' : 'client', - } - }, - staleTime: Infinity, -}) - -const fastAsyncQuery3 = queryOptions({ - queryKey: ['fast-async', 3], - queryFn: async () => { - await new Promise((r) => setTimeout(r, 100)) - return { - type: 'fast-async', - id: 3, - value: 'fast-async-3', - source: typeof window === 'undefined' ? 'server' : 'client', - } - }, - staleTime: Infinity, -}) - -// Slow async queries (200-400ms) -const slowAsyncQuery1 = queryOptions({ - queryKey: ['slow-async', 1], - queryFn: async () => { - await new Promise((r) => setTimeout(r, 200)) - return { - type: 'slow-async', - id: 1, - value: 'slow-async-1', - source: typeof window === 'undefined' ? 'server' : 'client', - } - }, - staleTime: Infinity, -}) - -const slowAsyncQuery2 = queryOptions({ - queryKey: ['slow-async', 2], - queryFn: async () => { - await new Promise((r) => setTimeout(r, 300)) - return { - type: 'slow-async', - id: 2, - value: 'slow-async-2', - source: typeof window === 'undefined' ? 'server' : 'client', - } - }, - staleTime: Infinity, -}) - -const slowAsyncQuery3 = queryOptions({ - queryKey: ['slow-async', 3], - queryFn: async () => { - await new Promise((r) => setTimeout(r, 400)) - return { - type: 'slow-async', - id: 3, - value: 'slow-async-3', - source: typeof window === 'undefined' ? 'server' : 'client', - } - }, - staleTime: Infinity, -}) +type QueryOptions = ReturnType export const Route = createFileRoute('/query-heavy')({ component: QueryHeavy, }) -// Individual query components to test Suspense boundaries -function SyncQueryDisplay({ +function QueryDisplay({ queryOpts, testId, }: { - queryOpts: typeof syncQuery1 - testId: string -}) { - const { data } = useSuspenseQuery(queryOpts) - return ( -
- {data.value} (source: {data.source}) -
- ) -} - -function AsyncQueryDisplay({ - queryOpts, - testId, -}: { - queryOpts: typeof fastAsyncQuery1 + queryOpts: QueryOptions testId: string }) { const { data } = useSuspenseQuery(queryOpts) @@ -190,27 +71,25 @@ function QueryHeavy() { marginTop: '20px', }} > - {/* Sync queries - should resolve immediately */}

Sync Queries (immediate)

Loading sync 1...
} > - + Loading sync 2...
} > - + Loading sync 3...} > - + - {/* Fast async queries */}

Fast Async Queries (50-100ms)

Loading fast 1...
} > - @@ -228,7 +107,7 @@ function QueryHeavy() {
Loading fast 2...
} > - @@ -238,14 +117,13 @@ function QueryHeavy() {
Loading fast 3...
} > - - {/* Slow async queries */}

Slow Async Queries (200-400ms)

Loading slow 1...
} > - @@ -263,7 +141,7 @@ function QueryHeavy() {
Loading slow 2...
} > - @@ -273,7 +151,7 @@ function QueryHeavy() {
Loading slow 3...
} > - diff --git a/e2e/react-start/streaming-ssr/src/routes/router-html-buffer.tsx b/e2e/react-start/streaming-ssr/src/routes/router-html-buffer.tsx new file mode 100644 index 0000000000..6fb7bde27b --- /dev/null +++ b/e2e/react-start/streaming-ssr/src/routes/router-html-buffer.tsx @@ -0,0 +1,58 @@ +import { Suspense, useState } from 'react' +import { Await, createFileRoute } from '@tanstack/react-router' +import { createRouterHtmlPayload } from '../../../../streaming-ssr-fixtures' + +export const Route = createFileRoute('/router-html-buffer')({ + loader: () => { + return { + payload: createRouterHtmlPayload(), + } + }, + component: RouterHtmlBufferRoute, +}) + +function RouterHtmlBufferRoute() { + const { payload } = Route.useLoaderData() + + return ( +
+

Router HTML Buffer Reproduction

+ Waiting for the deferred payload...

}> + ( + + )} + /> +
+
+ ) +} + +function HydratedPayload({ + payload, + source, +}: { + payload: string + source: 'server' | 'client' +}) { + const [hydrationResult, setHydrationResult] = useState('not checked') + + return ( + <> +

{payload.length}

+ +

{hydrationResult}

+ + ) +} diff --git a/e2e/react-start/streaming-ssr/src/routes/slow-render.tsx b/e2e/react-start/streaming-ssr/src/routes/slow-render.tsx index 5dd9772604..a897c519c1 100644 --- a/e2e/react-start/streaming-ssr/src/routes/slow-render.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/slow-render.tsx @@ -1,47 +1,36 @@ import { Await, createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { Suspense } from 'react' +import { + makeDeferredMessage, + makeServerData, + slowRenderComponents, + slowRenderDeferredDelay, + slowRenderDeferredMessage, + slowRenderQuickName, + sourceMarker, +} from '../../../../streaming-ssr-fixtures' -// Server function that completes quickly -const getQuickData = createServerFn({ method: 'GET' }).handler(() => { - return { - name: 'Quick data', - timestamp: Date.now(), - // Track where this data came from - should always be 'server' if SSR works - source: 'server' as const, - } -}) +const getQuickData = createServerFn({ method: 'GET' }).handler(() => + makeServerData(slowRenderQuickName), +) -// Simulate a slow component render by doing work during render function SlowComponent({ data, index }: { data: string; index: number }) { - // This simulates a component that takes time to render const startTime = Date.now() - while (Date.now() - startTime < 100) { - // Blocking loop to simulate slow render - } + while (Date.now() - startTime < 100) {} return
{data}
} export const Route = createFileRoute('/slow-render')({ loader: async () => { - // All data loads quickly const quickData = await getQuickData() return { quickData, - // Deferred data that resolves before render might complete - deferredData: new Promise<{ message: string; source: string }>((r) => - setTimeout( - () => - r({ - message: 'Deferred resolved!', - // Track where this data came from - should always be 'server' if SSR works - source: typeof window === 'undefined' ? 'server' : 'client', - }), - 50, - ), + deferredData: makeDeferredMessage( + slowRenderDeferredMessage, + slowRenderDeferredDelay, ), - // Track where loader ran - should always be 'server' if SSR works - loaderSource: typeof window === 'undefined' ? 'server' : 'client', + loaderSource: sourceMarker(), } }, component: SlowRender, @@ -76,10 +65,9 @@ function SlowRender() { /> - {/* Multiple slow components to extend render time */} - - - + {slowRenderComponents.map((data, index) => ( + + ))} ) } diff --git a/e2e/react-start/streaming-ssr/src/routes/stream.tsx b/e2e/react-start/streaming-ssr/src/routes/stream.tsx index c1629204c7..458be61366 100644 --- a/e2e/react-start/streaming-ssr/src/routes/stream.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/stream.tsx @@ -1,24 +1,16 @@ import { Await, createFileRoute } from '@tanstack/react-router' import { Suspense, useEffect, useRef, useState } from 'react' +import { + createChunkStream, + createStreamPromise, +} from '../../../../streaming-ssr-fixtures' export const Route = createFileRoute('/stream')({ component: StreamRoute, loader() { return { - // A promise that resolves after a short delay - promise: new Promise((resolve) => - setTimeout(() => resolve('promise-resolved'), 150), - ), - // A ReadableStream that emits chunks over time - stream: new ReadableStream({ - async start(controller) { - for (let i = 0; i < 5; i++) { - await new Promise((resolve) => setTimeout(resolve, 200)) - controller.enqueue(`chunk-${i}`) - } - controller.close() - }, - }), + promise: createStreamPromise(), + stream: createChunkStream(), } }, }) @@ -33,19 +25,16 @@ function StreamRoute() { const streamRef = useRef(null) useEffect(() => { - // If we're already reading this exact stream, don't start again if (streamRef.current === stream && readerRef.current) { return } - // Reset state for a new stream if (streamRef.current !== stream) { setStreamData([]) setStreamComplete(false) streamRef.current = stream } - // Check if stream is already locked (from a previous render) if (stream.locked) { return } @@ -65,7 +54,6 @@ function StreamRoute() { } setStreamComplete(true) } catch (e) { - // Stream was cancelled or errored, ignore if (!(e instanceof TypeError && String(e).includes('cancelled'))) { console.error('Stream error:', e) } @@ -75,7 +63,6 @@ function StreamRoute() { fetchStream() return () => { - // Cancel the reader on cleanup if (readerRef.current) { readerRef.current.cancel().catch(() => {}) readerRef.current = null @@ -87,7 +74,6 @@ function StreamRoute() {

ReadableStream Test

- {/* Promise data */} Loading promise...
} > @@ -97,7 +83,6 @@ function StreamRoute() { /> - {/* Stream data */}

Stream chunks:

diff --git a/e2e/react-start/streaming-ssr/src/routes/sync-only.tsx b/e2e/react-start/streaming-ssr/src/routes/sync-only.tsx index c95a1d467f..67a77a3e9f 100644 --- a/e2e/react-start/streaming-ssr/src/routes/sync-only.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/sync-only.tsx @@ -1,22 +1,8 @@ import { createFileRoute } from '@tanstack/react-router' +import { makeSyncOnlyData } from '../../../../streaming-ssr-fixtures' -/** - * This route tests synchronous serialization - no deferred data, no streaming. - * The loader returns data synchronously (awaited), so crossSerializeStream - * completes immediately and all bootstrap scripts should be in the initial HTML. - */ export const Route = createFileRoute('/sync-only')({ - loader: async () => { - // Simulate a fast synchronous data fetch - // This data is awaited, not deferred, so serialization completes synchronously - return { - message: 'Hello from sync loader!', - timestamp: Date.now(), - items: ['item-1', 'item-2', 'item-3'], - // Track where this data came from - should always be 'server' if SSR works - source: typeof window === 'undefined' ? 'server' : 'client', - } - }, + loader: async () => makeSyncOnlyData(), component: SyncOnly, }) diff --git a/e2e/react-start/streaming-ssr/tests/client-navigation.spec.ts b/e2e/react-start/streaming-ssr/tests/client-navigation.spec.ts index 91138987ad..8b9b3a8dcc 100644 --- a/e2e/react-start/streaming-ssr/tests/client-navigation.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/client-navigation.spec.ts @@ -1,372 +1 @@ -import { expect, test, testWithHydration } from './fixtures' - -test.describe('Client-side navigation between all routes', () => { - test.beforeEach(async ({ page }) => { - // Start from home page - await page.goto('/') - await page.waitForLoadState('networkidle') - }) - - test('home -> sync-only -> home works', async ({ page }) => { - // Navigate to sync-only - await page - .getByRole('navigation') - .getByRole('link', { name: 'Sync Only' }) - .click() - await expect(page).toHaveURL('/sync-only') - await expect(page.getByTestId('sync-message')).toBeVisible() - - // Navigate back to home - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - await expect(page.getByTestId('index-title')).toBeVisible() - }) - - test('home -> deferred -> home works', async ({ page }) => { - // Navigate to deferred (use exact: true to avoid matching "Nested Deferred") - await page - .getByRole('navigation') - .getByRole('link', { name: 'Deferred', exact: true }) - .click() - await expect(page).toHaveURL('/deferred') - await expect(page.getByTestId('immediate-data')).toBeVisible() - - // Wait for deferred data - await expect(page.getByTestId('deferred-data')).toBeVisible({ - timeout: 5000, - }) - - // Navigate back to home - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) - - test('home -> stream -> home works (no stream locking error)', async ({ - page, - }) => { - // This test specifically validates the ReadableStream locking fix - // Console errors are monitored by the fixture automatically - - // Navigate to stream - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - - // Wait for stream to start (at least one chunk or promise resolved) - await expect(page.getByTestId('promise-data')).toBeVisible({ - timeout: 5000, - }) - - // Navigate back to home before stream completes - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) - - test('home -> stream -> wait for completion -> home works', async ({ - page, - }) => { - // Navigate to stream - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - - // Wait for stream to complete - await expect(page.getByTestId('stream-complete')).toBeVisible({ - timeout: 10000, - }) - - // Navigate back to home - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - await expect(page.getByTestId('index-title')).toBeVisible() - }) - - test('home -> stream -> home -> stream again works (fresh stream each time)', async ({ - page, - }) => { - // Console errors are monitored by the fixture automatically - - // First navigation to stream - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - await expect(page.getByTestId('promise-data')).toBeVisible({ - timeout: 5000, - }) - - // Navigate back to home - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - - // Second navigation to stream - should get fresh stream without errors - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - - // Wait for stream to complete - await expect(page.getByTestId('stream-complete')).toBeVisible({ - timeout: 10000, - }) - - // Verify all chunks are present - await expect(page.getByTestId('stream-chunk-0')).toBeVisible() - await expect(page.getByTestId('stream-chunk-4')).toBeVisible() - }) - - test('home -> fast-serial -> home works', async ({ page }) => { - await page - .getByRole('navigation') - .getByRole('link', { name: 'Fast Serial' }) - .click() - await expect(page).toHaveURL('/fast-serial') - await expect(page.getByTestId('server-data')).toBeVisible() - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) - - test('home -> slow-render -> home works', async ({ page }) => { - await page - .getByRole('navigation') - .getByRole('link', { name: 'Slow Render' }) - .click() - await expect(page).toHaveURL('/slow-render') - await expect(page.getByTestId('quick-data')).toBeVisible() - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) - - test('home -> nested-deferred -> home works', async ({ page }) => { - await page - .getByRole('navigation') - .getByRole('link', { name: 'Nested Deferred' }) - .click() - await expect(page).toHaveURL('/nested-deferred') - - // Wait for all levels to load - await expect(page.getByTestId('level3-data')).toBeVisible({ timeout: 5000 }) - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) - - test('rapid navigation between routes works', async ({ page }) => { - // Console errors are monitored by the fixture automatically - - // Rapid navigation sequence - await page - .getByRole('navigation') - .getByRole('link', { name: 'Sync Only' }) - .click() - await expect(page).toHaveURL('/sync-only') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Deferred', exact: true }) - .click() - await expect(page).toHaveURL('/deferred') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Fast Serial' }) - .click() - await expect(page).toHaveURL('/fast-serial') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Slow Render' }) - .click() - await expect(page).toHaveURL('/slow-render') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Nested Deferred' }) - .click() - await expect(page).toHaveURL('/nested-deferred') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) -}) - -test.describe('Direct navigation followed by client navigation', () => { - test('direct to stream -> client nav to deferred works', async ({ page }) => { - // Direct navigation to stream - await page.goto('/stream') - await expect(page.getByTestId('promise-data')).toBeVisible({ - timeout: 5000, - }) - - // Client navigation to deferred (use exact: true) - await page - .getByRole('navigation') - .getByRole('link', { name: 'Deferred', exact: true }) - .click() - await expect(page).toHaveURL('/deferred') - await expect(page.getByTestId('immediate-data')).toBeVisible() - }) - - test('direct to deferred -> client nav to stream works', async ({ page }) => { - // Console errors are monitored by the fixture automatically - - // Direct navigation to deferred - await page.goto('/deferred') - await expect(page.getByTestId('immediate-data')).toBeVisible() - - // Client navigation to stream - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - await expect(page.getByTestId('stream-complete')).toBeVisible({ - timeout: 10000, - }) - }) - - test('direct to sync-only -> client nav to all routes works', async ({ - page, - }) => { - await page.goto('/sync-only') - await expect(page.getByTestId('sync-message')).toBeVisible() - - // Navigate through all routes - await page - .getByRole('navigation') - .getByRole('link', { name: 'Deferred', exact: true }) - .click() - await expect(page).toHaveURL('/deferred') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Fast Serial' }) - .click() - await expect(page).toHaveURL('/fast-serial') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) -}) - -testWithHydration.describe('Hydration after client navigation', () => { - testWithHydration( - 'interactive elements work after navigating to deferred', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Deferred', exact: true }) - .click() - await expect(page).toHaveURL('/deferred') - - // Wait for the page to be fully loaded - await expect(page.getByTestId('immediate-data')).toBeVisible() - }, - ) - - testWithHydration( - 'interactive elements work after navigating to fast-serial', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Fast Serial' }) - .click() - await expect(page).toHaveURL('/fast-serial') - - // Wait for page to load - await expect(page.getByTestId('server-data')).toBeVisible() - }, - ) - - testWithHydration( - 'interactive elements work after navigating to nested-deferred', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Nested Deferred' }) - .click() - await expect(page).toHaveURL('/nested-deferred') - - // Wait for page to load - await expect(page.getByTestId('plain-deferred')).toBeVisible({ - timeout: 5000, - }) - }, - ) - - testWithHydration( - 'interactive elements work after navigating to slow-render', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Slow Render' }) - .click() - await expect(page).toHaveURL('/slow-render') - - // Wait for page to load (slow-render has blocking loops) - await expect(page.getByTestId('quick-data')).toBeVisible() - }, - ) -}) +import '../../../streaming-ssr-specs/client-navigation' diff --git a/e2e/react-start/streaming-ssr/tests/concurrent.spec.ts b/e2e/react-start/streaming-ssr/tests/concurrent.spec.ts index 10e32c6809..8625473a58 100644 --- a/e2e/react-start/streaming-ssr/tests/concurrent.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/concurrent.spec.ts @@ -1,100 +1 @@ -import { expect, test, testWithHydration } from './fixtures' - -test.describe('Concurrent promise resolution (15 promises in 3 batches)', () => { - test('all concurrent promises resolve correctly', async ({ page }) => { - await page.goto('/concurrent') - - // Batch 1 (5 promises at 100ms) - await expect(page.getByTestId('concurrent-1-1')).toContainText( - 'concurrent-1', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-1-2')).toContainText( - 'concurrent-2', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-1-3')).toContainText( - 'concurrent-3', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-1-4')).toContainText( - 'concurrent-4', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-1-5')).toContainText( - 'concurrent-5', - { timeout: 5000 }, - ) - - // Batch 2 (5 promises at 200ms) - await expect(page.getByTestId('concurrent-2-1')).toContainText( - 'concurrent-1', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-2-2')).toContainText( - 'concurrent-2', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-2-3')).toContainText( - 'concurrent-3', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-2-4')).toContainText( - 'concurrent-4', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-2-5')).toContainText( - 'concurrent-5', - { timeout: 5000 }, - ) - - // Batch 3 (5 promises at 300ms) - await expect(page.getByTestId('concurrent-3-1')).toContainText( - 'concurrent-1', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-3-2')).toContainText( - 'concurrent-2', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-3-3')).toContainText( - 'concurrent-3', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-3-4')).toContainText( - 'concurrent-4', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-3-5')).toContainText( - 'concurrent-5', - { timeout: 5000 }, - ) - }) - - test('batch 1 resolves before batch 3', async ({ page }) => { - await page.goto('/concurrent', { waitUntil: 'commit' }) - - // Batch 1 should be visible before batch 3 - await expect(page.getByTestId('concurrent-1-1')).toBeVisible({ - timeout: 3000, - }) - - // Eventually batch 3 should also be visible - await expect(page.getByTestId('concurrent-3-5')).toBeVisible({ - timeout: 5000, - }) - }) - - testWithHydration( - 'hydration works with concurrent resolutions', - async ({ page }) => { - await page.goto('/concurrent') - await page.waitForLoadState('networkidle') - - // Wait for all batches - await expect(page.getByTestId('concurrent-3-5')).toBeVisible({ - timeout: 5000, - }) - }, - ) -}) +import '../../../streaming-ssr-specs/concurrent' diff --git a/e2e/react-start/streaming-ssr/tests/deferred-rejection.spec.ts b/e2e/react-start/streaming-ssr/tests/deferred-rejection.spec.ts index 3b8144072c..355b5019bc 100644 --- a/e2e/react-start/streaming-ssr/tests/deferred-rejection.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/deferred-rejection.spec.ts @@ -1,21 +1 @@ -import { expect, test } from './fixtures' - -test.use({ - whitelistErrors: ['Error in deferred object'], -}) - -test('rejected deferred Await renders the route error boundary without killing SSR', async ({ - page, -}) => { - await page.goto('/deferred-rejection') - - await expect(page.getByTestId('deferred-error-boundary')).toContainText( - 'Error in deferred object', - { timeout: 5000 }, - ) - - await page.goto('/sync-only') - await expect(page.getByTestId('sync-message')).toContainText( - 'Hello from sync loader!', - ) -}) +import '../../../streaming-ssr-specs/deferred-rejection' diff --git a/e2e/react-start/streaming-ssr/tests/deferred.spec.ts b/e2e/react-start/streaming-ssr/tests/deferred.spec.ts index 90ee16edc0..3145897d7b 100644 --- a/e2e/react-start/streaming-ssr/tests/deferred.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/deferred.spec.ts @@ -1,120 +1 @@ -import { expect, test, testWithHydration } from './fixtures' - -test.describe('Deferred data streaming', () => { - test('shows immediate data right away and deferred data after loading', async ({ - page, - }) => { - await page.goto('/deferred') - - // Immediate data should be available right away - await expect(page.getByTestId('immediate-data')).toBeVisible() - await expect(page.getByTestId('immediate-data')).toContainText( - 'Immediate: Fast User', - ) - - // Verify immediate data came from server - await expect(page.getByTestId('immediate-source')).toContainText( - 'Immediate source: server', - ) - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - - // Deferred data should eventually appear with server source - await expect(page.getByTestId('deferred-data')).toContainText( - 'Deferred data loaded!', - { timeout: 5000 }, - ) - await expect(page.getByTestId('deferred-data')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('deferred-server-data')).toContainText( - 'Server: Slow User', - { timeout: 5000 }, - ) - await expect(page.getByTestId('deferred-server-data')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - }) - - test('shows loading states for deferred content', async ({ page }) => { - // Navigate with cache disabled to ensure fresh load - await page.goto('/deferred', { waitUntil: 'commit' }) - - // Should see loading states initially (may be very brief) - // We check that deferred content eventually shows - await expect(page.getByTestId('deferred-data')).toBeVisible({ - timeout: 5000, - }) - await expect(page.getByTestId('deferred-server-data')).toBeVisible({ - timeout: 5000, - }) - }) - - testWithHydration( - 'hydration works - interactive elements respond', - async ({ page }) => { - await page.goto('/deferred') - await page.waitForLoadState('networkidle') - - // Wait for all deferred content to load - await expect(page.getByTestId('deferred-data')).toBeVisible({ - timeout: 5000, - }) - - // Verify all data came from server after hydration - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - await expect(page.getByTestId('deferred-data')).toContainText( - 'source: server', - ) - }, - ) - - test('client-side navigation to deferred route works', async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via client-side routing using nav link - await page.getByRole('link', { name: 'Deferred' }).first().click() - await expect(page).toHaveURL('/deferred') - - // Data should load - await expect(page.getByTestId('immediate-data')).toContainText('Fast User') - await expect(page.getByTestId('deferred-data')).toContainText( - 'Deferred data loaded!', - { timeout: 5000 }, - ) - }) - - test('all data sources are server - proves SSR streaming works', async ({ - page, - }) => { - await page.goto('/deferred') - - // Wait for all deferred content - await expect(page.getByTestId('deferred-data')).toBeVisible({ - timeout: 5000, - }) - await expect(page.getByTestId('deferred-server-data')).toBeVisible({ - timeout: 5000, - }) - - // Count all elements showing 'server' source - should be 4: - // 1. immediate-source - // 2. loader-source - // 3. deferred-data (contains "source: server") - // 4. deferred-server-data (contains "source: server") - await expect(page.getByTestId('immediate-source')).toContainText('server') - await expect(page.getByTestId('loader-source')).toContainText('server') - await expect(page.getByTestId('deferred-data')).toContainText( - 'source: server', - ) - await expect(page.getByTestId('deferred-server-data')).toContainText( - 'source: server', - ) - }) -}) +import '../../../streaming-ssr-specs/deferred' diff --git a/e2e/react-start/streaming-ssr/tests/fast-serial.spec.ts b/e2e/react-start/streaming-ssr/tests/fast-serial.spec.ts index 339d6408ea..95df0555e2 100644 --- a/e2e/react-start/streaming-ssr/tests/fast-serial.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/fast-serial.spec.ts @@ -1,72 +1 @@ -import { expect, test, testWithHydration } from './fixtures' - -test.describe('Fast serialization (serialization completes before render)', () => { - test('initial HTML contains router bootstrap + barrier', async ({ page }) => { - let responseHtml = '' - await page.route('/fast-serial', async (route) => { - const response = await route.fetch() - responseHtml = await response.text() - await route.fulfill({ response }) - }) - - await page.goto('/fast-serial') - await expect(page.getByTestId('server-data')).toBeVisible() - - expect(responseHtml).toContain('$_TSR') - expect(responseHtml).toContain('$_TSR.router') - expect(responseHtml).toContain('$_TSR.e()') - expect(responseHtml).toContain('$tsr-stream-barrier') - }) - - test('all data is available immediately', async ({ page }) => { - await page.goto('/fast-serial') - await page.waitForLoadState('networkidle') - - // All data should be visible - await expect(page.getByTestId('server-data')).toContainText('small-data') - await expect(page.getByTestId('static-data')).toContainText( - 'This is static data', - ) - await expect(page.getByTestId('loader-timestamp')).toBeVisible() - - // Verify data came from server (proves SSR streaming worked) - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - await expect(page.getByTestId('server-fn-source')).toContainText( - 'Server function source: server', - ) - }) - - testWithHydration('hydration works correctly', async ({ page }) => { - await page.goto('/fast-serial') - await page.waitForLoadState('networkidle') - - // Verify data came from server after hydration - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - }) - - test('direct navigation renders correctly', async ({ page }) => { - // Direct navigation (SSR) - await page.goto('/fast-serial') - - // Should render without errors and show server source - await expect(page.getByTestId('server-data')).toBeVisible() - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - }) - - test('client-side navigation works', async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via nav link - await page.getByRole('link', { name: 'Fast Serial' }).first().click() - await expect(page).toHaveURL('/fast-serial') - - await expect(page.getByTestId('server-data')).toContainText('small-data') - }) -}) +import '../../../streaming-ssr-specs/fast-serial' diff --git a/e2e/react-start/streaming-ssr/tests/fixtures.ts b/e2e/react-start/streaming-ssr/tests/fixtures.ts deleted file mode 100644 index 71c564aebe..0000000000 --- a/e2e/react-start/streaming-ssr/tests/fixtures.ts +++ /dev/null @@ -1,90 +0,0 @@ -import { test as base, expect, type Page } from '@playwright/test' - -/** - * Verifies that React hydration has completed by clicking the global - * hydration check button and verifying the status changes. - * - * This is the canonical way to verify hydration in streaming-ssr tests. - * The HydrationCheck component is rendered in the root layout (__root.tsx). - * - * The function retries clicking until the status changes to 'hydrated', - * which handles the case where the button is visible from SSR before - * React has finished hydrating. - */ -async function verifyHydration( - page: Page, - options: { timeout?: number } = {}, -): Promise { - const timeout = options.timeout ?? 10000 - const button = page.getByTestId('hydration-check-btn') - const status = page.getByTestId('hydration-status') - - // Ensure the button is visible - await expect(button).toBeVisible() - - // Retry clicking until hydration succeeds - // This handles the case where SSR renders the button before React hydrates - await expect(async () => { - // Click the button to trigger hydration verification - await button.click() - - // Check if the status changed to 'hydrated' - await expect(status).toHaveText('hydrated', { timeout: 100 }) - }).toPass({ timeout }) -} - -export interface StreamingSsrOptions { - /** - * List of error message patterns to ignore in console output. - */ - whitelistErrors: Array -} - -/** - * Base test fixture for streaming-ssr e2e tests. - * Provides console error monitoring. - */ -export const test = base.extend({ - whitelistErrors: [[], { option: true }], - - page: async ({ page, whitelistErrors }, use) => { - const errorMessages: Array = [] - - page.on('console', (m) => { - if (m.type() === 'error') { - const text = m.text() - for (const whitelistError of whitelistErrors) { - if ( - (typeof whitelistError === 'string' && - text.includes(whitelistError)) || - (whitelistError instanceof RegExp && whitelistError.test(text)) - ) { - return - } - } - errorMessages.push(text) - } - }) - - await use(page) - - // Assert no unexpected console errors - expect(errorMessages).toEqual([]) - }, -}) - -/** - * Extended test fixture that automatically verifies hydration at the end. - * Use this for tests where you want to confirm React hydration succeeded. - */ -export const testWithHydration = test.extend({ - page: async ({ page }, use) => { - await use(page) - - // Automatically verify hydration at the end of the test - await verifyHydration(page) - }, -}) - -// Re-export expect for convenience -export { expect } diff --git a/e2e/react-start/streaming-ssr/tests/home.spec.ts b/e2e/react-start/streaming-ssr/tests/home.spec.ts index e231d007fb..5d49d34a56 100644 --- a/e2e/react-start/streaming-ssr/tests/home.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/home.spec.ts @@ -1,34 +1 @@ -import { expect, test, testWithHydration } from './fixtures' - -test.describe('Home page', () => { - testWithHydration( - 'renders index page with all navigation links', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - await expect(page.getByTestId('index-title')).toContainText( - 'Streaming SSR Test Scenarios', - ) - // Check links exist (they're in the nav and the body) - await expect( - page.getByRole('link', { name: 'Deferred' }).first(), - ).toBeVisible() - await expect( - page.getByRole('link', { name: 'Stream' }).first(), - ).toBeVisible() - }, - ) - - testWithHydration( - 'navigation from home to routes works', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Use the link in the content (not nav) - await page.getByTestId('link-deferred').click() - await expect(page).toHaveURL('/deferred') - }, - ) -}) +import '../../../streaming-ssr-specs/home' diff --git a/e2e/react-start/streaming-ssr/tests/many-promises.spec.ts b/e2e/react-start/streaming-ssr/tests/many-promises.spec.ts index 034ab74220..b747bd7d0a 100644 --- a/e2e/react-start/streaming-ssr/tests/many-promises.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/many-promises.spec.ts @@ -1,93 +1 @@ -import { expect, test, testWithHydration } from './fixtures' - -test.describe('Many promises streaming (15 deferred)', () => { - test('all 15 promises eventually resolve', async ({ page }) => { - await page.goto('/many-promises') - - // Immediate group (0-20ms) - await expect(page.getByTestId('immediate-1')).toContainText('immediate-1', { - timeout: 5000, - }) - await expect(page.getByTestId('immediate-2')).toContainText('immediate-2', { - timeout: 5000, - }) - await expect(page.getByTestId('immediate-3')).toContainText('immediate-3', { - timeout: 5000, - }) - - // Fast group (50-125ms) - await expect(page.getByTestId('fast-1')).toContainText('fast-1', { - timeout: 5000, - }) - await expect(page.getByTestId('fast-2')).toContainText('fast-2', { - timeout: 5000, - }) - await expect(page.getByTestId('fast-3')).toContainText('fast-3', { - timeout: 5000, - }) - await expect(page.getByTestId('fast-4')).toContainText('fast-4', { - timeout: 5000, - }) - - // Medium group (150-250ms) - await expect(page.getByTestId('medium-1')).toContainText('medium-1', { - timeout: 5000, - }) - await expect(page.getByTestId('medium-2')).toContainText('medium-2', { - timeout: 5000, - }) - await expect(page.getByTestId('medium-3')).toContainText('medium-3', { - timeout: 5000, - }) - - // Slow group (300-500ms) - await expect(page.getByTestId('slow-1')).toContainText('slow-1', { - timeout: 5000, - }) - await expect(page.getByTestId('slow-2')).toContainText('slow-2', { - timeout: 5000, - }) - await expect(page.getByTestId('slow-3')).toContainText('slow-3', { - timeout: 5000, - }) - - // Very slow group (600-800ms) - await expect(page.getByTestId('very-slow-1')).toContainText('very-slow-1', { - timeout: 5000, - }) - await expect(page.getByTestId('very-slow-2')).toContainText('very-slow-2', { - timeout: 5000, - }) - }) - - testWithHydration('hydration works with many promises', async ({ page }) => { - await page.goto('/many-promises') - await page.waitForLoadState('networkidle') - - // Wait for all promises to resolve - await expect(page.getByTestId('very-slow-2')).toBeVisible({ timeout: 5000 }) - }) - - test('client-side navigation works', async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via nav link - await page.getByRole('link', { name: 'Many Promises' }).click() - await expect(page).toHaveURL('/many-promises') - - // All promises should eventually resolve - await expect(page.getByTestId('very-slow-2')).toBeVisible({ timeout: 5000 }) - }) - - test('fast promises resolve before slow ones', async ({ page }) => { - // Navigate and check ordering - faster promises should be visible first - await page.goto('/many-promises', { waitUntil: 'commit' }) - - // Immediate promises should appear first - await expect(page.getByTestId('immediate-1')).toBeVisible({ timeout: 2000 }) - - // By the time we check very-slow, all should be visible - await expect(page.getByTestId('very-slow-2')).toBeVisible({ timeout: 5000 }) - }) -}) +import '../../../streaming-ssr-specs/many-promises' diff --git a/e2e/react-start/streaming-ssr/tests/nested-deferred.spec.ts b/e2e/react-start/streaming-ssr/tests/nested-deferred.spec.ts index dbf6df4265..8df20a8a95 100644 --- a/e2e/react-start/streaming-ssr/tests/nested-deferred.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/nested-deferred.spec.ts @@ -1,77 +1 @@ -import { expect, test, testWithHydration } from './fixtures' - -test.describe('Nested deferred (multiple levels of deferred data)', () => { - test('all levels of deferred data eventually resolve', async ({ page }) => { - await page.goto('/nested-deferred') - - // Plain deferred should resolve first (300ms) - await expect(page.getByTestId('plain-deferred')).toContainText( - 'Plain deferred resolved!', - { timeout: 5000 }, - ) - - // Level 1 should resolve (200ms) - await expect(page.getByTestId('level1-data')).toContainText('Level 1:', { - timeout: 5000, - }) - - // Level 2 should resolve (400ms) - await expect(page.getByTestId('level2-data')).toContainText('Level 2:', { - timeout: 5000, - }) - - // Level 3 should resolve (600ms) - await expect(page.getByTestId('level3-data')).toContainText('Level 3:', { - timeout: 5000, - }) - }) - - test('shows loading states while data is loading', async ({ page }) => { - // Use fast navigation to catch loading states - await page.goto('/nested-deferred', { waitUntil: 'commit' }) - - // Eventually all data should be visible - await expect(page.getByTestId('level3-data')).toBeVisible({ - timeout: 10000, - }) - }) - - testWithHydration( - 'hydration works with nested deferred', - async ({ page }) => { - await page.goto('/nested-deferred') - await page.waitForLoadState('networkidle') - - // Wait for all data - await expect(page.getByTestId('level3-data')).toBeVisible({ - timeout: 10000, - }) - }, - ) - - test('client-side navigation works', async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via nav link - await page.getByRole('link', { name: 'Nested Deferred' }).first().click() - await expect(page).toHaveURL('/nested-deferred') - - // All levels should eventually render - await expect(page.getByTestId('level3-data')).toBeVisible({ - timeout: 10000, - }) - }) - - test('data resolves in expected order (fastest first)', async ({ page }) => { - await page.goto('/nested-deferred') - - // Wait for all to be visible - await expect(page.getByTestId('level1-data')).toBeVisible({ timeout: 5000 }) - await expect(page.getByTestId('level2-data')).toBeVisible({ timeout: 5000 }) - await expect(page.getByTestId('level3-data')).toBeVisible({ timeout: 5000 }) - await expect(page.getByTestId('plain-deferred')).toBeVisible({ - timeout: 5000, - }) - }) -}) +import '../../../streaming-ssr-specs/nested-deferred' diff --git a/e2e/react-start/streaming-ssr/tests/preview-streaming.spec.ts b/e2e/react-start/streaming-ssr/tests/preview-streaming.spec.ts index 319219c519..34241cfbaa 100644 --- a/e2e/react-start/streaming-ssr/tests/preview-streaming.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/preview-streaming.spec.ts @@ -1,21 +1 @@ -import { expect, test } from './fixtures' - -test('vite preview streams HTML incrementally', async ({ page }) => { - // /deferred has immediate data + deferred data with a ~1s delay. - // Without streaming, compression buffers the entire response. - await page.goto('/deferred', { waitUntil: 'commit' }) - - // Immediate data should arrive in the first chunk - await expect(page.getByTestId('immediate-data')).toBeVisible({ - timeout: 3000, - }) - - // Deferred data (1s delay) should still be loading at this point - await expect(page.getByTestId('deferred-loading')).toBeVisible() - - // Wait for it to resolve - await expect(page.getByTestId('deferred-data')).toContainText( - 'Deferred data loaded!', - { timeout: 5000 }, - ) -}) +import '../../../streaming-ssr-specs/preview-streaming' diff --git a/e2e/react-start/streaming-ssr/tests/query-heavy.spec.ts b/e2e/react-start/streaming-ssr/tests/query-heavy.spec.ts index 8e735040c2..e0d617106c 100644 --- a/e2e/react-start/streaming-ssr/tests/query-heavy.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/query-heavy.spec.ts @@ -1,168 +1,18 @@ -import { expect, test, testWithHydration } from './fixtures' +import '../../../streaming-ssr-specs/query-heavy' +import { expect, test } from '../../../streaming-ssr-assertions' -test.describe('Query heavy route (9 useSuspenseQuery)', () => { - test('all queries resolve with server data', async ({ page }) => { - await page.goto('/query-heavy') +test('batches same-turn queries into one stream chunk', async ({ request }) => { + const response = await request.get('/query-heavy') + const html = await response.text() + const scripts = Array.from( + html.matchAll(/]*>([\s\S]*?)<\/script>/g), + (match) => match[1]!, + ) + const syncQueryChunk = scripts.find((script) => + script.includes('sync-value-1'), + ) - // Sync queries should show server source - await expect(page.getByTestId('sync-query-1')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('sync-query-2')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('sync-query-3')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - - // Fast async queries should show server source - await expect(page.getByTestId('fast-async-query-1')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('fast-async-query-2')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('fast-async-query-3')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - - // Slow async queries should show server source - await expect(page.getByTestId('slow-async-query-1')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('slow-async-query-2')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('slow-async-query-3')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - }) - - test('sync queries have correct values', async ({ page }) => { - await page.goto('/query-heavy') - - await expect(page.getByTestId('sync-query-1')).toContainText('sync-value-1') - await expect(page.getByTestId('sync-query-2')).toContainText('sync-value-2') - await expect(page.getByTestId('sync-query-3')).toContainText('sync-value-3') - }) - - test('async queries have correct values', async ({ page }) => { - await page.goto('/query-heavy') - - await expect(page.getByTestId('fast-async-query-1')).toContainText( - 'fast-async-1', - { timeout: 5000 }, - ) - await expect(page.getByTestId('fast-async-query-2')).toContainText( - 'fast-async-2', - { timeout: 5000 }, - ) - await expect(page.getByTestId('fast-async-query-3')).toContainText( - 'fast-async-3', - { timeout: 5000 }, - ) - - await expect(page.getByTestId('slow-async-query-1')).toContainText( - 'slow-async-1', - { timeout: 5000 }, - ) - await expect(page.getByTestId('slow-async-query-2')).toContainText( - 'slow-async-2', - { timeout: 5000 }, - ) - await expect(page.getByTestId('slow-async-query-3')).toContainText( - 'slow-async-3', - { timeout: 5000 }, - ) - }) - - testWithHydration('hydration works with many queries', async ({ page }) => { - await page.goto('/query-heavy') - await page.waitForLoadState('networkidle') - - // Wait for all queries to resolve - await expect(page.getByTestId('slow-async-query-3')).toBeVisible({ - timeout: 5000, - }) - }) - - test('client-side navigation works', async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via nav link - await page.getByRole('link', { name: 'Query Heavy' }).click() - await expect(page).toHaveURL('/query-heavy') - - // All queries should eventually resolve (on client) - await expect(page.getByTestId('slow-async-query-3')).toBeVisible({ - timeout: 5000, - }) - }) - - test('no hydration mismatch - queries streamed from server', async ({ - page, - }) => { - // This test verifies that query data is streamed from server - // If it wasn't, the queries would re-execute on client and show 'client' as source - await page.goto('/query-heavy') - - // Wait for all queries - await expect(page.getByTestId('slow-async-query-3')).toBeVisible({ - timeout: 5000, - }) - - // Verify all show 'server' - this proves data was streamed, not re-fetched - const serverSourceCount = await page - .locator('[data-testid*="query-"]') - .filter({ hasText: 'source: server' }) - .count() - expect(serverSourceCount).toBe(9) - }) - - test('emits query stream data before stream end marker', async ({ - request, - }) => { - const response = await request.get('/query-heavy') - const html = await response.text() - const endMarker = '$_TSR.e()' - const endIndex = html.indexOf(endMarker) - const slowAsyncPayloadIndex = html.indexOf('"slow-async-3"') - const lastScriptOpen = html.lastIndexOf('', endIndex) - - expect(endIndex).toBeGreaterThan(-1) - expect(lastScriptOpen).toBeGreaterThan(lastScriptClose) - expect(slowAsyncPayloadIndex).toBeGreaterThan(-1) - expect(slowAsyncPayloadIndex).toBeLessThan(endIndex) - expect(html.slice(lastScriptOpen, endIndex)).toContain('.return(void 0)') - expect(endIndex).toBeLessThan(html.indexOf('')) - }) - - test('batches same-turn queries into one stream chunk', async ({ - request, - }) => { - const response = await request.get('/query-heavy') - const html = await response.text() - const scripts = Array.from( - html.matchAll(/]*>([\s\S]*?)<\/script>/g), - (match) => match[1]!, - ) - const syncQueryChunk = scripts.find( - (script) => script.includes('.next(') && script.includes('sync-value-1'), - ) - - expect(syncQueryChunk).toBeDefined() - expect(syncQueryChunk).toContain('sync-value-2') - expect(syncQueryChunk).toContain('sync-value-3') - }) + expect(syncQueryChunk).toBeDefined() + expect(syncQueryChunk).toContain('sync-value-2') + expect(syncQueryChunk).toContain('sync-value-3') }) diff --git a/e2e/react-start/streaming-ssr/tests/router-html-buffer.spec.ts b/e2e/react-start/streaming-ssr/tests/router-html-buffer.spec.ts new file mode 100644 index 0000000000..a9cf8a8142 --- /dev/null +++ b/e2e/react-start/streaming-ssr/tests/router-html-buffer.spec.ts @@ -0,0 +1,34 @@ +import { + STREAM_PART_SELECTOR, + expect, + test, + testWithHydration, +} from '../../../streaming-ssr-assertions' + +const runBufferReproduction = + process.env.RUN_SSR_ROUTER_HTML_BUFFER_REPRO === 'true' + +test.describe('SSR router HTML buffer', () => { + test.skip( + !runBufferReproduction, + 'The 17 MiB ASCII reproduction is intentionally opt-in: pnpm test:e2e:buffer-repro', + ) + + testWithHydration( + 'hydrates a large deferred loader payload from server state', + async ({ page }) => { + const response = await page.goto('/router-html-buffer') + + expect(response?.ok()).toBe(true) + await expect(page.getByTestId('router-html-payload-length')).toHaveText( + '17825792', + ) + await expect(page.locator(STREAM_PART_SELECTOR)).toHaveCount(0) + + await page.getByTestId('router-html-payload-check').click() + await expect(page.getByTestId('router-html-payload-result')).toHaveText( + 'server:17825792:x', + ) + }, + ) +}) diff --git a/e2e/react-start/streaming-ssr/tests/slow-render.spec.ts b/e2e/react-start/streaming-ssr/tests/slow-render.spec.ts index c3631a7fc0..0d5a87363f 100644 --- a/e2e/react-start/streaming-ssr/tests/slow-render.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/slow-render.spec.ts @@ -1,73 +1 @@ -import { expect, test, testWithHydration } from './fixtures' - -test.describe('Slow render (render takes longer than serialization)', () => { - test('all data eventually renders with server source', async ({ page }) => { - await page.goto('/slow-render') - await page.waitForLoadState('networkidle') - - // Quick data should be available with server source - await expect(page.getByTestId('quick-data')).toContainText('Quick:') - await expect(page.getByTestId('quick-source')).toContainText( - 'Quick data source: server', - ) - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - - // Deferred data should resolve with server source - await expect(page.getByTestId('deferred-resolved')).toContainText( - 'Deferred resolved!', - { timeout: 5000 }, - ) - await expect(page.getByTestId('deferred-resolved')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - - // Slow components should have rendered - await expect(page.getByTestId('slow-component-1')).toBeVisible() - await expect(page.getByTestId('slow-component-2')).toBeVisible() - await expect(page.getByTestId('slow-component-3')).toBeVisible() - }) - - testWithHydration('hydration works after slow render', async ({ page }) => { - await page.goto('/slow-render') - await page.waitForLoadState('networkidle') - - // Wait for content and verify server source - await expect(page.getByTestId('slow-component-1')).toBeVisible() - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - }) - - test('client-side navigation works', async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via nav link - await page.getByRole('link', { name: 'Slow Render' }).first().click() - await expect(page).toHaveURL('/slow-render') - - await expect(page.getByTestId('quick-data')).toBeVisible({ timeout: 10000 }) - }) - - test('all data sources are server - proves SSR streaming works', async ({ - page, - }) => { - await page.goto('/slow-render') - await page.waitForLoadState('networkidle') - - // Wait for deferred content - await expect(page.getByTestId('deferred-resolved')).toBeVisible({ - timeout: 5000, - }) - - // Verify all sources are server - await expect(page.getByTestId('quick-source')).toContainText('server') - await expect(page.getByTestId('loader-source')).toContainText('server') - await expect(page.getByTestId('deferred-resolved')).toContainText( - 'source: server', - ) - }) -}) +import '../../../streaming-ssr-specs/slow-render' diff --git a/e2e/react-start/streaming-ssr/tests/stream.spec.ts b/e2e/react-start/streaming-ssr/tests/stream.spec.ts index 5e4c134f82..a51614f09a 100644 --- a/e2e/react-start/streaming-ssr/tests/stream.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/stream.spec.ts @@ -1,46 +1 @@ -import { expect, test, testWithHydration } from './fixtures' - -test.describe('ReadableStream streaming', () => { - testWithHydration('promise data resolves correctly', async ({ page }) => { - await page.goto('/stream') - - // Promise should resolve - await expect(page.getByTestId('promise-data')).toContainText( - 'promise-resolved', - { timeout: 5000 }, - ) - }) - - testWithHydration('stream chunks arrive incrementally', async ({ page }) => { - await page.goto('/stream') - - // Wait for stream to complete - await expect(page.getByTestId('stream-complete')).toBeVisible({ - timeout: 10000, - }) - - // All chunks should be present - await expect(page.getByTestId('stream-chunk-0')).toContainText('chunk-0') - await expect(page.getByTestId('stream-chunk-1')).toContainText('chunk-1') - await expect(page.getByTestId('stream-chunk-2')).toContainText('chunk-2') - await expect(page.getByTestId('stream-chunk-3')).toContainText('chunk-3') - await expect(page.getByTestId('stream-chunk-4')).toContainText('chunk-4') - }) - - testWithHydration( - 'client-side navigation to stream route works', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via nav link - await page.getByRole('link', { name: 'Stream' }).first().click() - await expect(page).toHaveURL('/stream') - - // Wait for stream to complete - await expect(page.getByTestId('stream-complete')).toBeVisible({ - timeout: 10000, - }) - }, - ) -}) +import '../../../streaming-ssr-specs/stream' diff --git a/e2e/react-start/streaming-ssr/tests/sync-only.spec.ts b/e2e/react-start/streaming-ssr/tests/sync-only.spec.ts index a0060a07ee..0e9278d3f2 100644 --- a/e2e/react-start/streaming-ssr/tests/sync-only.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/sync-only.spec.ts @@ -1,84 +1 @@ -import { expect } from '@playwright/test' -import { test, testWithHydration } from './fixtures' - -/** - * Tests for synchronous serialization - no deferred data, no streaming. - * This is the most common case where all loader data is immediately available. - * The hydration scripts should be included in the initial HTML response. - */ - -test('Sync-only route renders with loader data', async ({ page }) => { - await page.goto('/sync-only') - - // Verify the page content is rendered - await expect(page.getByTestId('sync-title')).toContainText( - 'Synchronous Serialization Test', - ) - await expect(page.getByTestId('sync-message')).toContainText( - 'Hello from sync loader!', - ) - - // Verify loader data items are rendered - await expect(page.getByTestId('sync-item-item-1')).toBeVisible() - await expect(page.getByTestId('sync-item-item-2')).toBeVisible() - await expect(page.getByTestId('sync-item-item-3')).toBeVisible() - - // Verify data came from server (proves SSR streaming worked) - await expect(page.getByTestId('sync-source')).toContainText('Source: server') -}) - -testWithHydration('Sync-only route hydrates correctly', async ({ page }) => { - await page.goto('/sync-only') - - // Verify client-side navigation works (proves hydration succeeded) - await page.getByRole('navigation').getByRole('link', { name: 'Home' }).click() - await expect(page.getByTestId('index-title')).toBeVisible() - - // Navigate back to sync-only via client-side navigation (use nav link to be specific) - await page - .getByRole('navigation') - .getByRole('link', { name: 'Sync Only' }) - .click() - await expect(page.getByTestId('sync-title')).toBeVisible() -}) - -test('Sync-only route has bootstrap scripts in initial HTML', async ({ - page, -}) => { - // Intercept the response to check the raw HTML - let responseHtml = '' - await page.route('/sync-only', async (route) => { - const response = await route.fetch() - responseHtml = await response.text() - await route.fulfill({ response }) - }) - - await page.goto('/sync-only') - - // Wait for page to load - await expect(page.getByTestId('sync-title')).toBeVisible() - - // The HTML should contain the bootstrap scripts - // $_TSR.router should be present (the dehydrated router state) - expect(responseHtml).toContain('$_TSR') - expect(responseHtml).toContain('$_TSR.router') - // The serialization end marker should be present - expect(responseHtml).toContain('$_TSR.e()') - - // SSR should include the barrier script tag in the HTML (rendered by ) - // This is the critical marker transformStreamWithRouter can scan for. - expect(responseHtml).toContain('$tsr-stream-barrier') -}) - -test('Navigating to sync-only from home page', async ({ page }) => { - await page.goto('/') - - await page.getByTestId('link-sync-only').click() - - await expect(page.getByTestId('sync-title')).toContainText( - 'Synchronous Serialization Test', - ) - await expect(page.getByTestId('sync-message')).toContainText( - 'Hello from sync loader!', - ) -}) +import '../../../streaming-ssr-specs/sync-only' diff --git a/e2e/react-start/streaming-ssr/vite.config.ts b/e2e/react-start/streaming-ssr/vite.config.ts index 275bfacde2..0590c197a5 100644 --- a/e2e/react-start/streaming-ssr/vite.config.ts +++ b/e2e/react-start/streaming-ssr/vite.config.ts @@ -1,9 +1,10 @@ import { defineConfig } from 'vite' import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import viteReact from '@vitejs/plugin-react' export default defineConfig({ server: { port: 3000, }, - plugins: [tanstackStart()], + plugins: [tanstackStart(), viteReact()], }) diff --git a/e2e/solid-start/streaming-ssr/package.json b/e2e/solid-start/streaming-ssr/package.json new file mode 100644 index 0000000000..61c1fc99a4 --- /dev/null +++ b/e2e/solid-start/streaming-ssr/package.json @@ -0,0 +1,59 @@ +{ + "name": "tanstack-solid-start-e2e-streaming-ssr", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "pnpx srvx --prod -s ../client dist/server/server.js", + "preview": "vite preview", + "test:e2e": "playwright test --project=chromium", + "test:e2e:preview": "MODE=preview playwright test preview-streaming.spec.ts --project=chromium" + }, + "dependencies": { + "@tanstack/solid-query": "^5.90.9", + "@tanstack/solid-router": "workspace:^", + "@tanstack/solid-router-ssr-query": "workspace:^", + "@tanstack/solid-start": "workspace:^", + "solid-js": "^1.9.10" + }, + "devDependencies": { + "@playwright/test": "^1.61.0", + "@tanstack/router-e2e-utils": "workspace:^", + "@types/node": "^22.10.2", + "srvx": "^0.11.9", + "@typescript/native": "npm:typescript@^7.0.2", + "typescript": "npm:@typescript/typescript6@^6.0.2", + "vite": "^8.0.14", + "vite-plugin-solid": "^2.11.11" + }, + "nx": { + "targets": { + "build": { + "inputs": [ + "buildProduction", + "^buildProduction", + "dependentTaskOutputs", + "streamingSsrTests" + ] + }, + "test:e2e": { + "inputs": [ + "default", + "^production", + "dependentTaskOutputs", + "streamingSsrTests" + ] + }, + "test:e2e:preview": { + "inputs": [ + "default", + "^production", + "streamingSsrTests" + ] + } + } + } +} diff --git a/e2e/solid-start/streaming-ssr/playwright.config.ts b/e2e/solid-start/streaming-ssr/playwright.config.ts new file mode 100644 index 0000000000..1987a5a1bd --- /dev/null +++ b/e2e/solid-start/streaming-ssr/playwright.config.ts @@ -0,0 +1,38 @@ +import { defineConfig, devices } from '@playwright/test' +import { appServerReady } from '@tanstack/router-e2e-utils' + +const isPreview = process.env.MODE === 'preview' + +const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const baseURL = `http://localhost:${PORT}` +const ssrCommand = `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start` +const previewCommand = `VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}` + +/** + * See https://playwright.dev/docs/test-configuration. + */ +export default defineConfig({ + testDir: './tests', + workers: 1, + + reporter: [['line']], + + use: { + /* Base URL to use in actions like `await page.goto('/')`. */ + baseURL, + }, + + webServer: { + command: isPreview ? previewCommand : ssrCommand, + wait: appServerReady, + reuseExistingServer: false, + stdout: 'pipe', + }, + + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/solid-start/streaming-ssr/src/routeTree.gen.ts b/e2e/solid-start/streaming-ssr/src/routeTree.gen.ts new file mode 100644 index 0000000000..7410f165ac --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routeTree.gen.ts @@ -0,0 +1,282 @@ +/* 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 IndexRouteImport } from './routes/index' +import { Route as ConcurrentRouteImport } from './routes/concurrent' +import { Route as DeferredRouteImport } from './routes/deferred' +import { Route as DeferredRejectionRouteImport } from './routes/deferred-rejection' +import { Route as FastSerialRouteImport } from './routes/fast-serial' +import { Route as ManyPromisesRouteImport } from './routes/many-promises' +import { Route as NestedDeferredRouteImport } from './routes/nested-deferred' +import { Route as QueryHeavyRouteImport } from './routes/query-heavy' +import { Route as SlowRenderRouteImport } from './routes/slow-render' +import { Route as StreamRouteImport } from './routes/stream' +import { Route as SyncOnlyRouteImport } from './routes/sync-only' + +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) +const ConcurrentRoute = ConcurrentRouteImport.update({ + id: '/concurrent', + path: '/concurrent', + getParentRoute: () => rootRouteImport, +} as any) +const DeferredRoute = DeferredRouteImport.update({ + id: '/deferred', + path: '/deferred', + getParentRoute: () => rootRouteImport, +} as any) +const DeferredRejectionRoute = DeferredRejectionRouteImport.update({ + id: '/deferred-rejection', + path: '/deferred-rejection', + getParentRoute: () => rootRouteImport, +} as any) +const FastSerialRoute = FastSerialRouteImport.update({ + id: '/fast-serial', + path: '/fast-serial', + getParentRoute: () => rootRouteImport, +} as any) +const ManyPromisesRoute = ManyPromisesRouteImport.update({ + id: '/many-promises', + path: '/many-promises', + getParentRoute: () => rootRouteImport, +} as any) +const NestedDeferredRoute = NestedDeferredRouteImport.update({ + id: '/nested-deferred', + path: '/nested-deferred', + getParentRoute: () => rootRouteImport, +} as any) +const QueryHeavyRoute = QueryHeavyRouteImport.update({ + id: '/query-heavy', + path: '/query-heavy', + getParentRoute: () => rootRouteImport, +} as any) +const SlowRenderRoute = SlowRenderRouteImport.update({ + id: '/slow-render', + path: '/slow-render', + getParentRoute: () => rootRouteImport, +} as any) +const StreamRoute = StreamRouteImport.update({ + id: '/stream', + path: '/stream', + getParentRoute: () => rootRouteImport, +} as any) +const SyncOnlyRoute = SyncOnlyRouteImport.update({ + id: '/sync-only', + path: '/sync-only', + getParentRoute: () => rootRouteImport, +} as any) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/concurrent': typeof ConcurrentRoute + '/deferred': typeof DeferredRoute + '/deferred-rejection': typeof DeferredRejectionRoute + '/fast-serial': typeof FastSerialRoute + '/many-promises': typeof ManyPromisesRoute + '/nested-deferred': typeof NestedDeferredRoute + '/query-heavy': typeof QueryHeavyRoute + '/slow-render': typeof SlowRenderRoute + '/stream': typeof StreamRoute + '/sync-only': typeof SyncOnlyRoute +} +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/concurrent': typeof ConcurrentRoute + '/deferred': typeof DeferredRoute + '/deferred-rejection': typeof DeferredRejectionRoute + '/fast-serial': typeof FastSerialRoute + '/many-promises': typeof ManyPromisesRoute + '/nested-deferred': typeof NestedDeferredRoute + '/query-heavy': typeof QueryHeavyRoute + '/slow-render': typeof SlowRenderRoute + '/stream': typeof StreamRoute + '/sync-only': typeof SyncOnlyRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/': typeof IndexRoute + '/concurrent': typeof ConcurrentRoute + '/deferred': typeof DeferredRoute + '/deferred-rejection': typeof DeferredRejectionRoute + '/fast-serial': typeof FastSerialRoute + '/many-promises': typeof ManyPromisesRoute + '/nested-deferred': typeof NestedDeferredRoute + '/query-heavy': typeof QueryHeavyRoute + '/slow-render': typeof SlowRenderRoute + '/stream': typeof StreamRoute + '/sync-only': typeof SyncOnlyRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/' + | '/concurrent' + | '/deferred' + | '/deferred-rejection' + | '/fast-serial' + | '/many-promises' + | '/nested-deferred' + | '/query-heavy' + | '/slow-render' + | '/stream' + | '/sync-only' + fileRoutesByTo: FileRoutesByTo + to: + | '/' + | '/concurrent' + | '/deferred' + | '/deferred-rejection' + | '/fast-serial' + | '/many-promises' + | '/nested-deferred' + | '/query-heavy' + | '/slow-render' + | '/stream' + | '/sync-only' + id: + | '__root__' + | '/' + | '/concurrent' + | '/deferred' + | '/deferred-rejection' + | '/fast-serial' + | '/many-promises' + | '/nested-deferred' + | '/query-heavy' + | '/slow-render' + | '/stream' + | '/sync-only' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + ConcurrentRoute: typeof ConcurrentRoute + DeferredRoute: typeof DeferredRoute + DeferredRejectionRoute: typeof DeferredRejectionRoute + FastSerialRoute: typeof FastSerialRoute + ManyPromisesRoute: typeof ManyPromisesRoute + NestedDeferredRoute: typeof NestedDeferredRoute + QueryHeavyRoute: typeof QueryHeavyRoute + SlowRenderRoute: typeof SlowRenderRoute + StreamRoute: typeof StreamRoute + SyncOnlyRoute: typeof SyncOnlyRoute +} + +declare module '@tanstack/solid-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + '/concurrent': { + id: '/concurrent' + path: '/concurrent' + fullPath: '/concurrent' + preLoaderRoute: typeof ConcurrentRouteImport + parentRoute: typeof rootRouteImport + } + '/deferred': { + id: '/deferred' + path: '/deferred' + fullPath: '/deferred' + preLoaderRoute: typeof DeferredRouteImport + parentRoute: typeof rootRouteImport + } + '/deferred-rejection': { + id: '/deferred-rejection' + path: '/deferred-rejection' + fullPath: '/deferred-rejection' + preLoaderRoute: typeof DeferredRejectionRouteImport + parentRoute: typeof rootRouteImport + } + '/fast-serial': { + id: '/fast-serial' + path: '/fast-serial' + fullPath: '/fast-serial' + preLoaderRoute: typeof FastSerialRouteImport + parentRoute: typeof rootRouteImport + } + '/many-promises': { + id: '/many-promises' + path: '/many-promises' + fullPath: '/many-promises' + preLoaderRoute: typeof ManyPromisesRouteImport + parentRoute: typeof rootRouteImport + } + '/nested-deferred': { + id: '/nested-deferred' + path: '/nested-deferred' + fullPath: '/nested-deferred' + preLoaderRoute: typeof NestedDeferredRouteImport + parentRoute: typeof rootRouteImport + } + '/query-heavy': { + id: '/query-heavy' + path: '/query-heavy' + fullPath: '/query-heavy' + preLoaderRoute: typeof QueryHeavyRouteImport + parentRoute: typeof rootRouteImport + } + '/slow-render': { + id: '/slow-render' + path: '/slow-render' + fullPath: '/slow-render' + preLoaderRoute: typeof SlowRenderRouteImport + parentRoute: typeof rootRouteImport + } + '/stream': { + id: '/stream' + path: '/stream' + fullPath: '/stream' + preLoaderRoute: typeof StreamRouteImport + parentRoute: typeof rootRouteImport + } + '/sync-only': { + id: '/sync-only' + path: '/sync-only' + fullPath: '/sync-only' + preLoaderRoute: typeof SyncOnlyRouteImport + parentRoute: typeof rootRouteImport + } + } +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + ConcurrentRoute: ConcurrentRoute, + DeferredRoute: DeferredRoute, + DeferredRejectionRoute: DeferredRejectionRoute, + FastSerialRoute: FastSerialRoute, + ManyPromisesRoute: ManyPromisesRoute, + NestedDeferredRoute: NestedDeferredRoute, + QueryHeavyRoute: QueryHeavyRoute, + SlowRenderRoute: SlowRenderRoute, + StreamRoute: StreamRoute, + SyncOnlyRoute: SyncOnlyRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +import type { getRouter } from './router.tsx' +import type { createStart } from '@tanstack/solid-start' +declare module '@tanstack/solid-start' { + interface Register { + ssr: true + router: Awaited> + } +} diff --git a/e2e/solid-start/streaming-ssr/src/router.tsx b/e2e/solid-start/streaming-ssr/src/router.tsx new file mode 100644 index 0000000000..9e84d8316d --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/router.tsx @@ -0,0 +1,18 @@ +import { QueryClient } from '@tanstack/solid-query' +import { createRouter } from '@tanstack/solid-router' +import { setupRouterSsrQueryIntegration } from '@tanstack/solid-router-ssr-query' +import { routeTree } from './routeTree.gen' + +export function getRouter() { + const queryClient = new QueryClient() + const router = createRouter({ + routeTree, + context: { queryClient }, + scrollRestoration: true, + }) + setupRouterSsrQueryIntegration({ + router, + queryClient, + }) + return router +} diff --git a/e2e/solid-start/streaming-ssr/src/routes/__root.tsx b/e2e/solid-start/streaming-ssr/src/routes/__root.tsx new file mode 100644 index 0000000000..6ddac9188e --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routes/__root.tsx @@ -0,0 +1,99 @@ +import { createSignal } from 'solid-js' +import { + HeadContent, + Link, + Outlet, + Scripts, + createRootRouteWithContext, +} from '@tanstack/solid-router' +import { HydrationScript } from 'solid-js/web' +import type { QueryClient } from '@tanstack/solid-query' + +export const Route = createRootRouteWithContext<{ + queryClient: QueryClient +}>()({ + head: () => ({ + meta: [ + { charSet: 'utf-8' }, + { name: 'viewport', content: 'width=device-width, initial-scale=1' }, + { title: 'Streaming SSR Tests' }, + ], + }), + component: RootComponent, +}) + +function RootComponent() { + return ( + + + + + + + + + + + + + ) +} + +function HydrationCheck() { + const [status, setStatus] = createSignal<'pending' | 'hydrated'>('pending') + + return ( +
+ + + {status()} + +
+ ) +} diff --git a/e2e/solid-start/streaming-ssr/src/routes/concurrent.tsx b/e2e/solid-start/streaming-ssr/src/routes/concurrent.tsx new file mode 100644 index 0000000000..5b8b488edc --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routes/concurrent.tsx @@ -0,0 +1,47 @@ +import { Await, createFileRoute } from '@tanstack/solid-router' +import { Suspense } from 'solid-js' +import { createConcurrentLoaderData } from '../../../../streaming-ssr-fixtures' + +export const Route = createFileRoute('/concurrent')({ + loader: async () => createConcurrentLoaderData(), + component: Concurrent, +}) + +function PromiseItem(props: { promise: Promise; testId: string }) { + return ( + Loading...
} + > +
{value}
} + /> + + ) +} + +function Concurrent() { + const data = Route.useLoaderData() + + return ( +
+

Concurrent Resolution Test (15 promises in 3 batches)

+

Tests multiple promises resolving at the exact same instant.

+ + + + + + + + + + + + + + + +
+ ) +} diff --git a/e2e/solid-start/streaming-ssr/src/routes/deferred-rejection.tsx b/e2e/solid-start/streaming-ssr/src/routes/deferred-rejection.tsx new file mode 100644 index 0000000000..927ce6ed67 --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routes/deferred-rejection.tsx @@ -0,0 +1,40 @@ +import { Await, createFileRoute } from '@tanstack/solid-router' +import { Suspense } from 'solid-js' +import { + deferredDataDelay, + deferredErrorMessage, +} from '../../../../streaming-ssr-fixtures' + +export const Route = createFileRoute('/deferred-rejection')({ + loader: async () => { + return { + deferredData: new Promise((_resolve, reject) => { + setTimeout(() => { + reject(new Error(deferredErrorMessage)) + }, deferredDataDelay) + }), + } + }, + errorComponent: ({ error }) => ( +
{error.message}
+ ), + component: DeferredRejection, +}) + +function DeferredRejection() { + const data = Route.useLoaderData() + + return ( +
+

Deferred Rejection Test

+ Loading deferred...
} + > +
{value}
} + /> + +
+ ) +} diff --git a/e2e/solid-start/streaming-ssr/src/routes/deferred.tsx b/e2e/solid-start/streaming-ssr/src/routes/deferred.tsx new file mode 100644 index 0000000000..f7e78ee15e --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routes/deferred.tsx @@ -0,0 +1,87 @@ +import { Await, createFileRoute } from '@tanstack/solid-router' +import { createServerFn } from '@tanstack/solid-start' +import { Suspense } from 'solid-js' +import { + deferredDataDelay, + deferredDataMessage, + deferredImmediateName, + deferredServerDelay, + deferredSlowName, + delay, + makeDeferredMessage, + makeServerData, + sourceMarker, +} from '../../../../streaming-ssr-fixtures' + +const getImmediateData = createServerFn({ method: 'GET' }) + .validator((data: { name: string }) => data) + .handler(({ data }) => makeServerData(data.name)) + +const getSlowData = createServerFn({ method: 'GET' }) + .validator((data: { name: string; delay: number }) => data) + .handler(async ({ data }) => { + await delay(data.delay) + return makeServerData(data.name) + }) + +export const Route = createFileRoute('/deferred')({ + loader: async () => { + return { + deferredData: makeDeferredMessage(deferredDataMessage, deferredDataDelay), + deferredServerData: getSlowData({ + data: { name: deferredSlowName, delay: deferredServerDelay }, + }), + immediateData: await getImmediateData({ + data: { name: deferredImmediateName }, + }), + loaderSource: sourceMarker(), + } + }, + component: Deferred, +}) + +function Deferred() { + const data = Route.useLoaderData() + + return ( +
+

Deferred Data Test

+
+ Immediate: {data().immediateData.name} @{' '} + {data().immediateData.timestamp} +
+
+ Immediate source: {data().immediateData.source} +
+
+ Loader source: {data().loaderSource} +
+ Loading deferred...
} + > + ( +
+ {value.message} (source: {value.source}) +
+ )} + /> + + Loading server data... + } + > + ( +
+ Server: {value.name} @ {value.timestamp} (source: {value.source}) +
+ )} + /> +
+ + ) +} diff --git a/e2e/solid-start/streaming-ssr/src/routes/fast-serial.tsx b/e2e/solid-start/streaming-ssr/src/routes/fast-serial.tsx new file mode 100644 index 0000000000..bbcf9cc59e --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routes/fast-serial.tsx @@ -0,0 +1,48 @@ +import { createFileRoute } from '@tanstack/solid-router' +import { createServerFn } from '@tanstack/solid-start' +import { + fastSerialStaticData, + makeFastSerialSmallData, + sourceMarker, +} from '../../../../streaming-ssr-fixtures' + +const getSmallData = createServerFn({ method: 'GET' }).handler(() => + makeFastSerialSmallData(), +) + +export const Route = createFileRoute('/fast-serial')({ + loader: async () => { + const data = await getSmallData() + return { + serverData: data, + staticData: fastSerialStaticData, + timestamp: Date.now(), + loaderSource: sourceMarker(), + } + }, + component: FastSerial, +}) + +function FastSerial() { + const data = Route.useLoaderData() + + return ( +
+

Fast Serialization Test

+

This route tests when serialization completes before render.

+
+ Server: {data().serverData.value} @ {data().serverData.timestamp} +
+
+ Server function source: {data().serverData.source} +
+
+ Loader source: {data().loaderSource} +
+
Static: {data().staticData}
+
+ Loader timestamp: {data().timestamp} +
+
+ ) +} diff --git a/e2e/solid-start/streaming-ssr/src/routes/index.tsx b/e2e/solid-start/streaming-ssr/src/routes/index.tsx new file mode 100644 index 0000000000..f72998817a --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routes/index.tsx @@ -0,0 +1,58 @@ +import { Link, createFileRoute } from '@tanstack/solid-router' + +export const Route = createFileRoute('/')({ + component: Index, +}) + +function Index() { + return ( +
+

Streaming SSR Test Scenarios

+

This e2e project tests various SSR streaming scenarios:

+
    +
  • + + Sync Only + {' '} + - Tests synchronous serialization with no deferred/streaming data +
  • +
  • + + Deferred Data + {' '} + - Tests deferred promises resolving after initial render +
  • +
  • + + Deferred Rejection + {' '} + - Tests deferred promise rejections render through the error boundary +
  • +
  • + + ReadableStream + {' '} + - Tests streaming data via ReadableStream +
  • +
  • + + Fast Serialization + {' '} + - Tests when serialization completes before render finishes +
  • +
  • + + Slow Render + {' '} + - Tests when render takes longer than serialization +
  • +
  • + + Nested Deferred + {' '} + - Tests nested components with deferred data +
  • +
+
+ ) +} diff --git a/e2e/solid-start/streaming-ssr/src/routes/many-promises.tsx b/e2e/solid-start/streaming-ssr/src/routes/many-promises.tsx new file mode 100644 index 0000000000..32627be04d --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routes/many-promises.tsx @@ -0,0 +1,91 @@ +import { Await, createFileRoute } from '@tanstack/solid-router' +import { Suspense } from 'solid-js' +import { createManyPromises } from '../../../../streaming-ssr-fixtures' + +export const Route = createFileRoute('/many-promises')({ + loader: async () => createManyPromises(), + component: ManyPromises, +}) + +function PromiseItem(props: { + promise: Promise + testId: string + label: string +}) { + return ( + + Loading {props.label}... + + } + > + ( +
+ {props.label}: {value} +
+ )} + /> +
+ ) +} + +function ManyPromises() { + const data = Route.useLoaderData() + + return ( +
+

Many Promises Test (15 deferred)

+

Tests streaming with many concurrent deferred promises.

+ + + + + + + + + + + + + + + +
+ ) +} diff --git a/e2e/solid-start/streaming-ssr/src/routes/nested-deferred.tsx b/e2e/solid-start/streaming-ssr/src/routes/nested-deferred.tsx new file mode 100644 index 0000000000..27a266129e --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routes/nested-deferred.tsx @@ -0,0 +1,118 @@ +import { Await, createFileRoute } from '@tanstack/solid-router' +import { createServerFn } from '@tanstack/solid-start' +import { Suspense } from 'solid-js' +import { + delay, + makeDeferred, + makeLevelData, + nestedLevelDelays, + nestedPlainDelay, + nestedPlainMessage, +} from '../../../../streaming-ssr-fixtures' + +const getLevel1Data = createServerFn({ method: 'GET' }).handler(async () => { + await delay(nestedLevelDelays[0]) + return makeLevelData(1) +}) + +const getLevel2Data = createServerFn({ method: 'GET' }).handler(async () => { + await delay(nestedLevelDelays[1]) + return makeLevelData(2) +}) + +const getLevel3Data = createServerFn({ method: 'GET' }).handler(async () => { + await delay(nestedLevelDelays[2]) + return makeLevelData(3) +}) + +export const Route = createFileRoute('/nested-deferred')({ + loader: async () => { + return { + level1: getLevel1Data(), + level2: getLevel2Data(), + level3: getLevel3Data(), + plainDeferred: makeDeferred(nestedPlainMessage, nestedPlainDelay), + } + }, + component: NestedDeferred, +}) + +function Level2Content(props: { + level3: Promise<{ level: number; timestamp: number }> +}) { + return ( +
+ Loading level 3...
} + > + ( +
+ Level 3: {value.level} @ {value.timestamp} +
+ )} + /> + + + ) +} + +function Level1Content(props: { + level2: Promise<{ level: number; timestamp: number }> + level3: Promise<{ level: number; timestamp: number }> +}) { + return ( +
+ Loading level 2...
} + > + ( +
+ Level 2: {value.level} @ {value.timestamp} + +
+ )} + /> + + + ) +} + +function NestedDeferred() { + const data = Route.useLoaderData() + + return ( +
+

Nested Deferred Test

+

+ Tests multiple nested deferred promises resolving at different times. +

+ Loading plain...
} + > +
{value}
} + /> + +
+ Loading level 1...
} + > + ( +
+ Level 1: {value.level} @ {value.timestamp} + +
+ )} + /> + + + + ) +} diff --git a/e2e/solid-start/streaming-ssr/src/routes/query-heavy.tsx b/e2e/solid-start/streaming-ssr/src/routes/query-heavy.tsx new file mode 100644 index 0000000000..c1d4fb9159 --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routes/query-heavy.tsx @@ -0,0 +1,150 @@ +import { queryOptions, useQuery } from '@tanstack/solid-query' +import { createFileRoute } from '@tanstack/solid-router' +import { Suspense } from 'solid-js' + +import { + delay, + makeQueryData, + queryHeavyItems, +} from '../../../../streaming-ssr-fixtures' +import type { QueryData } from '../../../../streaming-ssr-fixtures' + +function makeQueryOptions(item: (typeof queryHeavyItems)[number]) { + return queryOptions({ + queryKey: ['streaming-ssr-query-heavy', item.type, item.id], + queryFn: async (): Promise => { + if (item.delayMs > 0) { + await delay(item.delayMs) + } + + return makeQueryData(item) + }, + staleTime: Infinity, + }) +} + +const syncQuery1 = makeQueryOptions(queryHeavyItems[0]) +const syncQuery2 = makeQueryOptions(queryHeavyItems[1]) +const syncQuery3 = makeQueryOptions(queryHeavyItems[2]) +const fastAsyncQuery1 = makeQueryOptions(queryHeavyItems[3]) +const fastAsyncQuery2 = makeQueryOptions(queryHeavyItems[4]) +const fastAsyncQuery3 = makeQueryOptions(queryHeavyItems[5]) +const slowAsyncQuery1 = makeQueryOptions(queryHeavyItems[6]) +const slowAsyncQuery2 = makeQueryOptions(queryHeavyItems[7]) +const slowAsyncQuery3 = makeQueryOptions(queryHeavyItems[8]) + +type QueryOptions = ReturnType + +export const Route = createFileRoute('/query-heavy')({ + component: QueryHeavy, +}) + +function QueryDisplay(props: { queryOpts: QueryOptions; testId: string }) { + const query = useQuery(() => props.queryOpts) + + return +} + +function QueryDataView(props: { data: QueryData | undefined; testId: string }) { + return ( +
+ {props.data?.value ?? 'loading...'} (source:{' '} + {props.data?.source ?? 'loading...'}) +
+ ) +} + +function QuerySuspense(props: { + queryOpts: QueryOptions + testId: string + fallback: string +}) { + return ( + {props.fallback} + } + > + + + ) +} + +function QueryHeavy() { + return ( +
+

Query Heavy Test (9 useQuery calls)

+

Tests multiple useQuery with mixed sync/async queryFn.

+

+ All queries should show "source: server" if SSR streaming works + correctly. +

+ +
+
+

Sync Queries (immediate)

+ + + +
+ +
+

Fast Async Queries (50-100ms)

+ + + +
+ +
+

Slow Async Queries (200-400ms)

+ + + +
+
+
+ ) +} diff --git a/e2e/solid-start/streaming-ssr/src/routes/slow-render.tsx b/e2e/solid-start/streaming-ssr/src/routes/slow-render.tsx new file mode 100644 index 0000000000..60f75256e5 --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routes/slow-render.tsx @@ -0,0 +1,72 @@ +import { Await, createFileRoute } from '@tanstack/solid-router' +import { createServerFn } from '@tanstack/solid-start' +import { Suspense } from 'solid-js' +import { + makeDeferredMessage, + makeServerData, + slowRenderComponents, + slowRenderDeferredDelay, + slowRenderDeferredMessage, + slowRenderQuickName, + sourceMarker, +} from '../../../../streaming-ssr-fixtures' + +const getQuickData = createServerFn({ method: 'GET' }).handler(() => + makeServerData(slowRenderQuickName), +) + +function SlowComponent(props: { data: string; index: number }) { + const startTime = Date.now() + while (Date.now() - startTime < 100) { + // Simulate slow render work. + } + return
{props.data}
+} + +export const Route = createFileRoute('/slow-render')({ + loader: async () => { + const quickData = await getQuickData() + return { + quickData, + deferredData: makeDeferredMessage( + slowRenderDeferredMessage, + slowRenderDeferredDelay, + ), + loaderSource: sourceMarker(), + } + }, + component: SlowRender, +}) + +function SlowRender() { + const data = Route.useLoaderData() + + return ( +
+

Slow Render Test

+

Tests when render takes longer than serialization.

+
+ Quick: {data().quickData.name} @ {data().quickData.timestamp} +
+
+ Quick data source: {data().quickData.source} +
+
+ Loader source: {data().loaderSource} +
+ Loading...
}> + ( +
+ {value.message} (source: {value.source}) +
+ )} + /> + + {slowRenderComponents.map((data, index) => ( + + ))} + + ) +} diff --git a/e2e/solid-start/streaming-ssr/src/routes/stream.tsx b/e2e/solid-start/streaming-ssr/src/routes/stream.tsx new file mode 100644 index 0000000000..7da67becfe --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routes/stream.tsx @@ -0,0 +1,85 @@ +import { Await, createFileRoute } from '@tanstack/solid-router' +import { createEffect, createSignal, onCleanup, Suspense } from 'solid-js' +import { + createChunkStream, + createStreamPromise, +} from '../../../../streaming-ssr-fixtures' + +export const Route = createFileRoute('/stream')({ + component: StreamRoute, + loader() { + return { + promise: createStreamPromise(), + stream: createChunkStream(), + } + }, +}) + +const decoder = new TextDecoder('utf-8') + +function StreamRoute() { + const data = Route.useLoaderData() + const [streamData, setStreamData] = createSignal>([]) + const [streamComplete, setStreamComplete] = createSignal(false) + let reader: ReadableStreamDefaultReader | undefined + + createEffect(() => { + const stream = data().stream + if (stream.locked) { + return + } + + setStreamData([]) + setStreamComplete(false) + + async function readStream() { + try { + reader = stream.getReader() + let chunk + while (!(chunk = await reader.read()).done) { + let value = chunk.value + if (typeof value !== 'string') { + value = decoder.decode(value, { stream: !chunk.done }) + } + setStreamData((prev) => [...prev, value]) + } + setStreamComplete(true) + } catch (e) { + if (!(e instanceof TypeError && String(e).includes('cancelled'))) { + console.error('Stream error:', e) + } + } + } + + void readStream() + onCleanup(() => { + reader?.cancel().catch(() => {}) + reader = undefined + }) + }) + + return ( +
+

ReadableStream Test

+ Loading promise...
} + > +
{value}
} + /> + +
+

Stream chunks:

+
+ {streamData().map((chunk, i) => ( +
{chunk}
+ ))} +
+ {streamComplete() && ( +
Stream complete!
+ )} +
+ + ) +} diff --git a/e2e/solid-start/streaming-ssr/src/routes/sync-only.tsx b/e2e/solid-start/streaming-ssr/src/routes/sync-only.tsx new file mode 100644 index 0000000000..c411d2e7e5 --- /dev/null +++ b/e2e/solid-start/streaming-ssr/src/routes/sync-only.tsx @@ -0,0 +1,25 @@ +import { createFileRoute } from '@tanstack/solid-router' +import { makeSyncOnlyData } from '../../../../streaming-ssr-fixtures' + +export const Route = createFileRoute('/sync-only')({ + loader: async () => makeSyncOnlyData(), + component: SyncOnly, +}) + +function SyncOnly() { + const data = Route.useLoaderData() + + return ( +
+

Synchronous Serialization Test

+

{data().message}

+

Loaded at: {data().timestamp}

+

Source: {data().source}

+
    + {data().items.map((item) => ( +
  • {item}
  • + ))} +
+
+ ) +} diff --git a/e2e/solid-start/streaming-ssr/tests/client-navigation.spec.ts b/e2e/solid-start/streaming-ssr/tests/client-navigation.spec.ts new file mode 100644 index 0000000000..8b9b3a8dcc --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/client-navigation.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/client-navigation' diff --git a/e2e/solid-start/streaming-ssr/tests/concurrent.spec.ts b/e2e/solid-start/streaming-ssr/tests/concurrent.spec.ts new file mode 100644 index 0000000000..8625473a58 --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/concurrent.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/concurrent' diff --git a/e2e/solid-start/streaming-ssr/tests/deferred-rejection.spec.ts b/e2e/solid-start/streaming-ssr/tests/deferred-rejection.spec.ts new file mode 100644 index 0000000000..355b5019bc --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/deferred-rejection.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/deferred-rejection' diff --git a/e2e/solid-start/streaming-ssr/tests/deferred.spec.ts b/e2e/solid-start/streaming-ssr/tests/deferred.spec.ts new file mode 100644 index 0000000000..3145897d7b --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/deferred.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/deferred' diff --git a/e2e/solid-start/streaming-ssr/tests/fast-serial.spec.ts b/e2e/solid-start/streaming-ssr/tests/fast-serial.spec.ts new file mode 100644 index 0000000000..95df0555e2 --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/fast-serial.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/fast-serial' diff --git a/e2e/solid-start/streaming-ssr/tests/home.spec.ts b/e2e/solid-start/streaming-ssr/tests/home.spec.ts new file mode 100644 index 0000000000..5d49d34a56 --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/home.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/home' diff --git a/e2e/solid-start/streaming-ssr/tests/many-promises.spec.ts b/e2e/solid-start/streaming-ssr/tests/many-promises.spec.ts new file mode 100644 index 0000000000..b747bd7d0a --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/many-promises.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/many-promises' diff --git a/e2e/solid-start/streaming-ssr/tests/nested-deferred.spec.ts b/e2e/solid-start/streaming-ssr/tests/nested-deferred.spec.ts new file mode 100644 index 0000000000..8df20a8a95 --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/nested-deferred.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/nested-deferred' diff --git a/e2e/solid-start/streaming-ssr/tests/preview-streaming.spec.ts b/e2e/solid-start/streaming-ssr/tests/preview-streaming.spec.ts new file mode 100644 index 0000000000..34241cfbaa --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/preview-streaming.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/preview-streaming' diff --git a/e2e/solid-start/streaming-ssr/tests/query-heavy.spec.ts b/e2e/solid-start/streaming-ssr/tests/query-heavy.spec.ts new file mode 100644 index 0000000000..d15c092f6e --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/query-heavy.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/query-heavy' diff --git a/e2e/solid-start/streaming-ssr/tests/slow-render.spec.ts b/e2e/solid-start/streaming-ssr/tests/slow-render.spec.ts new file mode 100644 index 0000000000..0d5a87363f --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/slow-render.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/slow-render' diff --git a/e2e/solid-start/streaming-ssr/tests/stream.spec.ts b/e2e/solid-start/streaming-ssr/tests/stream.spec.ts new file mode 100644 index 0000000000..a51614f09a --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/stream.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/stream' diff --git a/e2e/solid-start/streaming-ssr/tests/sync-only.spec.ts b/e2e/solid-start/streaming-ssr/tests/sync-only.spec.ts new file mode 100644 index 0000000000..0e9278d3f2 --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tests/sync-only.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/sync-only' diff --git a/e2e/solid-start/streaming-ssr/tsconfig.json b/e2e/solid-start/streaming-ssr/tsconfig.json new file mode 100644 index 0000000000..ff0556e7a8 --- /dev/null +++ b/e2e/solid-start/streaming-ssr/tsconfig.json @@ -0,0 +1,22 @@ +{ + "include": ["**/*.ts", "**/*.tsx"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "preserve", + "jsxImportSource": "solid-js", + "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/solid-start/streaming-ssr/vite.config.ts b/e2e/solid-start/streaming-ssr/vite.config.ts new file mode 100644 index 0000000000..a9913da087 --- /dev/null +++ b/e2e/solid-start/streaming-ssr/vite.config.ts @@ -0,0 +1,10 @@ +import { defineConfig } from 'vite' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' +import viteSolid from 'vite-plugin-solid' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [tanstackStart(), viteSolid({ ssr: true })], +}) diff --git a/e2e/streaming-ssr-assertions.ts b/e2e/streaming-ssr-assertions.ts new file mode 100644 index 0000000000..51d2a7343e --- /dev/null +++ b/e2e/streaming-ssr-assertions.ts @@ -0,0 +1,143 @@ +import { expect } from '@playwright/test' +import { test } from './e2e-utils/src/fixture' +import type { Page } from '@playwright/test' + +// Router transport markers, mirrored from router-core's hydration scripts. +// Keep every spec's protocol knowledge in this one place. +export const ROUTER_BOOTSTRAP_MARKER = '$_TSR.router=' +export const ROUTER_STREAM_END_MARKER = '$_TSR.e()' +export const STREAM_BOUNDARY_MARKER = '$tsr-stream-boundary' +export const STREAM_PART_SELECTOR = '[data-tsr-stream-part]' +const LATE_RECORD_CLOSE = 'document.currentScript.remove()' + +const immediateDataMarker = 'data-testid="immediate-data"' +const renderedDeferredMarker = 'data-testid="deferred-data"' + +const browserUserAgent = + 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36' + +export async function expectDeferredRouteResponseOrder( + baseURL: string | undefined, +) { + if (!baseURL) { + throw new Error('Playwright baseURL is required') + } + + const response = await fetch(new URL('/deferred', baseURL), { + headers: { + accept: 'text/html', + 'accept-encoding': 'identity', + 'user-agent': browserUserAgent, + }, + }) + + expect(response.status).toBe(200) + expect(response.body).not.toBeNull() + + const html = await response.text() + + const responsePreview = + html.length > 2000 + ? `${html.slice(0, 1000)}\n...\n${html.slice(-1000)}` + : html + + const immediateDataIndex = html.indexOf(immediateDataMarker) + const renderedDeferredIndex = html.indexOf(renderedDeferredMarker) + expect(immediateDataIndex, responsePreview).toBeGreaterThanOrEqual(0) + expect(renderedDeferredIndex, responsePreview).toBeGreaterThan( + immediateDataIndex, + ) + + // SSR Query closes its request-local stream after renderer EOF. Its final + // record is the deterministic late router output for this test. + const boundaryIndex = html.indexOf(STREAM_BOUNDARY_MARKER) + const routerEndIndex = html.indexOf(ROUTER_STREAM_END_MARKER) + + expect(boundaryIndex).toBeGreaterThan(-1) + expect(boundaryIndex).toBeLessThan(routerEndIndex) + expect(renderedDeferredIndex).toBeLessThan(routerEndIndex) + + expectCompleteRouterStreamBeforeDocumentCloses(html, renderedDeferredMarker) +} + +export async function expectQueryHeavyRouteStreamOrder( + baseURL: string | undefined, +) { + if (!baseURL) { + throw new Error('Playwright baseURL is required') + } + + const response = await fetch(new URL('/query-heavy', baseURL), { + headers: { + accept: 'text/html', + 'accept-encoding': 'identity', + 'user-agent': browserUserAgent, + }, + }) + + expect(response.status).toBe(200) + const html = await response.text() + + expect(html).toContain('data-testid="fast-async-query-1"') + expect(html).toContain('data-testid="slow-async-query-3"') + expectCompleteRouterStreamBeforeDocumentCloses(html, '"slow-async-3"') +} + +/** Asserts a route response carries the bootstrap, the boundary, and the end record. */ +export function expectRouterHydrationMarkers(html: string) { + expect(html).toContain(ROUTER_BOOTSTRAP_MARKER) + expect(html).toContain(ROUTER_STREAM_END_MARKER) + expect(html).toContain(STREAM_BOUNDARY_MARKER) +} + +function expectCompleteRouterStreamBeforeDocumentCloses( + html: string, + payloadMarker: string, +) { + const endIndex = html.indexOf(ROUTER_STREAM_END_MARKER) + const payloadIndex = html.indexOf(payloadMarker) + const scriptOpenIndex = html.lastIndexOf('', endIndex) + const scriptCloseIndex = html.indexOf('', endIndex) + const bodyCloseIndex = html.indexOf('', scriptCloseIndex) + const htmlCloseIndex = html.indexOf('', bodyCloseIndex) + + expect(endIndex).toBeGreaterThan(-1) + expect(scriptOpenIndex).toBeGreaterThan(previousScriptCloseIndex) + expect(scriptCloseIndex).toBeGreaterThan(endIndex) + expect(payloadIndex).toBeGreaterThan(-1) + expect(payloadIndex).toBeLessThan(endIndex) + expect(html.slice(endIndex, scriptCloseIndex)).toContain(LATE_RECORD_CLOSE) + expect(scriptCloseIndex).toBeLessThan(bodyCloseIndex) + expect(bodyCloseIndex).toBeLessThan(htmlCloseIndex) +} + +async function verifyHydration( + page: Page, + { timeout = 10_000 }: { timeout?: number } = {}, +) { + const button = page.getByTestId('hydration-check-btn') + const status = page.getByTestId('hydration-status') + + await expect(button).toBeVisible() + await expect(async () => { + await button.click() + await expect(status).toHaveText('hydrated', { timeout: 100 }) + }).toPass({ timeout }) + + await expect(page.locator(STREAM_PART_SELECTOR)).toHaveCount(0) + await expect( + page.locator('script').filter({ hasText: STREAM_BOUNDARY_MARKER }), + ).toHaveCount(0) +} + +export { test } + +export const testWithHydration = test.extend({ + page: async ({ page }, use) => { + await use(page) + await verifyHydration(page) + }, +}) + +export { expect } diff --git a/e2e/streaming-ssr-fixtures/index.ts b/e2e/streaming-ssr-fixtures/index.ts new file mode 100644 index 0000000000..a70ef94459 --- /dev/null +++ b/e2e/streaming-ssr-fixtures/index.ts @@ -0,0 +1,381 @@ +export type SourceMarker = 'server' | 'client' + +export type ServerData = { + name: string + timestamp: number + source: 'server' +} + +export type DeferredMessage = { + message: string + source: SourceMarker +} + +export type QueryType = 'sync' | 'fast-async' | 'slow-async' + +export type QueryData = { + type: QueryType + id: number + value: string + source: SourceMarker +} + +export const deferredDataMessage = 'Deferred data loaded!' +export const deferredDataDelay = 1000 +export const deferredServerDelay = 800 +export const deferredImmediateName = 'Fast User' +export const deferredSlowName = 'Slow User' +export const deferredErrorMessage = 'Error in deferred object' + +export const fastSerialStaticData = 'This is static data' +export const fastSerialSmallValue = 'small-data' + +export const syncOnlyMessage = 'Hello from sync loader!' +export const syncOnlyItems = ['item-1', 'item-2', 'item-3'] as const + +export const slowRenderDeferredMessage = 'Deferred resolved!' +export const slowRenderDeferredDelay = 50 +export const slowRenderQuickName = 'Quick data' +export const slowRenderComponents = [ + 'Slow component 1', + 'Slow component 2', + 'Slow component 3', +] as const + +export const nestedLevelDelays = [200, 400, 600] as const +export const nestedPlainDelay = 300 +export const nestedPlainMessage = 'Plain deferred resolved!' + +export const streamPromiseValue = 'promise-resolved' +export const streamPromiseDelay = 150 +export const streamChunkDelay = 200 +export const streamChunks = Array.from({ length: 5 }, (_, i) => `chunk-${i}`) + +export const routerHtmlPayloadChars = 17 * 1024 * 1024 +export const routerHtmlPayloadChar = 'x' +export const routerHtmlPayloadDelay = 100 + +export const manyPromiseItems = [ + { + key: 'immediate1', + testId: 'immediate-1', + label: 'Immediate 1', + value: 'immediate-1', + delayMs: 0, + }, + { + key: 'immediate2', + testId: 'immediate-2', + label: 'Immediate 2', + value: 'immediate-2', + delayMs: 10, + }, + { + key: 'immediate3', + testId: 'immediate-3', + label: 'Immediate 3', + value: 'immediate-3', + delayMs: 20, + }, + { + key: 'fast1', + testId: 'fast-1', + label: 'Fast 1', + value: 'fast-1', + delayMs: 50, + }, + { + key: 'fast2', + testId: 'fast-2', + label: 'Fast 2', + value: 'fast-2', + delayMs: 75, + }, + { + key: 'fast3', + testId: 'fast-3', + label: 'Fast 3', + value: 'fast-3', + delayMs: 100, + }, + { + key: 'fast4', + testId: 'fast-4', + label: 'Fast 4', + value: 'fast-4', + delayMs: 125, + }, + { + key: 'medium1', + testId: 'medium-1', + label: 'Medium 1', + value: 'medium-1', + delayMs: 150, + }, + { + key: 'medium2', + testId: 'medium-2', + label: 'Medium 2', + value: 'medium-2', + delayMs: 200, + }, + { + key: 'medium3', + testId: 'medium-3', + label: 'Medium 3', + value: 'medium-3', + delayMs: 250, + }, + { + key: 'slow1', + testId: 'slow-1', + label: 'Slow 1', + value: 'slow-1', + delayMs: 300, + }, + { + key: 'slow2', + testId: 'slow-2', + label: 'Slow 2', + value: 'slow-2', + delayMs: 400, + }, + { + key: 'slow3', + testId: 'slow-3', + label: 'Slow 3', + value: 'slow-3', + delayMs: 500, + }, + { + key: 'verySlow1', + testId: 'very-slow-1', + label: 'Very Slow 1', + value: 'very-slow-1', + delayMs: 600, + }, + { + key: 'verySlow2', + testId: 'very-slow-2', + label: 'Very Slow 2', + value: 'very-slow-2', + delayMs: 800, + }, +] as const + +export const concurrentBatchCount = 5 +export const concurrentBatchDelays = [100, 200, 300] as const + +export const queryHeavyItems = [ + { + type: 'sync', + id: 1, + value: 'sync-value-1', + delayMs: 0, + testId: 'sync-query-1', + fallback: 'Loading sync 1...', + }, + { + type: 'sync', + id: 2, + value: 'sync-value-2', + delayMs: 0, + testId: 'sync-query-2', + fallback: 'Loading sync 2...', + }, + { + type: 'sync', + id: 3, + value: 'sync-value-3', + delayMs: 0, + testId: 'sync-query-3', + fallback: 'Loading sync 3...', + }, + { + type: 'fast-async', + id: 1, + value: 'fast-async-1', + delayMs: 50, + testId: 'fast-async-query-1', + fallback: 'Loading fast 1...', + }, + { + type: 'fast-async', + id: 2, + value: 'fast-async-2', + delayMs: 75, + testId: 'fast-async-query-2', + fallback: 'Loading fast 2...', + }, + { + type: 'fast-async', + id: 3, + value: 'fast-async-3', + delayMs: 100, + testId: 'fast-async-query-3', + fallback: 'Loading fast 3...', + }, + { + type: 'slow-async', + id: 1, + value: 'slow-async-1', + delayMs: 200, + testId: 'slow-async-query-1', + fallback: 'Loading slow 1...', + }, + { + type: 'slow-async', + id: 2, + value: 'slow-async-2', + delayMs: 300, + testId: 'slow-async-query-2', + fallback: 'Loading slow 2...', + }, + { + type: 'slow-async', + id: 3, + value: 'slow-async-3', + delayMs: 400, + testId: 'slow-async-query-3', + fallback: 'Loading slow 3...', + }, +] as const + +export function sourceMarker(): SourceMarker { + return typeof window === 'undefined' ? 'server' : 'client' +} + +export function delay(ms: number): Promise { + return new Promise((resolve) => setTimeout(resolve, ms)) +} + +export function makeServerData(name: string): ServerData { + return { + name, + timestamp: Date.now(), + source: 'server', + } +} + +export function makeDeferred(value: T, delayMs: number): Promise { + return new Promise((resolve) => setTimeout(() => resolve(value), delayMs)) +} + +export function makeDeferredMessage( + message: string, + delayMs: number, +): Promise { + return makeDeferred({ message, source: sourceMarker() }, delayMs) +} + +export function makeFastSerialSmallData() { + return { + value: fastSerialSmallValue, + timestamp: Date.now(), + source: 'server' as const, + } +} + +export function makeSyncOnlyData() { + return { + message: syncOnlyMessage, + timestamp: Date.now(), + items: syncOnlyItems, + source: sourceMarker(), + } +} + +export function makeLevelData(level: number) { + return { level, timestamp: Date.now() } +} + +export function makeQueryData(item: { + type: QueryType + id: number + value: string +}): QueryData { + return { + type: item.type, + id: item.id, + value: item.value, + source: sourceMarker(), + } +} + +export function createManyPromises() { + return Object.fromEntries( + manyPromiseItems.map((item) => [ + item.key, + makeDeferred(item.value, item.delayMs), + ]), + ) as Record<(typeof manyPromiseItems)[number]['key'], Promise> +} + +export function createConcurrentPromises( + count: number, + delayMs: number, +): Array> { + const sharedPromise = delay(delayMs) + return Array.from({ length: count }, (_, i) => + sharedPromise.then(() => `concurrent-${i + 1}`), + ) +} + +export function createConcurrentLoaderData() { + const batch1 = createConcurrentPromises( + concurrentBatchCount, + concurrentBatchDelays[0], + ) + const batch2 = createConcurrentPromises( + concurrentBatchCount, + concurrentBatchDelays[1], + ) + const batch3 = createConcurrentPromises( + concurrentBatchCount, + concurrentBatchDelays[2], + ) + + return { + concurrent1_1: batch1[0], + concurrent1_2: batch1[1], + concurrent1_3: batch1[2], + concurrent1_4: batch1[3], + concurrent1_5: batch1[4], + concurrent2_1: batch2[0], + concurrent2_2: batch2[1], + concurrent2_3: batch2[2], + concurrent2_4: batch2[3], + concurrent2_5: batch2[4], + concurrent3_1: batch3[0], + concurrent3_2: batch3[1], + concurrent3_3: batch3[2], + concurrent3_4: batch3[3], + concurrent3_5: batch3[4], + } +} + +export function createStreamPromise(): Promise { + return makeDeferred(streamPromiseValue, streamPromiseDelay) +} + +export function createChunkStream(): ReadableStream { + return new ReadableStream({ + async start(controller) { + for (const chunk of streamChunks) { + await delay(streamChunkDelay) + controller.enqueue(chunk) + } + controller.close() + }, + }) +} + +export function createRouterHtmlPayload() { + return makeDeferred( + { + value: routerHtmlPayloadChar.repeat(routerHtmlPayloadChars), + source: sourceMarker(), + }, + routerHtmlPayloadDelay, + ) +} diff --git a/e2e/streaming-ssr-specs/client-navigation.ts b/e2e/streaming-ssr-specs/client-navigation.ts new file mode 100644 index 0000000000..759f8e0282 --- /dev/null +++ b/e2e/streaming-ssr-specs/client-navigation.ts @@ -0,0 +1,372 @@ +import { expect, test, testWithHydration } from '../streaming-ssr-assertions' + +test.describe('Client-side navigation between all routes', () => { + test.beforeEach(async ({ page }) => { + // Start from home page + await page.goto('/') + await page.waitForLoadState('networkidle') + }) + + test('home -> sync-only -> home works', async ({ page }) => { + // Navigate to sync-only + await page + .getByRole('navigation') + .getByRole('link', { name: 'Sync Only' }) + .click() + await expect(page).toHaveURL('/sync-only') + await expect(page.getByTestId('sync-message')).toBeVisible() + + // Navigate back to home + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + await expect(page.getByTestId('index-title')).toBeVisible() + }) + + test('home -> deferred -> home works', async ({ page }) => { + // Navigate to deferred (use exact: true to avoid matching "Nested Deferred") + await page + .getByRole('navigation') + .getByRole('link', { name: 'Deferred', exact: true }) + .click() + await expect(page).toHaveURL('/deferred') + await expect(page.getByTestId('immediate-data')).toBeVisible() + + // Wait for deferred data + await expect(page.getByTestId('deferred-data')).toBeVisible({ + timeout: 5000, + }) + + // Navigate back to home + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) + + test('home -> stream -> home works (no stream locking error)', async ({ + page, + }) => { + // This test specifically validates the ReadableStream locking fix + // Console errors are monitored by the fixture automatically + + // Navigate to stream + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + + // Wait for stream to start (at least one chunk or promise resolved) + await expect(page.getByTestId('promise-data')).toBeVisible({ + timeout: 5000, + }) + + // Navigate back without waiting for stream completion. + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) + + test('home -> stream -> wait for completion -> home works', async ({ + page, + }) => { + // Navigate to stream + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + + // Wait for stream to complete + await expect(page.getByTestId('stream-complete')).toBeVisible({ + timeout: 10000, + }) + + // Navigate back to home + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + await expect(page.getByTestId('index-title')).toBeVisible() + }) + + test('home -> stream -> home -> stream again works (fresh stream each time)', async ({ + page, + }) => { + // Console errors are monitored by the fixture automatically + + // First navigation to stream + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + await expect(page.getByTestId('promise-data')).toBeVisible({ + timeout: 5000, + }) + + // Navigate back to home + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + + // Second navigation to stream - should get fresh stream without errors + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + + // Wait for stream to complete + await expect(page.getByTestId('stream-complete')).toBeVisible({ + timeout: 10000, + }) + + // Verify all chunks are present + await expect(page.getByTestId('stream-chunk-0')).toBeVisible() + await expect(page.getByTestId('stream-chunk-4')).toBeVisible() + }) + + test('home -> fast-serial -> home works', async ({ page }) => { + await page + .getByRole('navigation') + .getByRole('link', { name: 'Fast Serial' }) + .click() + await expect(page).toHaveURL('/fast-serial') + await expect(page.getByTestId('server-data')).toBeVisible() + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) + + test('home -> slow-render -> home works', async ({ page }) => { + await page + .getByRole('navigation') + .getByRole('link', { name: 'Slow Render' }) + .click() + await expect(page).toHaveURL('/slow-render') + await expect(page.getByTestId('quick-data')).toBeVisible() + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) + + test('home -> nested-deferred -> home works', async ({ page }) => { + await page + .getByRole('navigation') + .getByRole('link', { name: 'Nested Deferred' }) + .click() + await expect(page).toHaveURL('/nested-deferred') + + // Wait for all levels to load + await expect(page.getByTestId('level3-data')).toBeVisible({ timeout: 5000 }) + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) + + test('navigation without waiting for route data works', async ({ page }) => { + // Console errors are monitored by the fixture automatically + + // Change routes as soon as each URL updates, without waiting for route data. + await page + .getByRole('navigation') + .getByRole('link', { name: 'Sync Only' }) + .click() + await expect(page).toHaveURL('/sync-only') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Deferred', exact: true }) + .click() + await expect(page).toHaveURL('/deferred') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Fast Serial' }) + .click() + await expect(page).toHaveURL('/fast-serial') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Slow Render' }) + .click() + await expect(page).toHaveURL('/slow-render') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Nested Deferred' }) + .click() + await expect(page).toHaveURL('/nested-deferred') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) +}) + +test.describe('Direct navigation followed by client navigation', () => { + test('direct to stream -> client nav to deferred works', async ({ page }) => { + // Direct navigation to stream + await page.goto('/stream') + await expect(page.getByTestId('promise-data')).toBeVisible({ + timeout: 5000, + }) + + // Client navigation to deferred (use exact: true) + await page + .getByRole('navigation') + .getByRole('link', { name: 'Deferred', exact: true }) + .click() + await expect(page).toHaveURL('/deferred') + await expect(page.getByTestId('immediate-data')).toBeVisible() + }) + + test('direct to deferred -> client nav to stream works', async ({ page }) => { + // Console errors are monitored by the fixture automatically + + // Direct navigation to deferred + await page.goto('/deferred') + await expect(page.getByTestId('immediate-data')).toBeVisible() + + // Client navigation to stream + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + await expect(page.getByTestId('stream-complete')).toBeVisible({ + timeout: 10000, + }) + }) + + test('direct to sync-only -> client nav to all routes works', async ({ + page, + }) => { + await page.goto('/sync-only') + await expect(page.getByTestId('sync-message')).toBeVisible() + + // Navigate through all routes + await page + .getByRole('navigation') + .getByRole('link', { name: 'Deferred', exact: true }) + .click() + await expect(page).toHaveURL('/deferred') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Fast Serial' }) + .click() + await expect(page).toHaveURL('/fast-serial') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) +}) + +testWithHydration.describe('Hydration after client navigation', () => { + testWithHydration( + 'interactive elements work after navigating to deferred', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Deferred', exact: true }) + .click() + await expect(page).toHaveURL('/deferred') + + // Wait for the page to be fully loaded + await expect(page.getByTestId('immediate-data')).toBeVisible() + }, + ) + + testWithHydration( + 'interactive elements work after navigating to fast-serial', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Fast Serial' }) + .click() + await expect(page).toHaveURL('/fast-serial') + + // Wait for page to load + await expect(page.getByTestId('server-data')).toBeVisible() + }, + ) + + testWithHydration( + 'interactive elements work after navigating to nested-deferred', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Nested Deferred' }) + .click() + await expect(page).toHaveURL('/nested-deferred') + + // Wait for page to load + await expect(page.getByTestId('plain-deferred')).toBeVisible({ + timeout: 5000, + }) + }, + ) + + testWithHydration( + 'interactive elements work after navigating to slow-render', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Slow Render' }) + .click() + await expect(page).toHaveURL('/slow-render') + + // Wait for page to load (slow-render has blocking loops) + await expect(page.getByTestId('quick-data')).toBeVisible() + }, + ) +}) diff --git a/e2e/streaming-ssr-specs/concurrent.ts b/e2e/streaming-ssr-specs/concurrent.ts new file mode 100644 index 0000000000..ef14f80367 --- /dev/null +++ b/e2e/streaming-ssr-specs/concurrent.ts @@ -0,0 +1,86 @@ +import { expect, test, testWithHydration } from '../streaming-ssr-assertions' + +test.describe('Concurrent promise resolution (15 promises in 3 batches)', () => { + test('all concurrent promises resolve correctly', async ({ page }) => { + await page.goto('/concurrent') + + // Batch 1 (5 promises at 100ms) + await expect(page.getByTestId('concurrent-1-1')).toContainText( + 'concurrent-1', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-1-2')).toContainText( + 'concurrent-2', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-1-3')).toContainText( + 'concurrent-3', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-1-4')).toContainText( + 'concurrent-4', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-1-5')).toContainText( + 'concurrent-5', + { timeout: 5000 }, + ) + + // Batch 2 (5 promises at 200ms) + await expect(page.getByTestId('concurrent-2-1')).toContainText( + 'concurrent-1', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-2-2')).toContainText( + 'concurrent-2', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-2-3')).toContainText( + 'concurrent-3', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-2-4')).toContainText( + 'concurrent-4', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-2-5')).toContainText( + 'concurrent-5', + { timeout: 5000 }, + ) + + // Batch 3 (5 promises at 300ms) + await expect(page.getByTestId('concurrent-3-1')).toContainText( + 'concurrent-1', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-3-2')).toContainText( + 'concurrent-2', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-3-3')).toContainText( + 'concurrent-3', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-3-4')).toContainText( + 'concurrent-4', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-3-5')).toContainText( + 'concurrent-5', + { timeout: 5000 }, + ) + }) + + testWithHydration( + 'hydration works with concurrent resolutions', + async ({ page }) => { + await page.goto('/concurrent') + await page.waitForLoadState('networkidle') + + // Wait for all batches + await expect(page.getByTestId('concurrent-3-5')).toBeVisible({ + timeout: 5000, + }) + }, + ) +}) diff --git a/e2e/streaming-ssr-specs/deferred-rejection.ts b/e2e/streaming-ssr-specs/deferred-rejection.ts new file mode 100644 index 0000000000..3e944b1c0c --- /dev/null +++ b/e2e/streaming-ssr-specs/deferred-rejection.ts @@ -0,0 +1,21 @@ +import { expect, test } from '../streaming-ssr-assertions' + +test.use({ + whitelistErrors: ['Error in deferred object'], +}) + +test('rejected deferred Await renders the route error boundary without killing SSR', async ({ + page, +}) => { + await page.goto('/deferred-rejection') + + await expect(page.getByTestId('deferred-error-boundary')).toContainText( + 'Error in deferred object', + { timeout: 5000 }, + ) + + await page.goto('/sync-only') + await expect(page.getByTestId('sync-message')).toContainText( + 'Hello from sync loader!', + ) +}) diff --git a/e2e/streaming-ssr-specs/deferred.ts b/e2e/streaming-ssr-specs/deferred.ts new file mode 100644 index 0000000000..abece0b43e --- /dev/null +++ b/e2e/streaming-ssr-specs/deferred.ts @@ -0,0 +1,113 @@ +import { + expect, + expectDeferredRouteResponseOrder, + test, + testWithHydration, +} from '../streaming-ssr-assertions' + +test.describe('Deferred data streaming', () => { + test('finishes the router stream after renderer output', async ({ + baseURL, + }) => { + await expectDeferredRouteResponseOrder(baseURL) + }) + + test('renders immediate and deferred server data', async ({ page }) => { + await page.goto('/deferred') + + // Immediate loader data is rendered. + await expect(page.getByTestId('immediate-data')).toBeVisible() + await expect(page.getByTestId('immediate-data')).toContainText( + 'Immediate: Fast User', + ) + + // Verify immediate data came from server + await expect(page.getByTestId('immediate-source')).toContainText( + 'Immediate source: server', + ) + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + + // Deferred data should eventually appear with server source + await expect(page.getByTestId('deferred-data')).toContainText( + 'Deferred data loaded!', + { timeout: 5000 }, + ) + await expect(page.getByTestId('deferred-data')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('deferred-server-data')).toContainText( + 'Server: Slow User', + { timeout: 5000 }, + ) + await expect(page.getByTestId('deferred-server-data')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + }) + + testWithHydration( + 'hydration works - interactive elements respond', + async ({ page }) => { + await page.goto('/deferred') + await page.waitForLoadState('networkidle') + + // Wait for all deferred content to load + await expect(page.getByTestId('deferred-data')).toBeVisible({ + timeout: 5000, + }) + + // Verify all data came from server after hydration + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + await expect(page.getByTestId('deferred-data')).toContainText( + 'source: server', + ) + }, + ) + + test('client-side navigation to deferred route works', async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via client-side routing using nav link + await page.getByRole('link', { name: 'Deferred' }).first().click() + await expect(page).toHaveURL('/deferred') + + // Data should load + await expect(page.getByTestId('immediate-data')).toContainText('Fast User') + await expect(page.getByTestId('deferred-data')).toContainText( + 'Deferred data loaded!', + { timeout: 5000 }, + ) + }) + + test('all data sources are server', async ({ page }) => { + await page.goto('/deferred') + + // Wait for all deferred content + await expect(page.getByTestId('deferred-data')).toBeVisible({ + timeout: 5000, + }) + await expect(page.getByTestId('deferred-server-data')).toBeVisible({ + timeout: 5000, + }) + + // Count all elements showing 'server' source - should be 4: + // 1. immediate-source + // 2. loader-source + // 3. deferred-data (contains "source: server") + // 4. deferred-server-data (contains "source: server") + await expect(page.getByTestId('immediate-source')).toContainText('server') + await expect(page.getByTestId('loader-source')).toContainText('server') + await expect(page.getByTestId('deferred-data')).toContainText( + 'source: server', + ) + await expect(page.getByTestId('deferred-server-data')).toContainText( + 'source: server', + ) + }) +}) diff --git a/e2e/streaming-ssr-specs/fast-serial.ts b/e2e/streaming-ssr-specs/fast-serial.ts new file mode 100644 index 0000000000..03201f0a55 --- /dev/null +++ b/e2e/streaming-ssr-specs/fast-serial.ts @@ -0,0 +1,74 @@ +import { + expect, + expectRouterHydrationMarkers, + test, + testWithHydration, +} from '../streaming-ssr-assertions' + +test.describe('Fast serialization (serialization completes before render)', () => { + test('initial HTML contains router bootstrap + barrier', async ({ page }) => { + let responseHtml = '' + await page.route('/fast-serial', async (route) => { + const response = await route.fetch() + responseHtml = await response.text() + await route.fulfill({ response }) + }) + + await page.goto('/fast-serial') + await expect(page.getByTestId('server-data')).toBeVisible() + + expectRouterHydrationMarkers(responseHtml) + }) + + test('renders all server data', async ({ page }) => { + await page.goto('/fast-serial') + await page.waitForLoadState('networkidle') + + // All data should be visible + await expect(page.getByTestId('server-data')).toContainText('small-data') + await expect(page.getByTestId('static-data')).toContainText( + 'This is static data', + ) + await expect(page.getByTestId('loader-timestamp')).toBeVisible() + + // Verify the loader and server function ran during SSR. + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + await expect(page.getByTestId('server-fn-source')).toContainText( + 'Server function source: server', + ) + }) + + testWithHydration('hydration works correctly', async ({ page }) => { + await page.goto('/fast-serial') + await page.waitForLoadState('networkidle') + + // Verify data came from server after hydration + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + }) + + test('direct navigation renders correctly', async ({ page }) => { + // Direct navigation (SSR) + await page.goto('/fast-serial') + + // Should render without errors and show server source + await expect(page.getByTestId('server-data')).toBeVisible() + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + }) + + test('client-side navigation works', async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via nav link + await page.getByRole('link', { name: 'Fast Serial' }).first().click() + await expect(page).toHaveURL('/fast-serial') + + await expect(page.getByTestId('server-data')).toContainText('small-data') + }) +}) diff --git a/e2e/streaming-ssr-specs/home.ts b/e2e/streaming-ssr-specs/home.ts new file mode 100644 index 0000000000..d85e19bfa7 --- /dev/null +++ b/e2e/streaming-ssr-specs/home.ts @@ -0,0 +1,34 @@ +import { expect, test, testWithHydration } from '../streaming-ssr-assertions' + +test.describe('Home page', () => { + testWithHydration( + 'renders index page with all navigation links', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + await expect(page.getByTestId('index-title')).toContainText( + 'Streaming SSR Test Scenarios', + ) + // Check links exist (they're in the nav and the body) + await expect( + page.getByRole('link', { name: 'Deferred' }).first(), + ).toBeVisible() + await expect( + page.getByRole('link', { name: 'Stream' }).first(), + ).toBeVisible() + }, + ) + + testWithHydration( + 'navigation from home to routes works', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Use the link in the content (not nav) + await page.getByTestId('link-deferred').click() + await expect(page).toHaveURL('/deferred') + }, + ) +}) diff --git a/e2e/streaming-ssr-specs/many-promises.ts b/e2e/streaming-ssr-specs/many-promises.ts new file mode 100644 index 0000000000..768859c7e4 --- /dev/null +++ b/e2e/streaming-ssr-specs/many-promises.ts @@ -0,0 +1,82 @@ +import { expect, test, testWithHydration } from '../streaming-ssr-assertions' + +test.describe('Many promises streaming (15 deferred)', () => { + test('all 15 promises eventually resolve', async ({ page }) => { + await page.goto('/many-promises') + + // Immediate group (0-20ms) + await expect(page.getByTestId('immediate-1')).toContainText('immediate-1', { + timeout: 5000, + }) + await expect(page.getByTestId('immediate-2')).toContainText('immediate-2', { + timeout: 5000, + }) + await expect(page.getByTestId('immediate-3')).toContainText('immediate-3', { + timeout: 5000, + }) + + // Fast group (50-125ms) + await expect(page.getByTestId('fast-1')).toContainText('fast-1', { + timeout: 5000, + }) + await expect(page.getByTestId('fast-2')).toContainText('fast-2', { + timeout: 5000, + }) + await expect(page.getByTestId('fast-3')).toContainText('fast-3', { + timeout: 5000, + }) + await expect(page.getByTestId('fast-4')).toContainText('fast-4', { + timeout: 5000, + }) + + // Medium group (150-250ms) + await expect(page.getByTestId('medium-1')).toContainText('medium-1', { + timeout: 5000, + }) + await expect(page.getByTestId('medium-2')).toContainText('medium-2', { + timeout: 5000, + }) + await expect(page.getByTestId('medium-3')).toContainText('medium-3', { + timeout: 5000, + }) + + // Slow group (300-500ms) + await expect(page.getByTestId('slow-1')).toContainText('slow-1', { + timeout: 5000, + }) + await expect(page.getByTestId('slow-2')).toContainText('slow-2', { + timeout: 5000, + }) + await expect(page.getByTestId('slow-3')).toContainText('slow-3', { + timeout: 5000, + }) + + // Very slow group (600-800ms) + await expect(page.getByTestId('very-slow-1')).toContainText('very-slow-1', { + timeout: 5000, + }) + await expect(page.getByTestId('very-slow-2')).toContainText('very-slow-2', { + timeout: 5000, + }) + }) + + testWithHydration('hydration works with many promises', async ({ page }) => { + await page.goto('/many-promises') + await page.waitForLoadState('networkidle') + + // Wait for all promises to resolve + await expect(page.getByTestId('very-slow-2')).toBeVisible({ timeout: 5000 }) + }) + + test('client-side navigation works', async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via nav link + await page.getByRole('link', { name: 'Many Promises' }).click() + await expect(page).toHaveURL('/many-promises') + + // All promises should eventually resolve + await expect(page.getByTestId('very-slow-2')).toBeVisible({ timeout: 5000 }) + }) +}) diff --git a/e2e/streaming-ssr-specs/nested-deferred.ts b/e2e/streaming-ssr-specs/nested-deferred.ts new file mode 100644 index 0000000000..0146a23162 --- /dev/null +++ b/e2e/streaming-ssr-specs/nested-deferred.ts @@ -0,0 +1,52 @@ +import { expect, test, testWithHydration } from '../streaming-ssr-assertions' + +test.describe('Nested deferred (multiple levels of deferred data)', () => { + test('all levels of deferred data eventually resolve', async ({ page }) => { + await page.goto('/nested-deferred') + + // All deferred values should eventually resolve. + await expect(page.getByTestId('plain-deferred')).toContainText( + 'Plain deferred resolved!', + { timeout: 5000 }, + ) + + await expect(page.getByTestId('level1-data')).toContainText('Level 1:', { + timeout: 5000, + }) + + await expect(page.getByTestId('level2-data')).toContainText('Level 2:', { + timeout: 5000, + }) + + await expect(page.getByTestId('level3-data')).toContainText('Level 3:', { + timeout: 5000, + }) + }) + + testWithHydration( + 'hydration works with nested deferred', + async ({ page }) => { + await page.goto('/nested-deferred') + await page.waitForLoadState('networkidle') + + // Wait for all data + await expect(page.getByTestId('level3-data')).toBeVisible({ + timeout: 10000, + }) + }, + ) + + test('client-side navigation works', async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via nav link + await page.getByRole('link', { name: 'Nested Deferred' }).first().click() + await expect(page).toHaveURL('/nested-deferred') + + // All levels should eventually render + await expect(page.getByTestId('level3-data')).toBeVisible({ + timeout: 10000, + }) + }) +}) diff --git a/e2e/streaming-ssr-specs/preview-streaming.ts b/e2e/streaming-ssr-specs/preview-streaming.ts new file mode 100644 index 0000000000..5087dff730 --- /dev/null +++ b/e2e/streaming-ssr-specs/preview-streaming.ts @@ -0,0 +1,13 @@ +import { + expectDeferredRouteResponseOrder, + test, +} from '../streaming-ssr-assertions' + +test.skip( + process.env.MODE !== 'preview', + 'Only runs against vite preview: pnpm test:e2e:preview', +) + +test('vite preview preserves deferred HTML order', async ({ baseURL }) => { + await expectDeferredRouteResponseOrder(baseURL) +}) diff --git a/e2e/streaming-ssr-specs/query-heavy.ts b/e2e/streaming-ssr-specs/query-heavy.ts new file mode 100644 index 0000000000..b33a64f366 --- /dev/null +++ b/e2e/streaming-ssr-specs/query-heavy.ts @@ -0,0 +1,142 @@ +import { + expect, + expectQueryHeavyRouteStreamOrder, + test, + testWithHydration, +} from '../streaming-ssr-assertions' + +test.describe('Query heavy route (9 queries)', () => { + test('emits the complete router stream before document closes', async ({ + baseURL, + }) => { + await expectQueryHeavyRouteStreamOrder(baseURL) + }) + + test('all queries resolve with server data', async ({ page }) => { + await page.goto('/query-heavy') + + // Sync queries should show server source + await expect(page.getByTestId('sync-query-1')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('sync-query-2')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('sync-query-3')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + + // Fast async queries should show server source + await expect(page.getByTestId('fast-async-query-1')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('fast-async-query-2')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('fast-async-query-3')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + + // Slow async queries should show server source + await expect(page.getByTestId('slow-async-query-1')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('slow-async-query-2')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('slow-async-query-3')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + }) + + test('sync queries have correct values', async ({ page }) => { + await page.goto('/query-heavy') + + await expect(page.getByTestId('sync-query-1')).toContainText('sync-value-1') + await expect(page.getByTestId('sync-query-2')).toContainText('sync-value-2') + await expect(page.getByTestId('sync-query-3')).toContainText('sync-value-3') + }) + + test('async queries have correct values', async ({ page }) => { + await page.goto('/query-heavy') + + await expect(page.getByTestId('fast-async-query-1')).toContainText( + 'fast-async-1', + { timeout: 5000 }, + ) + await expect(page.getByTestId('fast-async-query-2')).toContainText( + 'fast-async-2', + { timeout: 5000 }, + ) + await expect(page.getByTestId('fast-async-query-3')).toContainText( + 'fast-async-3', + { timeout: 5000 }, + ) + + await expect(page.getByTestId('slow-async-query-1')).toContainText( + 'slow-async-1', + { timeout: 5000 }, + ) + await expect(page.getByTestId('slow-async-query-2')).toContainText( + 'slow-async-2', + { timeout: 5000 }, + ) + await expect(page.getByTestId('slow-async-query-3')).toContainText( + 'slow-async-3', + { timeout: 5000 }, + ) + }) + + testWithHydration('hydration works with many queries', async ({ page }) => { + await page.goto('/query-heavy') + await page.waitForLoadState('networkidle') + + // Wait for all queries to resolve + await expect(page.getByTestId('slow-async-query-3')).toBeVisible({ + timeout: 5000, + }) + }) + + test('client-side navigation works', async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via nav link + await page.getByRole('link', { name: 'Query Heavy' }).click() + await expect(page).toHaveURL('/query-heavy') + + // All queries should eventually resolve (on client) + await expect(page.getByTestId('slow-async-query-3')).toBeVisible({ + timeout: 5000, + }) + }) + + test('server query data hydrates without client refetch', async ({ + page, + }) => { + // If hydration missed the server data, these queries would re-execute on + // the client and show "client" as their source. + await page.goto('/query-heavy') + + // Wait for all queries + await expect(page.getByTestId('slow-async-query-3')).toBeVisible({ + timeout: 5000, + }) + + // Verify that all server results hydrated without a client refetch. + const serverSourceCount = await page + .locator('[data-testid*="query-"]') + .filter({ hasText: 'source: server' }) + .count() + expect(serverSourceCount).toBe(9) + }) +}) diff --git a/e2e/streaming-ssr-specs/slow-render.ts b/e2e/streaming-ssr-specs/slow-render.ts new file mode 100644 index 0000000000..117559701e --- /dev/null +++ b/e2e/streaming-ssr-specs/slow-render.ts @@ -0,0 +1,71 @@ +import { expect, test, testWithHydration } from '../streaming-ssr-assertions' + +test.describe('Slow render (render takes longer than serialization)', () => { + test('all data eventually renders with server source', async ({ page }) => { + await page.goto('/slow-render') + await page.waitForLoadState('networkidle') + + // Quick data should be available with server source + await expect(page.getByTestId('quick-data')).toContainText('Quick:') + await expect(page.getByTestId('quick-source')).toContainText( + 'Quick data source: server', + ) + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + + // Deferred data should resolve with server source + await expect(page.getByTestId('deferred-resolved')).toContainText( + 'Deferred resolved!', + { timeout: 5000 }, + ) + await expect(page.getByTestId('deferred-resolved')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + + // Slow components should have rendered + await expect(page.getByTestId('slow-component-1')).toBeVisible() + await expect(page.getByTestId('slow-component-2')).toBeVisible() + await expect(page.getByTestId('slow-component-3')).toBeVisible() + }) + + testWithHydration('hydration works after slow render', async ({ page }) => { + await page.goto('/slow-render') + await page.waitForLoadState('networkidle') + + // Wait for content and verify server source + await expect(page.getByTestId('slow-component-1')).toBeVisible() + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + }) + + test('client-side navigation works', async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via nav link + await page.getByRole('link', { name: 'Slow Render' }).first().click() + await expect(page).toHaveURL('/slow-render') + + await expect(page.getByTestId('quick-data')).toBeVisible({ timeout: 10000 }) + }) + + test('all data sources are server', async ({ page }) => { + await page.goto('/slow-render') + await page.waitForLoadState('networkidle') + + // Wait for deferred content + await expect(page.getByTestId('deferred-resolved')).toBeVisible({ + timeout: 5000, + }) + + // Verify all sources are server + await expect(page.getByTestId('quick-source')).toContainText('server') + await expect(page.getByTestId('loader-source')).toContainText('server') + await expect(page.getByTestId('deferred-resolved')).toContainText( + 'source: server', + ) + }) +}) diff --git a/e2e/streaming-ssr-specs/stream.ts b/e2e/streaming-ssr-specs/stream.ts new file mode 100644 index 0000000000..ee61f170de --- /dev/null +++ b/e2e/streaming-ssr-specs/stream.ts @@ -0,0 +1,55 @@ +import { expect, test, testWithHydration } from '../streaming-ssr-assertions' + +const expectedStreamChunks = [ + 'chunk-0', + 'chunk-1', + 'chunk-2', + 'chunk-3', + 'chunk-4', +] + +test.describe('ReadableStream deserialization', () => { + testWithHydration('promise data deserializes correctly', async ({ page }) => { + await page.goto('/stream') + + await expect(page.getByTestId('promise-data')).toContainText( + 'promise-resolved', + { timeout: 5000 }, + ) + }) + + testWithHydration( + 'stream chunks deserialize in source order', + async ({ page }) => { + await page.goto('/stream') + + await expect(page.getByTestId('stream-complete')).toBeVisible({ + timeout: 10000, + }) + + const chunks = page + .getByTestId('stream-data') + .locator('[data-testid^="stream-chunk-"]') + await expect(chunks).toHaveText(expectedStreamChunks) + + // This browser assertion covers deserialization and source order. The + // raw `/deferred` assertion covers server-response and router ordering. + }, + ) + + testWithHydration( + 'client-side navigation to stream route works', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via nav link + await page.getByRole('link', { name: 'Stream' }).first().click() + await expect(page).toHaveURL('/stream') + + await expect(page.getByTestId('stream-complete')).toBeVisible({ + timeout: 10000, + }) + }, + ) +}) diff --git a/e2e/streaming-ssr-specs/sync-only.ts b/e2e/streaming-ssr-specs/sync-only.ts new file mode 100644 index 0000000000..9850265109 --- /dev/null +++ b/e2e/streaming-ssr-specs/sync-only.ts @@ -0,0 +1,80 @@ +import { + expect, + expectRouterHydrationMarkers, + test, + testWithHydration, +} from '../streaming-ssr-assertions' + +/** + * Tests for synchronous serialization - no deferred data, no streaming. + * This is the most common case where all loader data is immediately available. + * The hydration scripts should be included in the initial HTML response. + */ + +test('Sync-only route renders with loader data', async ({ page }) => { + await page.goto('/sync-only') + + // Verify the page content is rendered + await expect(page.getByTestId('sync-title')).toContainText( + 'Synchronous Serialization Test', + ) + await expect(page.getByTestId('sync-message')).toContainText( + 'Hello from sync loader!', + ) + + // Verify loader data items are rendered + await expect(page.getByTestId('sync-item-item-1')).toBeVisible() + await expect(page.getByTestId('sync-item-item-2')).toBeVisible() + await expect(page.getByTestId('sync-item-item-3')).toBeVisible() + + // Verify the loader ran during SSR. + await expect(page.getByTestId('sync-source')).toContainText('Source: server') +}) + +testWithHydration('Sync-only route hydrates correctly', async ({ page }) => { + await page.goto('/sync-only') + + // Verify client-side navigation works (proves hydration succeeded) + await page.getByRole('navigation').getByRole('link', { name: 'Home' }).click() + await expect(page.getByTestId('index-title')).toBeVisible() + + // Navigate back to sync-only via client-side navigation (use nav link to be specific) + await page + .getByRole('navigation') + .getByRole('link', { name: 'Sync Only' }) + .click() + await expect(page.getByTestId('sync-title')).toBeVisible() +}) + +test('Sync-only route has bootstrap scripts in initial HTML', async ({ + page, +}) => { + // Intercept the response to check the raw HTML + let responseHtml = '' + await page.route('/sync-only', async (route) => { + const response = await route.fetch() + responseHtml = await response.text() + await route.fulfill({ response }) + }) + + await page.goto('/sync-only') + + // Wait for page to load + await expect(page.getByTestId('sync-title')).toBeVisible() + + // Bootstrap, end record, and the boundary rendered by . + expectRouterHydrationMarkers(responseHtml) +}) + +test('Navigating to sync-only from home page', async ({ page }) => { + await page.goto('/') + + await page.getByTestId('link-sync-only').click() + + await expect(page.getByTestId('sync-title')).toContainText( + 'Synchronous Serialization Test', + ) + await expect(page.getByTestId('sync-message')).toContainText( + 'Hello from sync loader!', + ) +}) diff --git a/e2e/vue-start/streaming-ssr/package.json b/e2e/vue-start/streaming-ssr/package.json new file mode 100644 index 0000000000..42d311824e --- /dev/null +++ b/e2e/vue-start/streaming-ssr/package.json @@ -0,0 +1,59 @@ +{ + "name": "tanstack-vue-start-e2e-streaming-ssr", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "pnpx srvx --prod -s ../client dist/server/server.js", + "preview": "vite preview", + "test:e2e": "playwright test --project=chromium", + "test:e2e:preview": "MODE=preview playwright test preview-streaming.spec.ts --project=chromium" + }, + "dependencies": { + "@tanstack/vue-query": "^5.90.0", + "@tanstack/vue-router": "workspace:^", + "@tanstack/vue-router-ssr-query": "workspace:^", + "@tanstack/vue-start": "workspace:^", + "vue": "^3.5.16" + }, + "devDependencies": { + "@playwright/test": "^1.61.0", + "@tanstack/router-e2e-utils": "workspace:^", + "@types/node": "^22.10.2", + "@vitejs/plugin-vue-jsx": "^5.1.5", + "srvx": "^0.11.9", + "@typescript/native": "npm:typescript@^7.0.2", + "typescript": "npm:@typescript/typescript6@^6.0.2", + "vite": "^8.0.14" + }, + "nx": { + "targets": { + "build": { + "inputs": [ + "buildProduction", + "^buildProduction", + "dependentTaskOutputs", + "streamingSsrTests" + ] + }, + "test:e2e": { + "inputs": [ + "default", + "^production", + "dependentTaskOutputs", + "streamingSsrTests" + ] + }, + "test:e2e:preview": { + "inputs": [ + "default", + "^production", + "streamingSsrTests" + ] + } + } + } +} diff --git a/e2e/vue-start/streaming-ssr/playwright.config.ts b/e2e/vue-start/streaming-ssr/playwright.config.ts new file mode 100644 index 0000000000..c2f3b67a0c --- /dev/null +++ b/e2e/vue-start/streaming-ssr/playwright.config.ts @@ -0,0 +1,39 @@ +import { defineConfig, devices } from '@playwright/test' +import { appServerReady } from '@tanstack/router-e2e-utils' + +const isPreview = process.env.MODE === 'preview' + +const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const baseURL = `http://localhost:${PORT}` + +const ssrCommand = `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start` +const previewCommand = `VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}` + +/** + * See https://playwright.dev/docs/test-configuration. + */ +export default defineConfig({ + testDir: './tests', + workers: 1, + + reporter: [['line']], + + use: { + /* Base URL to use in actions like `await page.goto('/')`. */ + baseURL, + }, + + webServer: { + command: isPreview ? previewCommand : ssrCommand, + wait: appServerReady, + reuseExistingServer: false, + stdout: 'pipe', + }, + + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/vue-start/streaming-ssr/src/routeTree.gen.ts b/e2e/vue-start/streaming-ssr/src/routeTree.gen.ts new file mode 100644 index 0000000000..ac4c9ab156 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routeTree.gen.ts @@ -0,0 +1,282 @@ +/* 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 IndexRouteImport } from './routes/index' +import { Route as ConcurrentRouteImport } from './routes/concurrent' +import { Route as DeferredRouteImport } from './routes/deferred' +import { Route as DeferredRejectionRouteImport } from './routes/deferred-rejection' +import { Route as FastSerialRouteImport } from './routes/fast-serial' +import { Route as ManyPromisesRouteImport } from './routes/many-promises' +import { Route as NestedDeferredRouteImport } from './routes/nested-deferred' +import { Route as QueryHeavyRouteImport } from './routes/query-heavy' +import { Route as SlowRenderRouteImport } from './routes/slow-render' +import { Route as StreamRouteImport } from './routes/stream' +import { Route as SyncOnlyRouteImport } from './routes/sync-only' + +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) +const ConcurrentRoute = ConcurrentRouteImport.update({ + id: '/concurrent', + path: '/concurrent', + getParentRoute: () => rootRouteImport, +} as any) +const DeferredRoute = DeferredRouteImport.update({ + id: '/deferred', + path: '/deferred', + getParentRoute: () => rootRouteImport, +} as any) +const DeferredRejectionRoute = DeferredRejectionRouteImport.update({ + id: '/deferred-rejection', + path: '/deferred-rejection', + getParentRoute: () => rootRouteImport, +} as any) +const FastSerialRoute = FastSerialRouteImport.update({ + id: '/fast-serial', + path: '/fast-serial', + getParentRoute: () => rootRouteImport, +} as any) +const ManyPromisesRoute = ManyPromisesRouteImport.update({ + id: '/many-promises', + path: '/many-promises', + getParentRoute: () => rootRouteImport, +} as any) +const NestedDeferredRoute = NestedDeferredRouteImport.update({ + id: '/nested-deferred', + path: '/nested-deferred', + getParentRoute: () => rootRouteImport, +} as any) +const QueryHeavyRoute = QueryHeavyRouteImport.update({ + id: '/query-heavy', + path: '/query-heavy', + getParentRoute: () => rootRouteImport, +} as any) +const SlowRenderRoute = SlowRenderRouteImport.update({ + id: '/slow-render', + path: '/slow-render', + getParentRoute: () => rootRouteImport, +} as any) +const StreamRoute = StreamRouteImport.update({ + id: '/stream', + path: '/stream', + getParentRoute: () => rootRouteImport, +} as any) +const SyncOnlyRoute = SyncOnlyRouteImport.update({ + id: '/sync-only', + path: '/sync-only', + getParentRoute: () => rootRouteImport, +} as any) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/concurrent': typeof ConcurrentRoute + '/deferred': typeof DeferredRoute + '/deferred-rejection': typeof DeferredRejectionRoute + '/fast-serial': typeof FastSerialRoute + '/many-promises': typeof ManyPromisesRoute + '/nested-deferred': typeof NestedDeferredRoute + '/query-heavy': typeof QueryHeavyRoute + '/slow-render': typeof SlowRenderRoute + '/stream': typeof StreamRoute + '/sync-only': typeof SyncOnlyRoute +} +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/concurrent': typeof ConcurrentRoute + '/deferred': typeof DeferredRoute + '/deferred-rejection': typeof DeferredRejectionRoute + '/fast-serial': typeof FastSerialRoute + '/many-promises': typeof ManyPromisesRoute + '/nested-deferred': typeof NestedDeferredRoute + '/query-heavy': typeof QueryHeavyRoute + '/slow-render': typeof SlowRenderRoute + '/stream': typeof StreamRoute + '/sync-only': typeof SyncOnlyRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/': typeof IndexRoute + '/concurrent': typeof ConcurrentRoute + '/deferred': typeof DeferredRoute + '/deferred-rejection': typeof DeferredRejectionRoute + '/fast-serial': typeof FastSerialRoute + '/many-promises': typeof ManyPromisesRoute + '/nested-deferred': typeof NestedDeferredRoute + '/query-heavy': typeof QueryHeavyRoute + '/slow-render': typeof SlowRenderRoute + '/stream': typeof StreamRoute + '/sync-only': typeof SyncOnlyRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/' + | '/concurrent' + | '/deferred' + | '/deferred-rejection' + | '/fast-serial' + | '/many-promises' + | '/nested-deferred' + | '/query-heavy' + | '/slow-render' + | '/stream' + | '/sync-only' + fileRoutesByTo: FileRoutesByTo + to: + | '/' + | '/concurrent' + | '/deferred' + | '/deferred-rejection' + | '/fast-serial' + | '/many-promises' + | '/nested-deferred' + | '/query-heavy' + | '/slow-render' + | '/stream' + | '/sync-only' + id: + | '__root__' + | '/' + | '/concurrent' + | '/deferred' + | '/deferred-rejection' + | '/fast-serial' + | '/many-promises' + | '/nested-deferred' + | '/query-heavy' + | '/slow-render' + | '/stream' + | '/sync-only' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + ConcurrentRoute: typeof ConcurrentRoute + DeferredRoute: typeof DeferredRoute + DeferredRejectionRoute: typeof DeferredRejectionRoute + FastSerialRoute: typeof FastSerialRoute + ManyPromisesRoute: typeof ManyPromisesRoute + NestedDeferredRoute: typeof NestedDeferredRoute + QueryHeavyRoute: typeof QueryHeavyRoute + SlowRenderRoute: typeof SlowRenderRoute + StreamRoute: typeof StreamRoute + SyncOnlyRoute: typeof SyncOnlyRoute +} + +declare module '@tanstack/vue-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + '/concurrent': { + id: '/concurrent' + path: '/concurrent' + fullPath: '/concurrent' + preLoaderRoute: typeof ConcurrentRouteImport + parentRoute: typeof rootRouteImport + } + '/deferred': { + id: '/deferred' + path: '/deferred' + fullPath: '/deferred' + preLoaderRoute: typeof DeferredRouteImport + parentRoute: typeof rootRouteImport + } + '/deferred-rejection': { + id: '/deferred-rejection' + path: '/deferred-rejection' + fullPath: '/deferred-rejection' + preLoaderRoute: typeof DeferredRejectionRouteImport + parentRoute: typeof rootRouteImport + } + '/fast-serial': { + id: '/fast-serial' + path: '/fast-serial' + fullPath: '/fast-serial' + preLoaderRoute: typeof FastSerialRouteImport + parentRoute: typeof rootRouteImport + } + '/many-promises': { + id: '/many-promises' + path: '/many-promises' + fullPath: '/many-promises' + preLoaderRoute: typeof ManyPromisesRouteImport + parentRoute: typeof rootRouteImport + } + '/nested-deferred': { + id: '/nested-deferred' + path: '/nested-deferred' + fullPath: '/nested-deferred' + preLoaderRoute: typeof NestedDeferredRouteImport + parentRoute: typeof rootRouteImport + } + '/query-heavy': { + id: '/query-heavy' + path: '/query-heavy' + fullPath: '/query-heavy' + preLoaderRoute: typeof QueryHeavyRouteImport + parentRoute: typeof rootRouteImport + } + '/slow-render': { + id: '/slow-render' + path: '/slow-render' + fullPath: '/slow-render' + preLoaderRoute: typeof SlowRenderRouteImport + parentRoute: typeof rootRouteImport + } + '/stream': { + id: '/stream' + path: '/stream' + fullPath: '/stream' + preLoaderRoute: typeof StreamRouteImport + parentRoute: typeof rootRouteImport + } + '/sync-only': { + id: '/sync-only' + path: '/sync-only' + fullPath: '/sync-only' + preLoaderRoute: typeof SyncOnlyRouteImport + parentRoute: typeof rootRouteImport + } + } +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + ConcurrentRoute: ConcurrentRoute, + DeferredRoute: DeferredRoute, + DeferredRejectionRoute: DeferredRejectionRoute, + FastSerialRoute: FastSerialRoute, + ManyPromisesRoute: ManyPromisesRoute, + NestedDeferredRoute: NestedDeferredRoute, + QueryHeavyRoute: QueryHeavyRoute, + SlowRenderRoute: SlowRenderRoute, + StreamRoute: StreamRoute, + SyncOnlyRoute: SyncOnlyRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +import type { getRouter } from './router.tsx' +import type { createStart } from '@tanstack/vue-start' +declare module '@tanstack/vue-start' { + interface Register { + ssr: true + router: Awaited> + } +} diff --git a/e2e/vue-start/streaming-ssr/src/router.tsx b/e2e/vue-start/streaming-ssr/src/router.tsx new file mode 100644 index 0000000000..257eb8dac9 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/router.tsx @@ -0,0 +1,18 @@ +import { QueryClient } from '@tanstack/vue-query' +import { createRouter } from '@tanstack/vue-router' +import { setupRouterSsrQueryIntegration } from '@tanstack/vue-router-ssr-query' +import { routeTree } from './routeTree.gen' + +export function getRouter() { + const queryClient = new QueryClient() + const router = createRouter({ + routeTree, + context: { queryClient }, + scrollRestoration: true, + }) + setupRouterSsrQueryIntegration({ + router, + queryClient, + }) + return router +} diff --git a/e2e/vue-start/streaming-ssr/src/routes/__root.tsx b/e2e/vue-start/streaming-ssr/src/routes/__root.tsx new file mode 100644 index 0000000000..d3b3339720 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routes/__root.tsx @@ -0,0 +1,103 @@ +import { + Body, + HeadContent, + Html, + Link, + Outlet, + Scripts, + createRootRouteWithContext, +} from '@tanstack/vue-router' +import { defineComponent, ref } from 'vue' +import type { QueryClient } from '@tanstack/vue-query' + +export const Route = createRootRouteWithContext<{ + queryClient: QueryClient +}>()({ + head: () => ({ + meta: [ + { charSet: 'utf-8' }, + { name: 'viewport', content: 'width=device-width, initial-scale=1' }, + { title: 'Streaming SSR Tests' }, + ], + }), + component: RootComponent, +}) + +function RootComponent() { + return ( + + + + + + + + + + + + ) +} + +const HydrationCheck = defineComponent({ + setup() { + const status = ref<'pending' | 'hydrated'>('pending') + + return () => ( +
+ + + {status.value} + +
+ ) + }, +}) diff --git a/e2e/vue-start/streaming-ssr/src/routes/concurrent.tsx b/e2e/vue-start/streaming-ssr/src/routes/concurrent.tsx new file mode 100644 index 0000000000..5fed8ab517 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routes/concurrent.tsx @@ -0,0 +1,54 @@ +import { Await, createFileRoute } from '@tanstack/vue-router' +import { Suspense } from 'vue' +import { createConcurrentLoaderData } from '../../../../streaming-ssr-fixtures' + +export const Route = createFileRoute('/concurrent')({ + loader: async () => createConcurrentLoaderData(), + component: Concurrent, +}) + +function PromiseItem(props: { promise: Promise; testId: string }) { + return ( + + {{ + default: () => ( + ( +
{value}
+ )} + /> + ), + fallback: () => ( +
Loading...
+ ), + }} +
+ ) +} + +function Concurrent() { + const data = Route.useLoaderData() + + return ( +
+

Concurrent Resolution Test (15 promises in 3 batches)

+

Tests multiple promises resolving at the exact same instant.

+ + + + + + + + + + + + + + + +
+ ) +} diff --git a/e2e/vue-start/streaming-ssr/src/routes/deferred-rejection.tsx b/e2e/vue-start/streaming-ssr/src/routes/deferred-rejection.tsx new file mode 100644 index 0000000000..5018f9e07c --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routes/deferred-rejection.tsx @@ -0,0 +1,49 @@ +import { Await, createFileRoute } from '@tanstack/vue-router' +import { Suspense } from 'vue' +import { + deferredDataDelay, + deferredErrorMessage, +} from '../../../../streaming-ssr-fixtures' + +export const Route = createFileRoute('/deferred-rejection')({ + loader: async () => { + return { + deferredData: new Promise((_resolve, reject) => { + setTimeout(() => { + reject(new Error(deferredErrorMessage)) + }, deferredDataDelay) + }), + } + }, + errorComponent: ({ error }) => ( +
+ {error instanceof Error ? error.message : String(error)} +
+ ), + component: DeferredRejection, +}) + +function DeferredRejection() { + const data = Route.useLoaderData() + + return ( +
+

Deferred Rejection Test

+ + {{ + default: () => ( + ( +
{value}
+ )} + /> + ), + fallback: () => ( +
Loading deferred...
+ ), + }} +
+
+ ) +} diff --git a/e2e/vue-start/streaming-ssr/src/routes/deferred.tsx b/e2e/vue-start/streaming-ssr/src/routes/deferred.tsx new file mode 100644 index 0000000000..6a8affe1b4 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routes/deferred.tsx @@ -0,0 +1,100 @@ +import { Await, createFileRoute } from '@tanstack/vue-router' +import { createServerFn } from '@tanstack/vue-start' +import { Suspense } from 'vue' +import { + deferredDataDelay, + deferredDataMessage, + deferredImmediateName, + deferredServerDelay, + deferredSlowName, + delay, + makeDeferredMessage, + makeServerData, + sourceMarker, +} from '../../../../streaming-ssr-fixtures' + +const getImmediateData = createServerFn({ method: 'GET' }) + .validator((data: { name: string }) => data) + .handler(({ data }) => makeServerData(data.name)) + +const getSlowData = createServerFn({ method: 'GET' }) + .validator((data: { name: string; delay: number }) => data) + .handler(async ({ data }) => { + await delay(data.delay) + return makeServerData(data.name) + }) + +export const Route = createFileRoute('/deferred')({ + loader: async () => { + return { + deferredData: makeDeferredMessage(deferredDataMessage, deferredDataDelay), + deferredServerData: getSlowData({ + data: { name: deferredSlowName, delay: deferredServerDelay }, + }), + immediateData: await getImmediateData({ + data: { name: deferredImmediateName }, + }), + loaderSource: sourceMarker(), + } + }, + component: Deferred, +}) + +function Deferred() { + const data = Route.useLoaderData() + + return ( +
+

Deferred Data Test

+
+ Immediate: {data.value.immediateData.name} @{' '} + {data.value.immediateData.timestamp} +
+
+ Immediate source: {data.value.immediateData.source} +
+
+ Loader source: {data.value.loaderSource} +
+ + {{ + default: () => ( + ( +
+ {value.message} (source: {value.source}) +
+ )} + /> + ), + fallback: () => ( +
Loading deferred...
+ ), + }} +
+ + {{ + default: () => ( + ( +
+ Server: {value.name} @ {value.timestamp} (source:{' '} + {value.source}) +
+ )} + /> + ), + fallback: () => ( +
Loading server data...
+ ), + }} +
+
+ ) +} diff --git a/e2e/vue-start/streaming-ssr/src/routes/fast-serial.tsx b/e2e/vue-start/streaming-ssr/src/routes/fast-serial.tsx new file mode 100644 index 0000000000..ac004b041c --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routes/fast-serial.tsx @@ -0,0 +1,49 @@ +import { createFileRoute } from '@tanstack/vue-router' +import { createServerFn } from '@tanstack/vue-start' +import { + fastSerialStaticData, + makeFastSerialSmallData, + sourceMarker, +} from '../../../../streaming-ssr-fixtures' + +const getSmallData = createServerFn({ method: 'GET' }).handler(() => + makeFastSerialSmallData(), +) + +export const Route = createFileRoute('/fast-serial')({ + loader: async () => { + const data = await getSmallData() + return { + serverData: data, + staticData: fastSerialStaticData, + timestamp: Date.now(), + loaderSource: sourceMarker(), + } + }, + component: FastSerial, +}) + +function FastSerial() { + const data = Route.useLoaderData() + + return ( +
+

Fast Serialization Test

+

This route tests when serialization completes before render.

+
+ Server: {data.value.serverData.value} @{' '} + {data.value.serverData.timestamp} +
+
+ Server function source: {data.value.serverData.source} +
+
+ Loader source: {data.value.loaderSource} +
+
Static: {data.value.staticData}
+
+ Loader timestamp: {data.value.timestamp} +
+
+ ) +} diff --git a/e2e/vue-start/streaming-ssr/src/routes/index.tsx b/e2e/vue-start/streaming-ssr/src/routes/index.tsx new file mode 100644 index 0000000000..0350eb5d4a --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routes/index.tsx @@ -0,0 +1,58 @@ +import { Link, createFileRoute } from '@tanstack/vue-router' + +export const Route = createFileRoute('/')({ + component: Index, +}) + +function Index() { + return ( +
+

Streaming SSR Test Scenarios

+

This e2e project tests various SSR streaming scenarios:

+
    +
  • + + Sync Only + {' '} + - Tests synchronous serialization with no deferred/streaming data +
  • +
  • + + Deferred Data + {' '} + - Tests deferred promises resolving after initial render +
  • +
  • + + Deferred Rejection + {' '} + - Tests deferred promise rejections render through the error boundary +
  • +
  • + + ReadableStream + {' '} + - Tests streaming data via ReadableStream +
  • +
  • + + Fast Serialization + {' '} + - Tests when serialization completes before render finishes +
  • +
  • + + Slow Render + {' '} + - Tests when render takes longer than serialization +
  • +
  • + + Nested Deferred + {' '} + - Tests nested components with deferred data +
  • +
+
+ ) +} diff --git a/e2e/vue-start/streaming-ssr/src/routes/many-promises.tsx b/e2e/vue-start/streaming-ssr/src/routes/many-promises.tsx new file mode 100644 index 0000000000..4361696107 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routes/many-promises.tsx @@ -0,0 +1,94 @@ +import { Await, createFileRoute } from '@tanstack/vue-router' +import { Suspense } from 'vue' +import { createManyPromises } from '../../../../streaming-ssr-fixtures' + +export const Route = createFileRoute('/many-promises')({ + loader: async () => createManyPromises(), + component: ManyPromises, +}) + +function PromiseItem(props: { + promise: Promise + testId: string + label: string +}) { + return ( + + {{ + default: () => ( + ( +
+ {props.label}: {value} +
+ )} + /> + ), + fallback: () => ( +
+ Loading {props.label}... +
+ ), + }} +
+ ) +} + +function ManyPromises() { + const data = Route.useLoaderData() + + return ( +
+

Many Promises Test (15 deferred)

+

Tests streaming with many concurrent deferred promises.

+ + + + + + + + + + + + + + + +
+ ) +} diff --git a/e2e/vue-start/streaming-ssr/src/routes/nested-deferred.tsx b/e2e/vue-start/streaming-ssr/src/routes/nested-deferred.tsx new file mode 100644 index 0000000000..b24336ec40 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routes/nested-deferred.tsx @@ -0,0 +1,143 @@ +import { Await, createFileRoute } from '@tanstack/vue-router' +import { createServerFn } from '@tanstack/vue-start' +import { Suspense } from 'vue' +import { + delay, + makeDeferred, + makeLevelData, + nestedLevelDelays, + nestedPlainDelay, + nestedPlainMessage, +} from '../../../../streaming-ssr-fixtures' + +const getLevel1Data = createServerFn({ method: 'GET' }).handler(async () => { + await delay(nestedLevelDelays[0]) + return makeLevelData(1) +}) + +const getLevel2Data = createServerFn({ method: 'GET' }).handler(async () => { + await delay(nestedLevelDelays[1]) + return makeLevelData(2) +}) + +const getLevel3Data = createServerFn({ method: 'GET' }).handler(async () => { + await delay(nestedLevelDelays[2]) + return makeLevelData(3) +}) + +export const Route = createFileRoute('/nested-deferred')({ + loader: async () => { + return { + level1: getLevel1Data(), + level2: getLevel2Data(), + level3: getLevel3Data(), + plainDeferred: makeDeferred(nestedPlainMessage, nestedPlainDelay), + } + }, + component: NestedDeferred, +}) + +function Level2Content(props: { + level3: Promise<{ level: number; timestamp: number }> +}) { + return ( +
+ + {{ + default: () => ( + ( +
+ Level 3: {value.level} @ {value.timestamp} +
+ )} + /> + ), + fallback: () => ( +
Loading level 3...
+ ), + }} +
+
+ ) +} + +function Level1Content(props: { + level2: Promise<{ level: number; timestamp: number }> + level3: Promise<{ level: number; timestamp: number }> +}) { + return ( +
+ + {{ + default: () => ( + ( +
+ Level 2: {value.level} @ {value.timestamp} + +
+ )} + /> + ), + fallback: () => ( +
Loading level 2...
+ ), + }} +
+
+ ) +} + +function NestedDeferred() { + const data = Route.useLoaderData() + + return ( +
+

Nested Deferred Test

+

+ Tests multiple nested deferred promises resolving at different times. +

+ + {{ + default: () => ( + ( +
{value}
+ )} + /> + ), + fallback: () => ( +
Loading plain...
+ ), + }} +
+
+ + {{ + default: () => ( + ( +
+ Level 1: {value.level} @ {value.timestamp} + +
+ )} + /> + ), + fallback: () => ( +
Loading level 1...
+ ), + }} +
+
+
+ ) +} diff --git a/e2e/vue-start/streaming-ssr/src/routes/query-heavy.tsx b/e2e/vue-start/streaming-ssr/src/routes/query-heavy.tsx new file mode 100644 index 0000000000..b22154b78e --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routes/query-heavy.tsx @@ -0,0 +1,168 @@ +import { queryOptions, useQuery } from '@tanstack/vue-query' +import { createFileRoute } from '@tanstack/vue-router' +import { Suspense, defineComponent } from 'vue' +import type { PropType } from 'vue' + +import { + delay, + makeQueryData, + queryHeavyItems, +} from '../../../../streaming-ssr-fixtures' +import type { QueryData } from '../../../../streaming-ssr-fixtures' + +function makeQueryOptions(item: (typeof queryHeavyItems)[number]) { + return queryOptions({ + queryKey: ['streaming-ssr-query-heavy', item.type, item.id], + queryFn: async (): Promise => { + if (item.delayMs > 0) { + await delay(item.delayMs) + } + + return makeQueryData(item) + }, + staleTime: Infinity, + }) +} + +const syncQuery1 = makeQueryOptions(queryHeavyItems[0]) +const syncQuery2 = makeQueryOptions(queryHeavyItems[1]) +const syncQuery3 = makeQueryOptions(queryHeavyItems[2]) +const fastAsyncQuery1 = makeQueryOptions(queryHeavyItems[3]) +const fastAsyncQuery2 = makeQueryOptions(queryHeavyItems[4]) +const fastAsyncQuery3 = makeQueryOptions(queryHeavyItems[5]) +const slowAsyncQuery1 = makeQueryOptions(queryHeavyItems[6]) +const slowAsyncQuery2 = makeQueryOptions(queryHeavyItems[7]) +const slowAsyncQuery3 = makeQueryOptions(queryHeavyItems[8]) + +type QueryOptions = ReturnType + +const QueryDisplay = defineComponent({ + props: { + queryOpts: { + type: Object as PropType, + required: true, + }, + testId: { + type: String, + required: true, + }, + }, + async setup(props) { + const query = useQuery(props.queryOpts) + await query.suspense() + + return () => { + const data = query.data.value + + return ( +
+ {data?.value} (source: {data?.source}) +
+ ) + } + }, +}) + +function QuerySuspense(props: { + queryOpts: QueryOptions + testId: string + fallback: string +}) { + return ( + + {{ + default: () => ( + + ), + fallback: () => ( +
{props.fallback}
+ ), + }} +
+ ) +} + +const QueryHeavy = defineComponent({ + setup() { + return () => ( +
+

Query Heavy Test (9 useQuery calls)

+

Tests multiple useQuery with mixed sync/async queryFn.

+

+ All queries should show "source: server" if SSR streaming works + correctly. +

+ +
+
+

Sync Queries (immediate)

+ + + +
+ +
+

Fast Async Queries (50-100ms)

+ + + +
+ +
+

Slow Async Queries (200-400ms)

+ + + +
+
+
+ ) + }, +}) + +export const Route = createFileRoute('/query-heavy')({ + component: QueryHeavy, +}) diff --git a/e2e/vue-start/streaming-ssr/src/routes/slow-render.tsx b/e2e/vue-start/streaming-ssr/src/routes/slow-render.tsx new file mode 100644 index 0000000000..f897e03ff0 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routes/slow-render.tsx @@ -0,0 +1,77 @@ +import { Await, createFileRoute } from '@tanstack/vue-router' +import { createServerFn } from '@tanstack/vue-start' +import { Suspense } from 'vue' +import { + makeDeferredMessage, + makeServerData, + slowRenderComponents, + slowRenderDeferredDelay, + slowRenderDeferredMessage, + slowRenderQuickName, + sourceMarker, +} from '../../../../streaming-ssr-fixtures' + +const getQuickData = createServerFn({ method: 'GET' }).handler(() => + makeServerData(slowRenderQuickName), +) + +function SlowComponent(props: { data: string; index: number }) { + const startTime = Date.now() + while (Date.now() - startTime < 100) { + // Simulate slow render work. + } + return
{props.data}
+} + +export const Route = createFileRoute('/slow-render')({ + loader: async () => { + const quickData = await getQuickData() + return { + quickData, + deferredData: makeDeferredMessage( + slowRenderDeferredMessage, + slowRenderDeferredDelay, + ), + loaderSource: sourceMarker(), + } + }, + component: SlowRender, +}) + +function SlowRender() { + const data = Route.useLoaderData() + + return ( +
+

Slow Render Test

+

Tests when render takes longer than serialization.

+
+ Quick: {data.value.quickData.name} @ {data.value.quickData.timestamp} +
+
+ Quick data source: {data.value.quickData.source} +
+
+ Loader source: {data.value.loaderSource} +
+ + {{ + default: () => ( + ( +
+ {value.message} (source: {value.source}) +
+ )} + /> + ), + fallback: () =>
Loading...
, + }} +
+ {slowRenderComponents.map((data, index) => ( + + ))} +
+ ) +} diff --git a/e2e/vue-start/streaming-ssr/src/routes/stream.tsx b/e2e/vue-start/streaming-ssr/src/routes/stream.tsx new file mode 100644 index 0000000000..31368bedfc --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routes/stream.tsx @@ -0,0 +1,171 @@ +import { Await, createFileRoute, useRouter } from '@tanstack/vue-router' +import { + Suspense, + defineComponent, + onMounted, + onUnmounted, + ref, + watch, +} from 'vue' +import { + createChunkStream, + createStreamPromise, +} from '../../../../streaming-ssr-fixtures' + +export const Route = createFileRoute('/stream')({ + component: () => , + loader() { + return { + promise: createStreamPromise(), + stream: createChunkStream(), + } + }, +}) + +const decoder = new TextDecoder('utf-8') + +const StreamRoute = defineComponent({ + setup() { + const data = Route.useLoaderData() + const router = useRouter() + const streamData = ref>([]) + const streamComplete = ref(false) + const streamReadCount = ref(0) + let reader: ReadableStreamDefaultReader | undefined + let mounted = false + let activeStream: ReadableStream | undefined + let reading = false + let readTimer: ReturnType | undefined + + function clearReadTimer() { + if (readTimer) { + clearTimeout(readTimer) + readTimer = undefined + } + } + + function scheduleRead(delay = 0) { + if (!mounted || reading) { + return + } + + clearReadTimer() + readTimer = setTimeout(() => { + readTimer = undefined + void readStream() + }, delay) + } + + async function readStream() { + const stream = data.value.stream + if (!mounted || reading || activeStream === stream) { + return + } + + if (stream.locked) { + scheduleRead(10) + return + } + + streamData.value = [] + streamComplete.value = false + + let activeReader: ReadableStreamDefaultReader | undefined + + try { + const currentReader = stream.getReader() + activeReader = currentReader + reader = currentReader + activeStream = stream + reading = true + streamReadCount.value++ + + let chunk + while (!(chunk = await currentReader.read()).done) { + let value = chunk.value + if (typeof value !== 'string') { + value = decoder.decode(value, { stream: !chunk.done }) + } + streamData.value = [...streamData.value, value] + } + streamComplete.value = true + } catch (e) { + const message = String(e) + if (e instanceof TypeError && message.includes('locked')) { + activeStream = undefined + scheduleRead(10) + } else if (!(e instanceof TypeError && message.includes('cancelled'))) { + console.error('Stream error:', e) + } + } finally { + activeReader?.releaseLock() + if (reader === activeReader) { + reader = undefined + } + reading = false + if (activeStream !== data.value.stream) { + scheduleRead() + } + } + } + + onMounted(() => { + mounted = true + scheduleRead() + }) + watch( + () => data.value.stream, + () => { + activeStream = undefined + scheduleRead() + }, + ) + onUnmounted(() => { + mounted = false + clearReadTimer() + reader?.cancel().catch(() => {}) + reader = undefined + }) + + return () => ( +
+

ReadableStream Test

+ + + {{ + default: () => ( + ( +
{value}
+ )} + /> + ), + fallback: () => ( +
Loading promise...
+ ), + }} +
+
+

Stream chunks:

+
+ {streamData.value.map((chunk, i) => ( +
{chunk}
+ ))} +
+ {streamComplete.value && ( +
Stream complete!
+ )} +
+
+ ) + }, +}) diff --git a/e2e/vue-start/streaming-ssr/src/routes/sync-only.tsx b/e2e/vue-start/streaming-ssr/src/routes/sync-only.tsx new file mode 100644 index 0000000000..bbad10839e --- /dev/null +++ b/e2e/vue-start/streaming-ssr/src/routes/sync-only.tsx @@ -0,0 +1,25 @@ +import { createFileRoute } from '@tanstack/vue-router' +import { makeSyncOnlyData } from '../../../../streaming-ssr-fixtures' + +export const Route = createFileRoute('/sync-only')({ + loader: async () => makeSyncOnlyData(), + component: SyncOnly, +}) + +function SyncOnly() { + const data = Route.useLoaderData() + + return ( +
+

Synchronous Serialization Test

+

{data.value.message}

+

Loaded at: {data.value.timestamp}

+

Source: {data.value.source}

+
    + {data.value.items.map((item: string) => ( +
  • {item}
  • + ))} +
+
+ ) +} diff --git a/e2e/vue-start/streaming-ssr/tests/client-navigation.spec.ts b/e2e/vue-start/streaming-ssr/tests/client-navigation.spec.ts new file mode 100644 index 0000000000..8b9b3a8dcc --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/client-navigation.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/client-navigation' diff --git a/e2e/vue-start/streaming-ssr/tests/concurrent.spec.ts b/e2e/vue-start/streaming-ssr/tests/concurrent.spec.ts new file mode 100644 index 0000000000..8625473a58 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/concurrent.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/concurrent' diff --git a/e2e/vue-start/streaming-ssr/tests/deferred-rejection.spec.ts b/e2e/vue-start/streaming-ssr/tests/deferred-rejection.spec.ts new file mode 100644 index 0000000000..355b5019bc --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/deferred-rejection.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/deferred-rejection' diff --git a/e2e/vue-start/streaming-ssr/tests/deferred.spec.ts b/e2e/vue-start/streaming-ssr/tests/deferred.spec.ts new file mode 100644 index 0000000000..3145897d7b --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/deferred.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/deferred' diff --git a/e2e/vue-start/streaming-ssr/tests/fast-serial.spec.ts b/e2e/vue-start/streaming-ssr/tests/fast-serial.spec.ts new file mode 100644 index 0000000000..95df0555e2 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/fast-serial.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/fast-serial' diff --git a/e2e/vue-start/streaming-ssr/tests/home.spec.ts b/e2e/vue-start/streaming-ssr/tests/home.spec.ts new file mode 100644 index 0000000000..5d49d34a56 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/home.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/home' diff --git a/e2e/vue-start/streaming-ssr/tests/many-promises.spec.ts b/e2e/vue-start/streaming-ssr/tests/many-promises.spec.ts new file mode 100644 index 0000000000..b747bd7d0a --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/many-promises.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/many-promises' diff --git a/e2e/vue-start/streaming-ssr/tests/nested-deferred.spec.ts b/e2e/vue-start/streaming-ssr/tests/nested-deferred.spec.ts new file mode 100644 index 0000000000..8df20a8a95 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/nested-deferred.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/nested-deferred' diff --git a/e2e/vue-start/streaming-ssr/tests/preview-streaming.spec.ts b/e2e/vue-start/streaming-ssr/tests/preview-streaming.spec.ts new file mode 100644 index 0000000000..34241cfbaa --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/preview-streaming.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/preview-streaming' diff --git a/e2e/vue-start/streaming-ssr/tests/query-heavy.spec.ts b/e2e/vue-start/streaming-ssr/tests/query-heavy.spec.ts new file mode 100644 index 0000000000..d15c092f6e --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/query-heavy.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/query-heavy' diff --git a/e2e/vue-start/streaming-ssr/tests/slow-render.spec.ts b/e2e/vue-start/streaming-ssr/tests/slow-render.spec.ts new file mode 100644 index 0000000000..0d5a87363f --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/slow-render.spec.ts @@ -0,0 +1 @@ +import '../../../streaming-ssr-specs/slow-render' diff --git a/e2e/vue-start/streaming-ssr/tests/stream.spec.ts b/e2e/vue-start/streaming-ssr/tests/stream.spec.ts new file mode 100644 index 0000000000..9dfc6820ad --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/stream.spec.ts @@ -0,0 +1,22 @@ +import { expect, testWithHydration } from '../../../streaming-ssr-assertions' +import '../../../streaming-ssr-specs/stream' + +testWithHydration( + 'reads a replacement stream after an active read', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + await page.getByRole('link', { name: 'Stream' }).first().click() + await expect(page.getByTestId('stream-chunk-0')).toHaveText('chunk-0') + await expect(page.getByTestId('stream-complete')).toHaveCount(0) + + await page.getByTestId('refresh-stream').click() + + const streamData = page.getByTestId('stream-data') + await expect(streamData).toHaveAttribute('data-read-count', '2') + await expect(page.getByTestId('stream-complete')).toBeVisible() + await expect( + streamData.locator('[data-testid^="stream-chunk-"]'), + ).toHaveText(['chunk-0', 'chunk-1', 'chunk-2', 'chunk-3', 'chunk-4']) + }, +) diff --git a/e2e/vue-start/streaming-ssr/tests/sync-only.spec.ts b/e2e/vue-start/streaming-ssr/tests/sync-only.spec.ts new file mode 100644 index 0000000000..b25572f615 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tests/sync-only.spec.ts @@ -0,0 +1,7 @@ +import '../../../streaming-ssr-specs/sync-only' +import { expect, test } from '../../../streaming-ssr-assertions' + +test('Vue renders an unwrapped document root', async ({ request }) => { + const response = await request.get('/sync-only') + expect(await response.text()).toMatch(/^)/) +}) diff --git a/e2e/vue-start/streaming-ssr/tsconfig.json b/e2e/vue-start/streaming-ssr/tsconfig.json new file mode 100644 index 0000000000..390dad84c0 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/tsconfig.json @@ -0,0 +1,22 @@ +{ + "include": ["**/*.ts", "**/*.tsx"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "preserve", + "jsxImportSource": "vue", + "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/vue-start/streaming-ssr/vite.config.ts b/e2e/vue-start/streaming-ssr/vite.config.ts new file mode 100644 index 0000000000..6519ec54c8 --- /dev/null +++ b/e2e/vue-start/streaming-ssr/vite.config.ts @@ -0,0 +1,10 @@ +import { defineConfig } from 'vite' +import { tanstackStart } from '@tanstack/vue-start/plugin/vite' +import vueJsx from '@vitejs/plugin-vue-jsx' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [tanstackStart(), vueJsx()], +}) diff --git a/nx.json b/nx.json index b73eed0d92..9f9d782278 100644 --- a/nx.json +++ b/nx.json @@ -21,6 +21,11 @@ "transitive": true } ], + "streamingSsrTests": [ + "{workspaceRoot}/e2e/streaming-ssr-assertions.ts", + "{workspaceRoot}/e2e/streaming-ssr-fixtures/**/*", + "{workspaceRoot}/e2e/streaming-ssr-specs/**/*" + ], "default": [ "sharedGlobals", "{projectRoot}/**/*", diff --git a/packages/react-router-ssr-query/package.json b/packages/react-router-ssr-query/package.json index 0d6e1688d0..a42ea4b00c 100644 --- a/packages/react-router-ssr-query/package.json +++ b/packages/react-router-ssr-query/package.json @@ -88,7 +88,7 @@ "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0", "@tanstack/query-core": ">=5.102.0", - "@tanstack/react-router": ">=1.127.0", + "@tanstack/react-router": ">=1.170.33", "@tanstack/react-query": ">=5.102.0" } } diff --git a/packages/react-router/src/Scripts.tsx b/packages/react-router/src/Scripts.tsx index 13679f553d..56afe0a443 100644 --- a/packages/react-router/src/Scripts.tsx +++ b/packages/react-router/src/Scripts.tsx @@ -1,5 +1,9 @@ import { useSelector } from '@tanstack/react-store' -import { _getAssetMatches, deepEqual } from '@tanstack/router-core' +import { + composeSsrBodyScripts, + deepEqual, + getSsrBodyScriptParts, +} from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' import { Asset } from './Asset' import { useRouter } from './useRouter' @@ -9,63 +13,45 @@ type ScriptRenderAsset = RouterManagedTag & { preventScriptHoist?: boolean } +const routeScriptAttrs = { suppressHydrationWarning: true } + /** * Render body script tags collected from route matches and SSR manifests. - * Should be placed near the end of the document body. + * During streaming SSR, `` marks where late hydration scripts may + * begin to be inserted. */ export const Scripts = () => { const router = useRouter() const nonce = router.options.ssr?.nonce + const getParts = (matches: Array) => { + const parts = getSsrBodyScriptParts( + matches, + router.ssr?.manifest, + nonce, + routeScriptAttrs, + ) + for (const script of parts[1]) { + if (typeof script.attrs?.src === 'string') { + const scriptWithHoist = script as ScriptRenderAsset + scriptWithHoist.preventScriptHoist = true + } + } + return parts + } + const getScripts = (matches: Array) => { - matches = _getAssetMatches(matches) - const scripts = matches - .flatMap((match) => match.scripts ?? []) - .filter(Boolean) - .map( - ({ children, ...script }) => - ({ - tag: 'script', - attrs: { - ...script, - suppressHydrationWarning: true, - nonce, - }, - children, - }) satisfies RouterManagedTag, - ) as Array - const manifest = router.ssr?.manifest - - if (!manifest) { - return scripts - } - - for (const match of matches) { - const manifestScripts = manifest.routes[match.routeId]?.scripts - - if (!manifestScripts) { - continue - } - - for (const asset of manifestScripts) { - scripts.push({ - tag: 'script', - attrs: { ...asset.attrs, nonce }, - children: asset.children, - ...(typeof asset.attrs?.src === 'string' - ? { preventScriptHoist: true } - : {}), - }) - } - } - - return scripts + return composeSsrBodyScripts(getParts(matches)) } if (isServer ?? router.isServer) { const activeMatches = router.stores.matches.get() - const scripts = getScripts(activeMatches) - return renderScripts(router, scripts) + return renderScripts( + composeSsrBodyScripts( + getParts(activeMatches), + router.serverSsr?.takeInitialHydrationScriptTags(), + ), + ) } // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static @@ -73,20 +59,10 @@ export const Scripts = () => { compare: deepEqual, }) - return renderScripts(router, scripts) + return renderScripts(scripts) } -function renderScripts( - router: ReturnType, - scripts: Array, -) { - if ((isServer ?? router.isServer) && router.serverSsr) { - const serverBufferedScript = router.serverSsr.takeBufferedScripts() - if (serverBufferedScript) { - scripts.unshift(serverBufferedScript) - } - } - +function renderScripts(scripts: Array) { return ( <> {scripts.map((asset, i) => ( diff --git a/packages/react-router/src/index.tsx b/packages/react-router/src/index.tsx index 387afa25bc..23ebf57938 100644 --- a/packages/react-router/src/index.tsx +++ b/packages/react-router/src/index.tsx @@ -202,7 +202,6 @@ export type { RegisteredRouter, RouterContextOptions, ControllablePromise, - InjectedHtmlEntry, RouterOptions, RouterState, ListenerFn, diff --git a/packages/react-router/src/ssr/renderRouterToStream.tsx b/packages/react-router/src/ssr/renderRouterToStream.tsx index abfe36b86d..b55fc35405 100644 --- a/packages/react-router/src/ssr/renderRouterToStream.tsx +++ b/packages/react-router/src/ssr/renderRouterToStream.tsx @@ -1,46 +1,15 @@ -import { PassThrough } from 'node:stream' +import { PassThrough, Readable } from 'node:stream' import ReactDOMServer from 'react-dom/server' import { isbot } from 'isbot' import { createSsrStreamResponse, - transformPipeableStreamWithRouter, + getSsrStatus, transformReadableStreamWithRouter, + waitForRequest, } from '@tanstack/router-core/ssr/server' import type { AnyRouter } from '@tanstack/router-core' -import type { ReadableStream } from 'node:stream/web' import type { ReactNode } from 'react' -const noop = () => {} - -// Bot responses wait for `allReady` so crawlers receive complete HTML. -// If the request disconnects during that wait, React may not settle quickly; -// unblock the wait so the response pipeline can abort and clean up. -async function waitForReadyOrAbort( - ready: Promise, - signal: AbortSignal, -) { - let cleanup = noop - try { - await Promise.race([ - ready, - new Promise((resolve) => { - const onAbort = () => resolve() - cleanup = () => signal.removeEventListener('abort', onAbort) - signal.addEventListener('abort', onAbort, { once: true }) - if (signal.aborted) resolve() - }), - ]) - } finally { - cleanup() - } -} - -// A client disconnecting mid-stream is normal operation, not a render -// failure; don't let React's onError log it as one. -const isAbortError = (request: Request, error: unknown) => - (request.signal.aborted && error === request.signal.reason) || - (error instanceof Error && error.name === 'AbortError') - export const renderRouterToStream = async ({ request, router, @@ -52,169 +21,116 @@ export const renderRouterToStream = async ({ responseHeaders: Headers children: ReactNode }) => { - if (typeof ReactDOMServer.renderToReadableStream === 'function') { - const stream = await ReactDOMServer.renderToReadableStream(children, { - signal: request.signal, - nonce: router.options.ssr?.nonce, - progressiveChunkSize: Number.POSITIVE_INFINITY, - onError: (error, info) => { - if (!isAbortError(request, error)) { - console.error('Error in renderToReadableStream:', error, info) - } - }, - }) - - if (isbot(request.headers.get('User-Agent'))) { - await waitForReadyOrAbort(stream.allReady, request.signal) - } - - const responseStream = transformReadableStreamWithRouter( - router, - stream as unknown as ReadableStream, - { - signal: request.signal, - onAbort: () => stream.cancel().catch(() => {}), - }, - ) - return createSsrStreamResponse( - router, - new Response(responseStream as any, { - status: - router._serverResult?.type === 'render' - ? router._serverResult.status - : 200, - headers: responseHeaders, - }), - ) + const signal = request.signal + if (signal.aborted) { + router.serverSsr?.cleanup() + throw signal.reason } - - if (typeof ReactDOMServer.renderToPipeableStream === 'function') { - const reactAppPassthrough = new PassThrough() - - let pipeable: - | ReturnType - | undefined - let responseAttached = false - let aborted = false - let endedBeforeAttach = false - let pendingAbortReason: unknown - const toError = (reason: unknown) => - reason instanceof Error - ? reason - : new Error(String(reason ?? 'SSR aborted')) - const destroyError = (reason: unknown) => - reason === undefined ? undefined : toError(reason) - const pendingDestroyError = () => - pendingAbortReason === undefined - ? toError(pendingAbortReason) - : destroyError(pendingAbortReason) - const finishPassThrough = ( - reason: unknown, - opts?: { defaultError?: boolean }, - ) => { - if (reactAppPassthrough.destroyed) return - if (responseAttached) { - reactAppPassthrough.destroy( - opts?.defaultError ? toError(reason) : destroyError(reason), - ) - } else { - endedBeforeAttach = true - // onError can fire synchronously before React returns the pipeable - // handle and before Readable.toWeb() is attached. Defer touching the - // PassThrough until after the router transform can observe the error. + let rendererTeardown = false + const bot = isbot(request.headers.get('User-Agent')) + const onError = + ( + renderer: string, + ): ReactDOMServer.RenderToPipeableStreamOptions['onError'] => + (error, info) => { + if (!rendererTeardown && !signal.aborted) { + console.error(`Error in ${renderer}:`, error, info) } } - const abortPipeable = ( - reason?: unknown, - opts?: { defaultError?: boolean }, - ) => { - if (aborted) return - aborted = true - pendingAbortReason = reason - const err = toError(reason) - try { - pipeable?.abort(err) - } catch { - // ignore — React may throw if already aborted/finished - } - finishPassThrough(reason, opts) - } - // Register before attaching the router transform; the transform may - // synchronously cleanup/error, and cleanup must still remove this listener. - if (request.signal.aborted) { - abortPipeable(request.signal.reason) - } else { - const onRequestAbort = () => abortPipeable(request.signal.reason) - request.signal.addEventListener('abort', onRequestAbort, { once: true }) - router.serverSsr?.onCleanup(() => { - request.signal.removeEventListener('abort', onRequestAbort) - }) - } - - try { - pipeable = ReactDOMServer.renderToPipeableStream(children, { + try { + if (typeof ReactDOMServer.renderToReadableStream === 'function') { + const stream = await ReactDOMServer.renderToReadableStream(children, { + signal, nonce: router.options.ssr?.nonce, progressiveChunkSize: Number.POSITIVE_INFINITY, - ...(isbot(request.headers.get('User-Agent')) - ? { - onAllReady() { - pipeable!.pipe(reactAppPassthrough) - }, - } - : { - onShellReady() { - pipeable!.pipe(reactAppPassthrough) - }, - }), - onError: (error, info) => { - if (!isAbortError(request, error)) { - console.error('Error in renderToPipeableStream:', error, info) - } - abortPipeable(error, { defaultError: true }) + onError: onError('renderToReadableStream'), + }) + // The transform owns the reader and bounds bot readiness by its lifetime. + const rendererAbort = bot ? new AbortController() : undefined + const responseStream = transformReadableStreamWithRouter(router, stream, { + rendererSafePoint: 'script-close', + signal, + onAbort: (reason) => { + rendererTeardown = true + rendererAbort?.abort(reason) }, }) - } catch (e) { - console.error('Error in renderToPipeableStream:', e) - router.serverSsr?.cleanup() - throw e + if (rendererAbort) { + await waitForRequest(stream.allReady, rendererAbort.signal) + } + return createSsrStreamResponse( + router, + new Response(responseStream, { + status: getSsrStatus(router), + headers: responseHeaders, + }), + ) } - const responseStream = transformPipeableStreamWithRouter( - router, - reactAppPassthrough, - { signal: request.signal, onAbort: abortPipeable }, - ) - responseAttached = true - - if (endedBeforeAttach) { - reactAppPassthrough.destroy(pendingDestroyError()) - } - - // React's onError may have fired synchronously inside - // renderToPipeableStream before `pipeable` was assigned. If so, - // abortPipeable ran without a pipeable handle; re-apply the abort now. - if (aborted && pipeable) { + if (typeof ReactDOMServer.renderToPipeableStream === 'function') { + const reactAppPassthrough = new PassThrough() + let pipeable: + | ReturnType + | undefined + let resolveReady!: () => void + const ready = new Promise((resolve) => { + resolveReady = resolve + }) + const rendererAbort = new AbortController() + const abortPipeable = (reason?: unknown) => { + if (rendererTeardown) { + return + } + rendererTeardown = true + rendererAbort.abort(reason) + try { + pipeable?.abort(reason) + } catch { + // ignore — React may throw if already aborted/finished + } + } try { - pipeable.abort(toError(pendingAbortReason)) - } catch { - // ignore — React may throw if already aborted/finished + pipeable = ReactDOMServer.renderToPipeableStream(children, { + nonce: router.options.ssr?.nonce, + progressiveChunkSize: Number.POSITIVE_INFINITY, + ...(bot + ? { onAllReady: resolveReady } + : { onShellReady: resolveReady }), + onError: onError('renderToPipeableStream'), + onShellError: (error) => rendererAbort.abort(error), + }) + const responseStream = transformReadableStreamWithRouter( + router, + Readable.toWeb(reactAppPassthrough), + { + rendererSafePoint: 'script-close', + signal, + onAbort: abortPipeable, + }, + ) + + await waitForRequest(ready, rendererAbort.signal) + pipeable.pipe(reactAppPassthrough) + + return createSsrStreamResponse( + router, + new Response(responseStream, { + status: getSsrStatus(router), + headers: responseHeaders, + }), + ) + } catch (error) { + abortPipeable(error) + throw error } } - return createSsrStreamResponse( - router, - new Response(responseStream as any, { - status: - router._serverResult?.type === 'render' - ? router._serverResult.status - : 200, - headers: responseHeaders, - }), + throw new Error( + 'No renderToReadableStream or renderToPipeableStream found in react-dom/server. Ensure you are using a version of react-dom that supports streaming.', ) + } catch (error) { + router.serverSsr?.cleanup() + throw error } - - throw new Error( - 'No renderToReadableStream or renderToPipeableStream found in react-dom/server. Ensure you are using a version of react-dom that supports streaming.', - ) } diff --git a/packages/react-router/src/ssr/renderRouterToString.tsx b/packages/react-router/src/ssr/renderRouterToString.tsx index 5e299cc215..4b2faa2409 100644 --- a/packages/react-router/src/ssr/renderRouterToString.tsx +++ b/packages/react-router/src/ssr/renderRouterToString.tsx @@ -1,4 +1,5 @@ import ReactDOMServer from 'react-dom/server' +import { renderSsrHtmlResponse } from '@tanstack/router-core/ssr/server' import type { ReactNode } from 'react' import type { AnyRouter } from '@tanstack/router-core' @@ -11,29 +12,9 @@ export const renderRouterToString = async ({ responseHeaders: Headers children: ReactNode }) => { - try { - let html = ReactDOMServer.renderToString(children) - router.serverSsr!.setRenderFinished() - - const injectedHtml = router.serverSsr!.takeBufferedHtml() - if (injectedHtml) { - html = html.replace(``, () => `${injectedHtml}`) - } - - return new Response(`${html}`, { - status: - router._serverResult?.type === 'render' - ? router._serverResult.status - : 200, - headers: responseHeaders, - }) - } catch (error) { - console.error('Render to string error:', error) - return new Response('Internal Server Error', { - status: 500, - headers: responseHeaders, - }) - } finally { - router.serverSsr?.cleanup() - } + return renderSsrHtmlResponse({ + router, + responseHeaders, + render: () => ReactDOMServer.renderToString(children), + }) } diff --git a/packages/react-router/src/useRouter.tsx b/packages/react-router/src/useRouter.tsx index 925cba411e..6708274c11 100644 --- a/packages/react-router/src/useRouter.tsx +++ b/packages/react-router/src/useRouter.tsx @@ -18,12 +18,18 @@ export function useRouter(opts?: { warn?: boolean }): TRouter { const value = React.useContext(routerContext) - if (process.env.NODE_ENV !== 'production') { - if ((opts?.warn ?? true) && !value) { - console.warn( - 'Warning: useRouter must be used inside a component!', - ) - } + if (!value) { + warnMissingRouter(opts) } return value as any } + +// Kept out of the hook body: this dev-only branch runs for every Link and +// route hook, and on the server each `process.env` read is a native call. +function warnMissingRouter(opts?: { warn?: boolean }) { + if (process.env.NODE_ENV !== 'production' && (opts?.warn ?? true)) { + console.warn( + 'Warning: useRouter must be used inside a component!', + ) + } +} diff --git a/packages/react-router/tests/errorComponent.test.tsx b/packages/react-router/tests/errorComponent.test.tsx index 442a94bc10..441610a2e7 100644 --- a/packages/react-router/tests/errorComponent.test.tsx +++ b/packages/react-router/tests/errorComponent.test.tsx @@ -8,6 +8,7 @@ import { Link, Outlet, RouterProvider, + Scripts, createBrowserHistory, createControlledPromise, createLazyRoute, @@ -528,6 +529,16 @@ test.each(['beforeLoad', 'loader'] as const)( test('SSR errorComponent receives primitive errors thrown from beforeLoad', async () => { const rootRoute = createRootRoute({ + shellComponent: function RootDocument({ children }) { + return ( + + + {children} + + + + ) + }, component: function Root() { return }, @@ -717,7 +728,19 @@ test('SSR renders a later fresh ancestor loader failure', async () => { const parentGate = createControlledPromise() const childGate = createControlledPromise() const childSettled = createControlledPromise() - const rootRoute = createRootRoute({ component: Outlet }) + const rootRoute = createRootRoute({ + shellComponent: function RootDocument({ children }) { + return ( + + + {children} + + + + ) + }, + component: Outlet, + }) const parentRoute = createRoute({ getParentRoute: () => rootRoute, path: '/parent', @@ -782,7 +805,10 @@ test('#4684: SSR renders head content when beforeLoad throws', async () => { - {children} + + {children} + + ) }, diff --git a/packages/react-router/tests/not-found.test.tsx b/packages/react-router/tests/not-found.test.tsx index f27057c7ab..436c386694 100644 --- a/packages/react-router/tests/not-found.test.tsx +++ b/packages/react-router/tests/not-found.test.tsx @@ -5,6 +5,7 @@ import { Link, Outlet, RouterProvider, + Scripts, createBrowserHistory, createControlledPromise, createLazyRoute, @@ -111,6 +112,13 @@ test('a lazy route notFoundComponent handles an eager beforeLoad failure', async test('SSR uses a lazy route notFoundComponent for an eager beforeLoad failure', async () => { const rootRoute = createRootRoute({ + // Streaming SSR requires the boundary in the shell. + shellComponent: ({ children }) => ( + <> + {children} + + + ), component: Outlet, notFoundComponent: () =>
Root not found
, }) @@ -154,6 +162,14 @@ test.each(['client', 'server'] as const)( 'a lazy child boundary handles a fuzzy URL miss on the %s', async (environment) => { const rootRoute = createRootRoute({ + // Streaming SSR requires the boundary in the shell; the + // client render outputs no scripts here. + shellComponent: ({ children }) => ( + <> + {children} + + + ), component: Outlet, notFoundComponent: () =>
Root fuzzy boundary
, }) diff --git a/packages/react-router/tests/renderRouterToStream.react19.test.tsx b/packages/react-router/tests/renderRouterToStream.react19.test.tsx new file mode 100644 index 0000000000..426996d60e --- /dev/null +++ b/packages/react-router/tests/renderRouterToStream.react19.test.tsx @@ -0,0 +1,227 @@ +import { Suspense } from 'react' +import { afterEach, describe, expect, test, vi } from 'vitest' +import { attachRouterServerSsrUtils } from '@tanstack/router-core/ssr/server' +import { + RouterContextProvider, + Scripts, + createMemoryHistory, + createRootRoute, + createRouter, +} from '../src' +import type * as ReactDOMServer from 'react-dom/server' +import type { AnyRouter } from '@tanstack/router-core' + +/** + * Load the adapter against the real React 19 renderer. Node's `react-dom` + * exports both entry points; hiding `renderToReadableStream` exercises the + * pipeable path that every Node user on React < 19.2 runs. + */ +async function loadRenderRouterToStream(path: 'readable' | 'pipeable') { + vi.resetModules() + if (path === 'pipeable') { + vi.doMock('react-dom/server', async (importOriginal) => { + // The runtime module is CommonJS, so its interop `default` is the namespace. + const actual = await importOriginal<{ default: typeof ReactDOMServer }>() + return { + ...actual, + default: { ...actual.default, renderToReadableStream: undefined }, + } + }) + } else { + vi.doUnmock('react-dom/server') + } + const reactDomServer = (await import('react-dom/server')).default + const renderToPipeableStream = vi.spyOn( + reactDomServer, + 'renderToPipeableStream', + ) + const { renderRouterToStream } = + await import('../src/ssr/renderRouterToStream') + return { renderRouterToStream, renderToPipeableStream } +} + +const activeRouters: Array = [] + +afterEach(() => { + for (const router of activeRouters.splice(0)) { + router.serverSsr?.cleanup() + } +}) + +async function buildRouter(dehydratedData: { routerData: Promise }) { + const rootRoute = createRootRoute({ component: () => null }) + const router = createRouter({ + history: createMemoryHistory({ initialEntries: ['/'] }), + routeTree: rootRoute, + dehydrate: () => dehydratedData, + }) + activeRouters.push(router) + router.isServer = true + attachRouterServerSsrUtils({ router, manifest: undefined }) + await router.load() + await router.serverSsr!.dehydrate() + return router +} + +function createSuspendingComponent(id: string, text: string) { + let ready = false + let resolve!: () => void + const pending = new Promise((done) => { + resolve = () => { + ready = true + done() + } + }) + + return { + Component() { + if (!ready) { + throw pending + } + return
{text}
+ }, + resolve, + } +} + +async function readWithTimeout( + reader: ReadableStreamDefaultReader, +) { + let timeout: ReturnType | undefined + try { + return await Promise.race([ + reader.read(), + new Promise((_resolve, reject) => { + timeout = setTimeout( + () => reject(new Error('Timed out waiting for React SSR output')), + 2000, + ) + }), + ]) + } finally { + if (timeout) { + clearTimeout(timeout) + } + } +} + +async function readUntil( + reader: ReadableStreamDefaultReader, + decoder: TextDecoder, + state: { html: string }, + condition: (html: string) => boolean, +) { + while (!condition(state.html)) { + const { done, value } = await readWithTimeout(reader) + if (done) { + throw new Error('React SSR response ended before the expected output') + } + state.html += decoder.decode(value, { stream: true }) + } +} + +describe.each(['readable', 'pipeable'] as const)( + 'renderRouterToStream - real React 19 renderer (%s)', + (path) => { + test('emits router data after a real Suspense patch while React is still rendering', async () => { + const { renderRouterToStream, renderToPipeableStream } = + await loadRenderRouterToStream(path) + let resolveRouterData!: (value: string) => void + const routerData = new Promise((resolve) => { + resolveRouterData = resolve + }) + const router = await buildRouter({ routerData }) + const first = createSuspendingComponent('first-result', 'first-resolved') + const second = createSuspendingComponent( + 'second-result', + 'second-resolved', + ) + const requestController = new AbortController() + + const { response } = await renderRouterToStream({ + request: new Request('http://localhost/', { + signal: requestController.signal, + }), + router, + responseHeaders: new Headers(), + children: ( + + + + first-fallback

}> + +
+ second-fallback

}> + +
+ +
+ + + ), + }) + const reader = response.body!.getReader() + const decoder = new TextDecoder() + const state = { html: '' } + + try { + // The shell ends with , whose last child is the boundary. + await readUntil(reader, decoder, state, (html) => { + const shell = html.indexOf('second-fallback') + return shell >= 0 && html.indexOf('', shell) >= 0 + }) + expect(state.html).toContain('first-fallback') + + first.resolve() + await readUntil(reader, decoder, state, (html) => { + const result = html.indexOf('first-resolved') + return result >= 0 && html.indexOf('', result) >= 0 + }) + + const firstResult = state.html.indexOf('first-resolved') + const reactPatchEnd = + state.html.indexOf('', firstResult) + ''.length + const reactPatch = state.html.slice(firstResult, reactPatchEnd) + expect(reactPatch).toContain('')).toBe(true) + expect(state.html).not.toContain('second-resolved') + expect(state.html).not.toContain('') + + resolveRouterData('late-react19-router-value') + await readUntil(reader, decoder, state, (html) => + html.includes('late-react19-router-value'), + ) + + // The second Suspense boundary still keeps React's renderer open. The + // router batch can therefore only have used React's completed patch + // script as its insertion point. + const routerValue = state.html.indexOf('late-react19-router-value') + expect(routerValue).toBeGreaterThan(reactPatchEnd) + expect(state.html).not.toContain('second-resolved') + expect(state.html).not.toContain('') + + second.resolve() + for (;;) { + const { done, value } = await readWithTimeout(reader) + if (done) { + break + } + state.html += decoder.decode(value, { stream: true }) + } + state.html += decoder.decode() + + expect(state.html).toContain('second-resolved') + expect(state.html.endsWith('')).toBe(true) + expect(router.serverSsr).toBeUndefined() + expect(renderToPipeableStream).toHaveBeenCalledTimes( + path === 'pipeable' ? 1 : 0, + ) + } finally { + first.resolve() + second.resolve() + requestController.abort(new Error('test-complete')) + await reader.cancel().catch(() => {}) + } + }) + }, +) diff --git a/packages/react-router/tests/renderRouterToStream.test.tsx b/packages/react-router/tests/renderRouterToStream.test.tsx index f42456b7be..cde31d0b6a 100644 --- a/packages/react-router/tests/renderRouterToStream.test.tsx +++ b/packages/react-router/tests/renderRouterToStream.test.tsx @@ -1,30 +1,63 @@ -import { afterEach, describe, expect, onTestFinished, test, vi } from 'vitest' +import { afterEach, describe, expect, test, vi } from 'vitest' import { attachRouterServerSsrUtils } from '@tanstack/router-core/ssr/server' import { createMemoryHistory, createRootRoute, createRouter } from '../src' +import type { RouterManagedTag } from '@tanstack/router-core' +import type * as RouterSsrServer from '@tanstack/router-core/ssr/server' +import type * as ReactDomServer from 'react-dom/server' + +type ReadableRenderOptions = NonNullable< + Parameters[1] +> const reactDomServerMocks = vi.hoisted(() => ({ - renderToReadableStream: undefined as undefined | (() => unknown), + renderToReadableStream: undefined as + | undefined + | ((children: unknown, options: ReadableRenderOptions) => unknown), renderToPipeableStream: vi.fn(), })) +const routerTransformMocks = vi.hoisted(() => ({ + readableOptions: vi.fn(), +})) + +vi.mock('@tanstack/router-core/ssr/server', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + transformReadableStreamWithRouter: ( + ...args: Parameters + ) => { + routerTransformMocks.readableOptions(args[2]) + return actual.transformReadableStreamWithRouter(...args) + }, + } +}) vi.mock('react-dom/server', () => ({ default: reactDomServerMocks, ...reactDomServerMocks, })) +const actualReactDomServer = await vi.importActual( + 'react-dom/server.node', +) + const { renderRouterToStream } = await import('../src/ssr/renderRouterToStream') afterEach(() => { reactDomServerMocks.renderToReadableStream = undefined reactDomServerMocks.renderToPipeableStream.mockReset() + routerTransformMocks.readableOptions.mockReset() vi.restoreAllMocks() }) -async function buildRouter() { +async function buildRouter(dehydratedData?: { lateData: Promise }) { const rootRoute = createRootRoute({ component: () => null }) const router = createRouter({ history: createMemoryHistory({ initialEntries: ['/'] }), routeTree: rootRoute, + ...(dehydratedData === undefined + ? {} + : { dehydrate: () => dehydratedData }), }) router.isServer = true attachRouterServerSsrUtils({ router, manifest: undefined }) @@ -34,15 +67,7 @@ async function buildRouter() { } async function expectBodyRejects(response: Response, message: string) { - const reader = response.body!.getReader() - await expect( - (async () => { - for (;;) { - const { done } = await reader.read() - if (done) return - } - })(), - ).rejects.toThrow(message) + await expect(response.text()).rejects.toThrow(message) } function unwrapResponse( @@ -51,160 +76,505 @@ function unwrapResponse( return result.response } -describe('renderRouterToStream - pipeable sync errors', () => { - test('request abort cancels readable rendering without consuming the response body', async () => { - const cancel = vi.fn() - const stream = Object.assign(new ReadableStream({ cancel }), { - allReady: Promise.resolve(), - }) - reactDomServerMocks.renderToReadableStream = vi.fn(() => stream) +function renderScript(tag: RouterManagedTag) { + const attrs = tag.attrs ?? {} + const id = attrs.id ? ` id="${attrs.id}"` : '' + const nonce = attrs.nonce ? ` nonce="${attrs.nonce}"` : '' + const streamPart = + 'data-tsr-stream-part' in attrs ? ' data-tsr-stream-part=""' : '' + return `${tag.children ?? ''}` +} - const router = await buildRouter() +function takeInitialScriptHtml( + router: Awaited>, +) { + const scripts = router.serverSsr!.takeInitialHydrationScriptTags()! + return [...scripts.before, scripts.boundary].map(renderScript).join('') +} + +async function readWithTimeout( + reader: ReadableStreamDefaultReader, +) { + let timeout: ReturnType | undefined + try { + return await Promise.race([ + reader.read(), + new Promise((_resolve, reject) => { + timeout = setTimeout( + () => reject(new Error('Timed out waiting for streamed HTML')), + 2000, + ) + }), + ]) + } finally { + if (timeout) { + clearTimeout(timeout) + } + } +} + +async function readUntil( + reader: ReadableStreamDefaultReader, + decoder: TextDecoder, + state: { html: string }, + needle: string, +) { + while (!state.html.includes(needle)) { + const { done, value } = await readWithTimeout(reader) + if (done) { + throw new Error(`Response ended before it contained ${needle}`) + } + state.html += decoder.decode(value, { stream: true }) + } +} + +describe('renderRouterToStream - renderer selection and pipeable errors', () => { + test('already-aborted requests do not start the readable renderer', async () => { + const readable = vi.fn() + reactDomServerMocks.renderToReadableStream = readable const controller = new AbortController() - onTestFinished(() => { - router.serverSsr?.cleanup() - }) + controller.abort(new Error('already-gone-readable')) + const router = await buildRouter() + try { + await expect( + renderRouterToStream({ + request: new Request('http://localhost/', { + signal: controller.signal, + }), + router, + responseHeaders: new Headers(), + children: null, + }), + ).rejects.toThrow('already-gone-readable') + + expect(readable).not.toHaveBeenCalled() + expect(reactDomServerMocks.renderToPipeableStream).not.toHaveBeenCalled() + expect(router.serverSsr).toBeUndefined() + } finally { + router.serverSsr?.cleanup() + } + }) + + test('already-aborted requests do not start the pipeable renderer', async () => { + const controller = new AbortController() + controller.abort(new Error('already-gone-pipeable')) + const router = await buildRouter() + + try { + await expect( + renderRouterToStream({ + request: new Request('http://localhost/', { + signal: controller.signal, + }), + router, + responseHeaders: new Headers(), + children: null, + }), + ).rejects.toThrow('already-gone-pipeable') + + expect(reactDomServerMocks.renderToPipeableStream).not.toHaveBeenCalled() + expect(router.serverSsr).toBeUndefined() + } finally { + router.serverSsr?.cleanup() + } + }) + + test('disables React progressive chunking for the readable renderer', async () => { + const router = await buildRouter() + const renderedScripts = takeInitialScriptHtml(router) + const rendererStream = Object.assign( + new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode(renderedScripts)) + controller.close() + }, + }), + { allReady: Promise.resolve() }, + ) + const renderToReadableStream = vi.fn(() => Promise.resolve(rendererStream)) + reactDomServerMocks.renderToReadableStream = renderToReadableStream + + try { + const response = unwrapResponse( + await renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + children: null, + }), + ) + await response.text() + + expect(renderToReadableStream).toHaveBeenCalledWith( + null, + expect.objectContaining({ + progressiveChunkSize: Number.POSITIVE_INFINITY, + }), + ) + } finally { + router.serverSsr?.cleanup() + } + }) + + test('disables React progressive chunking for the pipeable renderer', async () => { + const router = await buildRouter() + const renderedScripts = takeInitialScriptHtml(router) + reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( + (_children, options) => { + queueMicrotask(options.onShellReady) + return { + abort: vi.fn(), + pipe(destination: NodeJS.WritableStream) { + destination.write(renderedScripts) + destination.end() + }, + } + }, + ) + + try { + const response = unwrapResponse( + await renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + children: null, + }), + ) + await response.text() + + expect( + reactDomServerMocks.renderToPipeableStream.mock.calls[0]![1], + ).toEqual( + expect.objectContaining({ + progressiveChunkSize: Number.POSITIVE_INFINITY, + }), + ) + } finally { + router.serverSsr?.cleanup() + } + }) + + test('emits late router data after a complete React patch while rendering is still open', async () => { + let resolveLateData!: (value: string) => void + const lateData = new Promise((resolve) => { + resolveLateData = resolve + }) + const router = await buildRouter({ lateData }) + const renderedScripts = takeInitialScriptHtml(router) + + let rendererController!: ReadableStreamDefaultController + let rendererClosed = false + const rendererStream = Object.assign( + new ReadableStream({ + start(controller) { + rendererController = controller + }, + }), + { allReady: new Promise(() => {}) }, + ) + reactDomServerMocks.renderToReadableStream = vi.fn(() => + Promise.resolve(rendererStream), + ) + + const patch = + '' + + '' const response = unwrapResponse( await renderRouterToStream({ - request: new Request('http://localhost/', { - signal: controller.signal, - }), + request: new Request('http://localhost/'), router, responseHeaders: new Headers(), children: null, }), ) + const reader = response.body!.getReader() + const decoder = new TextDecoder() + const state = { html: '' } - expect(response.body).not.toBeNull() - controller.abort(new Error('request-gone')) - await vi.waitFor(() => expect(cancel).toHaveBeenCalledOnce()) + try { + rendererController.enqueue( + new TextEncoder().encode( + `${renderedScripts}${patch}`, + ), + ) + await readUntil(reader, decoder, state, patch) + + resolveLateData('late-react-router-value') + await readUntil(reader, decoder, state, 'late-react-router-value') + + // Close React only after its patch allowed the late router value through. + rendererClosed = true + rendererController.close() + for (;;) { + const { done, value } = await readWithTimeout(reader) + if (done) { + break + } + state.html += decoder.decode(value, { stream: true }) + } + state.html += decoder.decode() + + expect(state.html.indexOf(patch)).toBeLessThan( + state.html.indexOf('late-react-router-value'), + ) + expect(state.html.indexOf('late-react-router-value')).toBeLessThan( + state.html.indexOf(''), + ) + expect(routerTransformMocks.readableOptions).toHaveBeenCalledWith( + expect.objectContaining({ rendererSafePoint: 'script-close' }), + ) + } finally { + if (!rendererClosed) { + try { + rendererController.close() + } catch { + // The response may already have cancelled the renderer. + } + } + router.serverSsr?.cleanup() + } }) - test('sync onError before pipeable is assigned still aborts pipeable', async () => { - const abort = vi.fn() - reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( - (_children, opts) => { - opts.onError(new Error('sync-react-error'), { componentStack: '' }) - return { abort, pipe: vi.fn() } - }, + test('prefers the readable renderer when both APIs exist', async () => { + const cancelReadable = vi.fn() + const readableStream = Object.assign( + new ReadableStream({ + cancel: cancelReadable, + }), + { allReady: Promise.resolve() }, ) + const readable = vi.fn(() => Promise.resolve(readableStream)) + reactDomServerMocks.renderToReadableStream = readable const router = await buildRouter() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + const requestController = new AbortController() try { const response = unwrapResponse( await renderRouterToStream({ - request: new Request('http://localhost/'), + request: new Request('http://localhost/', { + signal: requestController.signal, + }), router, responseHeaders: new Headers(), children: null, }), ) - expect(abort).toHaveBeenCalledOnce() - await expectBodyRejects(response, 'sync-react-error') - } finally { - errorSpy.mockRestore() - router.serverSsr?.cleanup() - } - }) - - test('sync non-Error onError before pipeable assignment still errors body', async () => { - const abort = vi.fn() - reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( - (_children, opts) => { - opts.onError('string-react-error', { componentStack: '' }) - return { abort, pipe: vi.fn() } - }, - ) - - const router = await buildRouter() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - try { - const response = unwrapResponse( - await renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - children: null, - }), + expect(readable).toHaveBeenCalledOnce() + expect(reactDomServerMocks.renderToPipeableStream).not.toHaveBeenCalled() + expect(routerTransformMocks.readableOptions).toHaveBeenCalledWith( + expect.objectContaining({ rendererSafePoint: 'script-close' }), ) - expect(abort).toHaveBeenCalledOnce() - await expectBodyRejects(response, 'string-react-error') + requestController.abort(new Error('test-complete')) + await expectBodyRejects(response, 'test-complete') + expect(cancelReadable).toHaveBeenCalledOnce() } finally { - errorSpy.mockRestore() router.serverSsr?.cleanup() } }) - test('sync undefined onError before pipeable assignment still errors body', async () => { - const abort = vi.fn() - reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( - (_children, opts) => { - opts.onError(undefined, { componentStack: '' }) - return { abort, pipe: vi.fn() } - }, - ) - - const router = await buildRouter() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - try { - const response = unwrapResponse( - await renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - children: null, + test('readable renderer cancellation does not log a render error', async () => { + const cancelReadable = vi.fn() + reactDomServerMocks.renderToReadableStream = vi.fn((_children, options) => { + const readableStream = Object.assign( + new ReadableStream({ + cancel(reason) { + cancelReadable(reason) + options.onError?.(reason, { componentStack: '' }) + }, }), + { allReady: Promise.resolve() }, ) - - expect(abort).toHaveBeenCalledOnce() - await expectBodyRejects(response, 'SSR aborted') - } finally { - errorSpy.mockRestore() - router.serverSsr?.cleanup() - } - }) - - test('undefined onError after response attach errors body', async () => { - const abort = vi.fn() - let onError!: (error: unknown, info: unknown) => void - reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( - (_children, opts) => { - onError = opts.onError - return { abort, pipe: vi.fn() } - }, - ) - - const router = await buildRouter() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - try { - const response = unwrapResponse( - await renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - children: null, - }), - ) - - onError(undefined, { componentStack: '' }) - expect(abort).toHaveBeenCalledOnce() - await expectBodyRejects(response, 'SSR aborted') - } finally { - errorSpy.mockRestore() - router.serverSsr?.cleanup() - } - }) - - test('setup throw rejects instead of returning streamed 200', async () => { - const setupError = new Error('setup-boom') - reactDomServerMocks.renderToPipeableStream.mockImplementationOnce(() => { - throw setupError + return Promise.resolve(readableStream) }) + const router = await buildRouter() + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + const reason = new Error('readable-consumer-gone') + try { + const response = unwrapResponse( + await renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + children: null, + }), + ) + + await response.body!.cancel(reason) + expect(cancelReadable).toHaveBeenCalledWith(reason) + expect(errorSpy).not.toHaveBeenCalled() + } finally { + errorSpy.mockRestore() + router.serverSsr?.cleanup() + } + }) + + test('request abort does not log a renderer cancellation error', async () => { + const controller = new AbortController() + const renderError = new Error('renderer cancellation') + reactDomServerMocks.renderToReadableStream = vi.fn((_children, options) => { + controller.signal.addEventListener( + 'abort', + () => options.onError?.(renderError, { componentStack: '' }), + { once: true }, + ) + return Promise.resolve( + Object.assign(new ReadableStream(), { + allReady: Promise.resolve(), + }), + ) + }) + + const router = await buildRouter() + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const response = unwrapResponse( + await renderRouterToStream({ + request: new Request('http://localhost/', { + signal: controller.signal, + }), + router, + responseHeaders: new Headers(), + children: null, + }), + ) + + controller.abort(new Error('request-gone')) + await expectBodyRejects(response, 'request-gone') + expect(errorSpy).not.toHaveBeenCalled() + } finally { + errorSpy.mockRestore() + router.serverSsr?.cleanup() + } + }) + + test('request abort unblocks the readable renderer bot wait', async () => { + let resolveCancel!: () => void + let markCancelStarted!: () => void + const cancelStarted = new Promise((resolve) => { + markCancelStarted = resolve + }) + const cancelReadable = vi.fn( + () => + new Promise((resolve) => { + resolveCancel = resolve + markCancelStarted() + }), + ) + const readableStream = Object.assign( + new ReadableStream({ + cancel: cancelReadable, + }), + { allReady: new Promise(() => {}) }, + ) + reactDomServerMocks.renderToReadableStream = vi.fn(() => + Promise.resolve(readableStream), + ) + + const router = await buildRouter() + const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') + const originalServerSsr = router.serverSsr! + const controller = new AbortController() + const reason = new Error('readable-bot-gone') + try { + const responsePromise = renderRouterToStream({ + request: new Request('http://localhost/', { + headers: { 'User-Agent': 'Googlebot' }, + signal: controller.signal, + }), + router, + responseHeaders: new Headers(), + children: null, + }) + + await Promise.resolve() + controller.abort(reason) + + await cancelStarted + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + resolveCancel() + await expect(responsePromise).rejects.toBe(reason) + expect(cancelReadable).toHaveBeenCalledOnce() + } finally { + resolveCancel?.() + originalServerSsr.cleanup() + } + }) + + test('stream lifetime rejects the readable bot wait while readiness and cancellation stay pending', async () => { + let resolveReady!: () => void + const allReady = new Promise((resolve) => { + resolveReady = resolve + }) + const cancelReadable = vi.fn(() => new Promise(() => {})) + const readableStream = Object.assign( + new ReadableStream({ cancel: cancelReadable }), + { allReady }, + ) + reactDomServerMocks.renderToReadableStream = vi.fn(() => + Promise.resolve(readableStream), + ) + + const router = await buildRouter() + const owner = router.serverSsr! + const cleanup = vi.fn() + owner.onCleanup(cleanup) + const request = new Request('http://localhost/', { + headers: { 'User-Agent': 'Googlebot' }, + }) + const resolved = vi.fn() + const rejected = vi.fn() + const warn = vi.spyOn(console, 'warn').mockImplementation(() => {}) + vi.useFakeTimers() + const pending = renderRouterToStream({ + request, + router, + responseHeaders: new Headers(), + children: null, + }).then(resolved, rejected) + + try { + await Promise.resolve() + expect(routerTransformMocks.readableOptions).toHaveBeenCalledOnce() + expect(rejected).not.toHaveBeenCalled() + await vi.advanceTimersByTimeAsync(120_000) + + const expectedError = expect.objectContaining({ + message: 'Stream lifetime exceeded', + }) + expect(rejected).toHaveBeenCalledExactlyOnceWith(expectedError) + expect(cancelReadable).toHaveBeenCalledExactlyOnceWith(expectedError) + expect(readableStream.locked).toBe(false) + expect(request.signal.aborted).toBe(false) + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + + resolveReady() + await vi.advanceTimersByTimeAsync(0) + expect(resolved).not.toHaveBeenCalled() + } finally { + resolveReady() + await pending + owner.cleanup() + vi.useRealTimers() + warn.mockRestore() + } + }) + + test('fatal shell errors reject before a response is created', async () => { + const shellError = new Error('fatal-react-shell-error') + reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( + actualReactDomServer.renderToPipeableStream, + ) + const Fatal = () => { + throw shellError + } + const router = await buildRouter() const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') const originalServerSsr = router.serverSsr! @@ -215,17 +585,196 @@ describe('renderRouterToStream - pipeable sync errors', () => { request: new Request('http://localhost/'), router, responseHeaders: new Headers(), - children: null, + children: , }), - ).rejects.toThrow('setup-boom') + ).rejects.toBe(shellError) - expect(cleanup).toHaveBeenCalledOnce() + expect(routerTransformMocks.readableOptions).toHaveBeenCalledOnce() + expect(cleanup).toHaveBeenCalled() + expect(router.serverSsr).toBeUndefined() } finally { errorSpy.mockRestore() originalServerSsr.cleanup() } }) + test('transform abort wins after shell readiness resolves before continuation', async () => { + const reason = new Error('transform-aborted-after-ready') + const abort = vi.fn() + const pipe = vi.fn() + reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( + (_children, options) => { + options.onShellReady() + return { abort, pipe } + }, + ) + routerTransformMocks.readableOptions.mockImplementationOnce((options) => { + options?.onAbort?.(reason) + }) + + const router = await buildRouter() + const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') + const originalServerSsr = router.serverSsr! + try { + await expect( + renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + children: null, + }), + ).rejects.toBe(reason) + + expect(abort).toHaveBeenCalledWith(reason) + expect(pipe).not.toHaveBeenCalled() + expect(cleanup).toHaveBeenCalled() + expect(router.serverSsr).toBeUndefined() + } finally { + originalServerSsr.cleanup() + } + }) + + test('synchronous renderer and transform setup failures do not orphan shell errors', async () => { + const rendererShellError = new Error('renderer-sync-shell-error') + const rendererSetupError = new Error('renderer-sync-setup-error') + const transformShellError = new Error('transform-sync-shell-error') + const transformSetupError = new Error('transform-sync-setup-error') + const unhandled: Array = [] + const onUnhandled = (error: unknown) => { + unhandled.push(error) + } + reactDomServerMocks.renderToPipeableStream + .mockImplementationOnce((_children, options) => { + options.onShellError(rendererShellError) + throw rendererSetupError + }) + .mockImplementationOnce((_children, options) => { + options.onShellError(transformShellError) + return { abort: vi.fn(), pipe: vi.fn() } + }) + routerTransformMocks.readableOptions.mockImplementationOnce(() => { + throw transformSetupError + }) + + const rendererRouter = await buildRouter() + const transformRouter = await buildRouter() + const rendererServerSsr = rendererRouter.serverSsr! + const transformServerSsr = transformRouter.serverSsr! + process.on('unhandledRejection', onUnhandled) + try { + await expect( + renderRouterToStream({ + request: new Request('http://localhost/'), + router: rendererRouter, + responseHeaders: new Headers(), + children: null, + }), + ).rejects.toBe(rendererSetupError) + await expect( + renderRouterToStream({ + request: new Request('http://localhost/'), + router: transformRouter, + responseHeaders: new Headers(), + children: null, + }), + ).rejects.toBe(transformSetupError) + await new Promise((resolve) => setTimeout(resolve, 0)) + + expect(unhandled).toEqual([]) + expect(rendererRouter.serverSsr).toBeUndefined() + expect(transformRouter.serverSsr).toBeUndefined() + } finally { + process.off('unhandledRejection', onUnhandled) + rendererServerSsr.cleanup() + transformServerSsr.cleanup() + } + }) + + test('a live AbortError is logged without aborting the stream', async () => { + const abort = vi.fn() + const renderError = new DOMException('component failed', 'AbortError') + reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( + (_children, opts) => { + queueMicrotask(() => opts.onShellReady()) + return { + abort, + pipe(destination: NodeJS.WritableStream) { + destination.write('shell') + opts.onError(renderError, { + componentStack: '', + }) + destination.end('') + }, + } + }, + ) + + const router = await buildRouter() + expect(router.serverSsr!.takeInitialHydrationScriptTags()).toBeDefined() + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const response = unwrapResponse( + await renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + children: null, + }), + ) + + await expect(response.text()).resolves.toContain('shell') + expect(routerTransformMocks.readableOptions).toHaveBeenCalledWith( + expect.objectContaining({ rendererSafePoint: 'script-close' }), + ) + expect(abort).not.toHaveBeenCalled() + expect(errorSpy).toHaveBeenCalledWith( + 'Error in renderToPipeableStream:', + renderError, + { componentStack: '' }, + ) + } finally { + errorSpy.mockRestore() + router.serverSsr?.cleanup() + } + }) + + test('pipeable renderer cancellation does not log a render error', async () => { + let options: + | Parameters[1] + | undefined + const abort = vi.fn((reason: unknown) => { + options?.onError?.(reason, { componentStack: '' }) + }) + reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( + (_children, nextOptions) => { + options = nextOptions + queueMicrotask(() => nextOptions.onShellReady()) + return { abort, pipe: vi.fn() } + }, + ) + + const router = await buildRouter() + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + const reason = new Error('pipeable-consumer-gone') + try { + const response = unwrapResponse( + await renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + children: null, + }), + ) + + await response.body!.cancel(reason) + expect(abort).toHaveBeenCalledWith(reason) + expect(errorSpy).not.toHaveBeenCalled() + } finally { + errorSpy.mockRestore() + router.serverSsr?.cleanup() + } + }) + test('request abort cancels pipeable rendering before the response body is consumed', async () => { const abort = vi.fn() reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( @@ -237,12 +786,13 @@ describe('renderRouterToStream - pipeable sync errors', () => { const router = await buildRouter() const controller = new AbortController() + const request = new Request('http://localhost/', { + signal: controller.signal, + }) try { const response = unwrapResponse( await renderRouterToStream({ - request: new Request('http://localhost/', { - signal: controller.signal, - }), + request, router, responseHeaders: new Headers(), children: null, @@ -252,13 +802,94 @@ describe('renderRouterToStream - pipeable sync errors', () => { expect(response.body).not.toBeNull() controller.abort(new Error('request-gone')) await vi.waitFor(() => expect(abort).toHaveBeenCalledOnce()) - const terminated = await Promise.race([ - expectBodyRejects(response, 'request-gone').then(() => true), - new Promise((resolve) => setTimeout(() => resolve(false), 2000)), - ]) - expect(terminated).toBe(true) + await expectBodyRejects(response, 'request-gone') } finally { router.serverSsr?.cleanup() } }) + + test('stream lifetime abort rejects before bot readiness even when React resolves onAllReady', async () => { + let options: + | Parameters[1] + | undefined + const pipe = vi.fn() + const abort = vi.fn((_reason?: unknown) => { + options?.onAllReady?.() + }) + reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( + (_children, nextOptions) => { + options = nextOptions + return { abort, pipe } + }, + ) + + const router = await buildRouter() + const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') + const originalServerSsr = router.serverSsr! + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + vi.useFakeTimers() + try { + const responsePromise = renderRouterToStream({ + request: new Request('http://localhost/', { + headers: { 'User-Agent': 'Googlebot' }, + }), + router, + responseHeaders: new Headers(), + children: null, + }) + const rejection = expect(responsePromise).rejects.toThrow( + 'Stream lifetime exceeded', + ) + + expect(routerTransformMocks.readableOptions).toHaveBeenCalledOnce() + expect(options?.onAllReady).toBeTypeOf('function') + await vi.runAllTimersAsync() + + await rejection + expect(abort).toHaveBeenCalledOnce() + expect(abort.mock.calls[0]![0]).toMatchObject({ + message: 'Stream lifetime exceeded', + }) + expect(pipe).not.toHaveBeenCalled() + expect(cleanup).toHaveBeenCalled() + expect(router.serverSsr).toBeUndefined() + } finally { + vi.useRealTimers() + warnSpy.mockRestore() + originalServerSsr.cleanup() + } + }) + + test('request abort before shell readiness rejects and cleans up', async () => { + const abort = vi.fn() + const controller = new AbortController() + reactDomServerMocks.renderToPipeableStream.mockReturnValueOnce({ + abort, + pipe: vi.fn(), + }) + + const router = await buildRouter() + const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') + const originalServerSsr = router.serverSsr! + const reason = new Error('request-gone-before-shell') + try { + const responsePromise = renderRouterToStream({ + request: new Request('http://localhost/', { + signal: controller.signal, + }), + router, + responseHeaders: new Headers(), + children: null, + }) + await Promise.resolve() + controller.abort(reason) + + await expect(responsePromise).rejects.toBe(reason) + expect(abort).toHaveBeenCalledOnce() + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + } finally { + originalServerSsr.cleanup() + } + }) }) diff --git a/packages/router-core/INTERNALS.md b/packages/router-core/INTERNALS.md index 3314b5d2c3..4ef0dfa031 100644 --- a/packages/router-core/INTERNALS.md +++ b/packages/router-core/INTERNALS.md @@ -104,6 +104,9 @@ resource ownership, and a promise settling is not permission to publish. - `src/ssr/handlerCallback.ts`, `src/ssr/ssr-server.ts`, and `src/ssr/transformStreamWithRouter.ts` transfer stream ownership and coordinate serialization, injection, abort, and cleanup. + `src/ssr/hydrationScripts.ts` owns the request-local hydration script queue + and framing; `src/ssr/htmlBoundaryScanner.ts` owns the byte matchers. + See `src/ssr/STREAMING.md` for the transport contract. - Framework `Transitioner` and `Matches` implementations acknowledge exact publications and render only through the selected boundary. Framework `RouterClient` and render-to-stream implementations complete hydration and diff --git a/packages/router-core/benchmarks/ssr-streaming/.gitignore b/packages/router-core/benchmarks/ssr-streaming/.gitignore new file mode 100644 index 0000000000..6628455c0a --- /dev/null +++ b/packages/router-core/benchmarks/ssr-streaming/.gitignore @@ -0,0 +1 @@ +/results/ diff --git a/packages/router-core/benchmarks/ssr-streaming/README.md b/packages/router-core/benchmarks/ssr-streaming/README.md new file mode 100644 index 0000000000..bda5d4ee12 --- /dev/null +++ b/packages/router-core/benchmarks/ssr-streaming/README.md @@ -0,0 +1,162 @@ +# SSR streaming benchmark + +This harness compares two Git revisions of router-core SSR streaming. Transform +runs validate byte count, SHA-256 digest, markers, selected transport API, and +lifecycle counts. Isolated transform timing includes hashing and marker scans; +warm transform timing moves those two checks into preflight requests. +Production-owner suites validate byte count, final owner state, and the 64 KiB +output chunk cap. Isolated owner timing includes hashing; warm and soak suites +use one separate digest-validating preflight per implementation. + +Generated JSON and Markdown summaries stay under `results/` and are ignored by +Git. CPU profiles default to a `*-profiles/` directory beside the configured +JSON output. `--profile-dir` overrides that location. + +## Quick start + +Compare the latest `origin/main` with `HEAD`: + +```sh +node packages/router-core/benchmarks/ssr-streaming/run.mjs \ + --origin=origin/main \ + --candidate=HEAD \ + --suite=common \ + --warmups=20 \ + --iterations=30 \ + --batch-requests=1000 \ + --output=packages/router-core/benchmarks/ssr-streaming/results/common.json +``` + +Use `--candidate=worktree` while testing an uncommitted optimization. Final +comparisons should use Git revisions so the result can be reproduced. + +Run the focused queue-mechanism benchmark with: + +```sh +pnpm --dir packages/router-core exec vitest bench \ + tests/hydrationQueue.bench.ts --run +``` + +## Suites + +| Suite | Purpose | Default measurement | +| ----------------- | ------------------------------------------------------------------------ | ------------------------------------------------- | +| `smoke` | Short raw, fast, and merge check | One isolated process per cell | +| `common` | Normal 1–64 KiB hydration payloads across React, Solid, and Vue profiles | Warm paired batches | +| `safe-points` | Many small React and Solid renderer records | Warm paired batches | +| `coalesced-close` | React script safe points inside large renderer chunks | Warm paired batches | +| `small-memory` | Small React raw, fast, and merge responses | Isolated processes with forced GC | +| `primary` | Large hydration, closing-tag, renderer-record, and backlog stress | Isolated processes with forced GC | +| `source` | Large flat and rope router sources | Isolated processes and direct `encodeInto` probes | +| `strings` | Large flat and rope renderer string records | Warm paired batches | +| `owner` | Production hydration owner and maximum legal backlogs | Isolated processes with forced GC | +| `owner-warm` | Production hydration owner latency | Warm paired batches | +| `owner-soak` | Production hydration owner retention after repeated requests | Post-return forced-GC checkpoints | + +Filter cells with comma-separated `--scenario` and `--mode` values. Isolated +suites also accept `--implementation` and `--runs`. Warm suites accept +`--warmups`, `--iterations`, and `--batch-requests`. + +The `coalesced-close` suite keeps hydration waiting until renderer EOF. Its +1 KiB and 64 KiB filler follows a script in one chunk, so returning at that +script can repeat the document-close search over the remaining bytes. It also +covers a close in the next chunk and a late-script control with little content +left to rescan. The filler contains complete HTML elements. An empty final +input record prevents source prefetch from finishing hydration before the +coalesced content drains. These cases measure repeated scanning within one +chunk; `safe-points` continues to measure separate small renderer records. + +The `owner-warm` suite requires both revisions to contain +`packages/router-core/src/ssr/hydrationScripts.ts`. Older `origin/main` +revisions do not contain this file. After the owner exists in a committed +baseline, use `--origin=HEAD --candidate=worktree` for later changes. + +During the initial owner introduction, run an isolated worktree-only cell: + +```sh +node packages/router-core/benchmarks/ssr-streaming/run.mjs \ + --candidate=worktree \ + --suite=owner \ + --implementation=worktree \ + --scenario=hydration-owner-16x1k \ + --runs=1 +``` + +For example: + +```sh +node packages/router-core/benchmarks/ssr-streaming/run.mjs \ + --origin=HEAD \ + --candidate=worktree \ + --suite=common \ + --scenario=hydration-32k \ + --warmups=30 \ + --iterations=50 \ + --batch-requests=2000 \ + --output=packages/router-core/benchmarks/ssr-streaming/results/candidate.json +``` + +## What the numbers mean + +Warm suites load both implementations into one Node process. They alternate which +implementation runs first for every request pair and at every batch boundary. +The warm-up count is per implementation: each warm-up iteration runs one +request against both revisions. Timed samples are complete request batches. + +For isolated transform cells, `elapsedMs` includes incremental hashing and +marker validation. For warm transform cells, it measures a byte-counted drain +after validated warm-up requests. `wallElapsedMs` also includes synthetic +request setup and lifecycle checks. Merge cells include source creation by the +fake producer. + +Isolated suites start a new Node process for each cell. Memory values are +sampled high-water deltas above a forced-GC baseline, not exact allocation +peaks and not proof that a leak is absent. + +Treat changes below 1% as inconclusive unless several independent processes +repeat the result. In soak output, heap, external, and ArrayBuffer checkpoints +describe retained JavaScript-visible memory after forced GC. RSS is allocator +high-water behavior and is not, by itself, evidence of a leak. Use unit and +integration tests for backpressure, cancellation, abort, timeout, Unicode, and +split-boundary correctness. The throughput harness does not replace those +tests. + +## Scope and limits + +- Normal transform suites use `Uint8Array` renderer records. The `strings` + suite isolates Node renderer string records. +- React uses the `script-close` safe point, Solid uses `record-end`, and Vue + uses only the universal router boundary, document close, and EOF points. +- The fixed boundary suffix lets old and new implementations consume identical + bytes and matches the production transport. +- The worker supplies the legacy `origin/main` transport and the current + hydration-output transport so the intended baseline and candidate can share + one fixture. It does not preserve intermediate private transport fields or + benchmark the complete production hydration producer. +- The `owner` suites call the production hydration owner directly. They do not + include the transform or a framework renderer. +- CPU results describe this Node and machine. They do not establish browser or + Cloudflare Worker performance. + +## Reproducibility + +The runner materializes the complete tracked `packages/router-core/src` tree +for both inputs before it builds. With `--candidate=worktree`, it first copies +one immutable worktree snapshot so later edits cannot change the measured +artifact. Results record available commit IDs, both source-tree hashes, bundle +hashes, platform details, and a hash of the measured source pair. Child +processes and bundles use `NODE_ENV=production`. + +Before publishing a conclusion: + +1. Use clean Git revision names for both sides. +2. Run the same harness revision for both implementations. +3. Verify matching output bytes and digests. +4. Repeat latency comparisons in fresh processes when the expected change is + small. +5. Run memory and correctness tests before retaining an optimization. + +For attribution only, `--cpu-prof=true` writes profiles into a sibling +`*-profiles/` directory by default. Use `--profile-dir=...` to choose another +new or empty directory. Profiles also contain fixture and validation work, so +use them as hints rather than standalone proof. diff --git a/packages/router-core/benchmarks/ssr-streaming/run.mjs b/packages/router-core/benchmarks/ssr-streaming/run.mjs new file mode 100644 index 0000000000..2d1f2245c2 --- /dev/null +++ b/packages/router-core/benchmarks/ssr-streaming/run.mjs @@ -0,0 +1,860 @@ +import { execFileSync, spawnSync } from 'node:child_process' +import { + existsSync, + mkdirSync, + mkdtempSync, + readFileSync, + readdirSync, + rmSync, + writeFileSync, +} from 'node:fs' +import { arch, cpus, platform, tmpdir } from 'node:os' +import { dirname, join, resolve } from 'node:path' +import { fileURLToPath } from 'node:url' +import { createHash } from 'node:crypto' +import { build } from 'esbuild' + +const here = dirname(fileURLToPath(import.meta.url)) +const repo = resolve(here, '../../../..') +const dependencyNodePaths = [resolve(repo, 'packages/router-core/node_modules')] +const args = Object.fromEntries( + process.argv.slice(2).map((arg) => { + const [name, value = 'true'] = arg.replace(/^--/, '').split('=', 2) + return [name, value] + }), +) +const knownArgs = new Set([ + 'suite', + 'origin', + 'candidate', + 'runs', + 'output', + 'keep-artifacts', + 'cpu-prof', + 'profile-dir', + 'scenario', + 'mode', + 'implementation', + 'warmups', + 'iterations', + 'batch-requests', +]) +for (const name of Object.keys(args)) { + if (!knownArgs.has(name)) { + throw new Error(`Unknown benchmark option: --${name}`) + } +} +const suite = args.suite ?? 'primary' +const suites = new Set([ + 'common', + 'safe-points', + 'coalesced-close', + 'small-memory', + 'smoke', + 'source', + 'strings', + 'owner', + 'owner-warm', + 'owner-soak', + 'primary', +]) +if (!suites.has(suite)) { + throw new Error(`Unknown benchmark suite: ${suite}`) +} +const isWarmSuite = + suite === 'common' || + suite === 'safe-points' || + suite === 'coalesced-close' || + suite === 'strings' || + suite === 'owner-warm' +const selectedImplementations = isWarmSuite + ? [] + : ['origin', 'worktree'].filter((implementation) => { + if (!args.implementation || args.implementation === 'all') { + return true + } + return args.implementation.split(',').includes(implementation) + }) +const unsupportedSuiteOption = ( + isWarmSuite + ? ['runs', 'implementation'] + : ['warmups', 'iterations', 'batch-requests'] +).find((name) => args[name] !== undefined) +if (unsupportedSuiteOption) { + throw new Error( + `--${unsupportedSuiteOption} is not supported by the ${suite} suite`, + ) +} +if ( + args['cpu-prof'] !== undefined && + !['true', 'false'].includes(args['cpu-prof']) +) { + throw new Error('--cpu-prof must be true or false') +} +const cpuProfiled = args['cpu-prof'] === 'true' +if (args['profile-dir'] !== undefined && !cpuProfiled) { + throw new Error('--profile-dir requires --cpu-prof=true') +} +const originRef = args.origin ?? 'origin/main' +const candidateRef = args.candidate ?? 'HEAD' +const originSha = execFileSync('git', ['rev-parse', `${originRef}^{commit}`], { + cwd: repo, + encoding: 'utf8', +}).trim() +const candidateSha = + candidateRef === 'worktree' + ? undefined + : execFileSync('git', ['rev-parse', `${candidateRef}^{commit}`], { + cwd: repo, + encoding: 'utf8', + }).trim() +const headSha = execFileSync('git', ['rev-parse', 'HEAD^{commit}'], { + cwd: repo, + encoding: 'utf8', +}).trim() +const runs = Number(args.runs ?? (suite === 'smoke' ? 1 : 3)) +const outputPath = resolve( + repo, + args.output ?? + `packages/router-core/benchmarks/ssr-streaming/results/${suite}.json`, +) +if (!outputPath.endsWith('.json')) { + throw new Error('Benchmark output must end in .json') +} +if (!Number.isInteger(runs) || runs < 1) { + throw new Error('--runs must be an integer greater than zero') +} +const keepArtifacts = args['keep-artifacts'] + ? resolve(repo, args['keep-artifacts']) + : undefined +if ( + keepArtifacts && + existsSync(keepArtifacts) && + readdirSync(keepArtifacts).length +) { + throw new Error('--keep-artifacts must name a new or empty directory') +} +const temp = keepArtifacts ?? mkdtempSync(join(tmpdir(), 'tsr-ssr-streaming-')) +mkdirSync(temp, { recursive: true }) +function cleanupTemporaryArtifacts() { + if (!keepArtifacts) { + rmSync(temp, { recursive: true, force: true }) + } +} +// Some setup and child-failure paths exit before the main try/finally can +// unwind. Register cleanup as soon as the temporary directory exists. +process.once('exit', cleanupTemporaryArtifacts) +const profileDir = cpuProfiled + ? resolve( + repo, + args['profile-dir'] ?? outputPath.replace(/\.json$/, '-profiles'), + ) + : undefined +if (profileDir) { + if (existsSync(profileDir) && readdirSync(profileDir).length) { + throw new Error( + `${args['profile-dir'] === undefined ? 'Default profile directory' : '--profile-dir'} must name a new or empty directory`, + ) + } + mkdirSync(profileDir, { recursive: true }) +} +const childEnvironment = { ...process.env, NODE_ENV: 'production' } + +function sourcePathsAt(ref) { + const output = execFileSync( + 'git', + ['ls-tree', '-r', '--name-only', ref, '--', 'packages/router-core/src'], + { cwd: repo, encoding: 'utf8' }, + ).trim() + return output ? output.split('\n') : [] +} + +function worktreeSourcePaths() { + const output = execFileSync( + 'git', + [ + 'ls-files', + '--cached', + '--others', + '--exclude-standard', + '--', + 'packages/router-core/src', + ], + { cwd: repo, encoding: 'utf8' }, + ).trim() + return output + ? output + .split('\n') + .filter((repositoryPath) => existsSync(resolve(repo, repositoryPath))) + .sort() + : [] +} + +function materializeSourceSnapshot(ref, sourceRoot, repositoryPaths) { + for (const repositoryPath of repositoryPaths) { + const target = join( + sourceRoot, + repositoryPath.slice('packages/router-core/src/'.length), + ) + mkdirSync(dirname(target), { recursive: true }) + writeFileSync( + target, + execFileSync('git', ['show', `${ref}:${repositoryPath}`], { cwd: repo }), + ) + } +} + +function materializeWorktreeSnapshot(sourceRoot, repositoryPaths) { + for (const repositoryPath of repositoryPaths) { + const target = join( + sourceRoot, + repositoryPath.slice('packages/router-core/src/'.length), + ) + mkdirSync(dirname(target), { recursive: true }) + writeFileSync(target, readFileSync(resolve(repo, repositoryPath))) + } +} + +function sourceSnapshotSha256(sourceRoot, repositoryPaths) { + const hash = createHash('sha256') + for (const repositoryPath of repositoryPaths) { + hash.update(repositoryPath) + hash.update('\0') + hash.update( + readFileSync( + join( + sourceRoot, + repositoryPath.slice('packages/router-core/src/'.length), + ), + ), + ) + hash.update('\0') + } + return hash.digest('hex') +} + +const originSourceRoot = join(temp, 'origin/packages/router-core/src') +const candidateSourceRoot = join(temp, 'worktree/packages/router-core/src') +const originSourcePaths = sourcePathsAt(originSha) +const candidateSourcePaths = + candidateRef === 'worktree' + ? worktreeSourcePaths() + : sourcePathsAt(candidateSha) +if (suite.startsWith('owner')) { + const ownerSourcePath = 'packages/router-core/src/ssr/hydrationScripts.ts' + const missingImplementations = [] + const requiredImplementations = isWarmSuite + ? ['origin', 'worktree'] + : selectedImplementations + if ( + requiredImplementations.includes('origin') && + !originSourcePaths.includes(ownerSourcePath) + ) { + missingImplementations.push(`origin (${originRef})`) + } + if ( + requiredImplementations.includes('worktree') && + !candidateSourcePaths.includes(ownerSourcePath) + ) { + missingImplementations.push(`candidate (${candidateRef})`) + } + if (missingImplementations.length > 0) { + throw new Error( + `The ${suite} suite requires hydrationScripts.ts in the selected revision(s). ` + + `Missing from ${missingImplementations.join(' and ')}.`, + ) + } +} +materializeSourceSnapshot(originSha, originSourceRoot, originSourcePaths) +if (candidateRef === 'worktree') { + materializeWorktreeSnapshot(candidateSourceRoot, candidateSourcePaths) +} else { + materializeSourceSnapshot( + candidateSha, + candidateSourceRoot, + candidateSourcePaths, + ) +} +const originSourceSha256 = sourceSnapshotSha256( + originSourceRoot, + originSourcePaths, +) +const candidateSourceSha256 = sourceSnapshotSha256( + candidateSourceRoot, + candidateSourcePaths, +) +const measuredSourcePairSha256 = createHash('sha256') + .update(originSourceSha256) + .update('\0') + .update(candidateSourceSha256) + .digest('hex') +const transformSources = { + origin: readFileSync( + join(originSourceRoot, 'ssr/transformStreamWithRouter.ts'), + 'utf8', + ), + worktree: readFileSync( + join(candidateSourceRoot, 'ssr/transformStreamWithRouter.ts'), + 'utf8', + ), +} +const hasHistoricalBufferGuards = { + origin: transformSources.origin.includes( + 'SSR router HTML exceeded maximum buffer', + ), + worktree: transformSources.worktree.includes( + 'SSR router HTML exceeded maximum buffer', + ), +} +const transformExportNames = { + origin: transformSources.origin.includes( + 'export function transformStreamWithRouter(', + ) + ? 'transformStreamWithRouter' + : 'transformReadableStreamWithRouter', + worktree: transformSources.worktree.includes( + 'export function transformStreamWithRouter(', + ) + ? 'transformStreamWithRouter' + : 'transformReadableStreamWithRouter', +} + +// The worktree transform imports protocol constants from hydrationScripts. +// Its producer is not used by this benchmark worker, so the Vite-only script +// string can stay empty in the benchmark bundle. +const scriptStringPlugin = { + name: 'script-string', + setup(build) { + build.onResolve({ filter: /\?script-string$/ }, (args) => ({ + path: args.path, + namespace: 'script-string', + })) + build.onLoad({ filter: /.*/, namespace: 'script-string' }, () => ({ + contents: 'export default ""', + loader: 'js', + })) + }, +} + +async function bundle(implementation) { + const sourceRoot = + implementation === 'origin' ? originSourceRoot : candidateSourceRoot + const entry = join(temp, `${implementation}-entry.ts`) + writeFileSync( + entry, + suite === 'owner' || suite === 'owner-soak' + ? `import { runHydrationOwner, runHydrationOwnerSoak } from ${JSON.stringify(resolve(here, 'worker.ts'))}\n` + + `import { createHydrationScripts } from ${JSON.stringify(join(sourceRoot, 'ssr/hydrationScripts.ts'))}\n` + + `const values = Object.fromEntries(process.argv.slice(2).map((value) => value.replace(/^--/, '').split('=', 2)))\n` + + `${suite === 'owner-soak' ? 'runHydrationOwnerSoak' : 'runHydrationOwner'}(createHydrationScripts, ${JSON.stringify(implementation)}, values.scenario)\n` + : `import { run, runProbe } from ${JSON.stringify(resolve(here, 'worker.ts'))}\n` + + `import { ${transformExportNames[implementation]} as transform } from ${JSON.stringify(join(sourceRoot, 'ssr/transformStreamWithRouter.ts'))}\n` + + `const values = Object.fromEntries(process.argv.slice(2).map((value) => value.replace(/^--/, '').split('=', 2)))\n` + + `if (values.probe) { runProbe(values.shape, Number(values.size), values.strategy) } else { await run(transform, ${JSON.stringify(implementation)}, values.scenario, values.mode) }\n`, + ) + const outfile = join(temp, `${implementation}.mjs`) + await build({ + entryPoints: [entry], + outfile, + bundle: true, + platform: 'node', + format: 'esm', + target: 'node20', + logLevel: 'silent', + nodePaths: dependencyNodePaths, + plugins: [scriptStringPlugin], + define: { 'process.env.NODE_ENV': '"production"' }, + }) + return outfile +} + +async function bundleWarmComparison() { + const entry = join(temp, 'warm-comparison-entry.ts') + writeFileSync( + entry, + suite === 'owner-warm' + ? `import { runWarmHydrationOwnerComparison } from ${JSON.stringify(resolve(here, 'worker.ts'))}\n` + + `import { createHydrationScripts as origin } from ${JSON.stringify(join(originSourceRoot, 'ssr/hydrationScripts.ts'))}\n` + + `import { createHydrationScripts as worktree } from ${JSON.stringify(join(candidateSourceRoot, 'ssr/hydrationScripts.ts'))}\n` + + `const values = Object.fromEntries(process.argv.slice(2).map((value) => value.replace(/^--/, '').split('=', 2)))\n` + + `const result = runWarmHydrationOwnerComparison({ origin, worktree }, values.scenarios.split(','), Number(values.warmups), Number(values.iterations), Number(values.batchRequests))\n` + + `process.stdout.write(JSON.stringify(result) + '\\n')\n` + : `import { runWarmComparison } from ${JSON.stringify(resolve(here, 'worker.ts'))}\n` + + `import { ${transformExportNames.origin} as origin } from ${JSON.stringify(join(originSourceRoot, 'ssr/transformStreamWithRouter.ts'))}\n` + + `import { ${transformExportNames.worktree} as worktree } from ${JSON.stringify(join(candidateSourceRoot, 'ssr/transformStreamWithRouter.ts'))}\n` + + `const values = Object.fromEntries(process.argv.slice(2).map((value) => value.replace(/^--/, '').split('=', 2)))\n` + + `const result = await runWarmComparison({ origin, worktree }, values.scenarios.split(','), values.modes.split(','), Number(values.warmups), Number(values.iterations), Number(values.batchRequests))\n` + + `process.stdout.write(JSON.stringify(result) + '\\n')\n`, + ) + const outfile = join(temp, 'warm-comparison.mjs') + await build({ + entryPoints: [entry], + outfile, + bundle: true, + platform: 'node', + format: 'esm', + target: 'node20', + logLevel: 'silent', + nodePaths: dependencyNodePaths, + plugins: [scriptStringPlugin], + define: { 'process.env.NODE_ENV': '"production"' }, + }) + return outfile +} + +function tasksForSuite() { + if (suite === 'common') { + return [ + 'hydration-1k', + 'hydration-4k', + 'hydration-16k', + 'hydration-32k', + 'hydration-64k', + 'hydration-solid-32k', + 'hydration-vue-32k', + ] + } + if (suite === 'safe-points') { + return ['react-patches-64-records', 'solid-patches-64-records'] + } + if (suite === 'coalesced-close') { + return [ + 'react-coalesced-early-script-1k', + 'react-coalesced-early-script-64k', + 'react-coalesced-next-close-64k', + 'react-coalesced-late-script-64k', + ] + } + if (suite === 'small-memory') { + return ['hydration-1k', 'hydration-4k'] + } + if (suite === 'smoke') { + return ['closing-heavy-17m'] + } + if (suite === 'source') { + return [ + 'router-string-flat-1m', + 'router-string-flat-4m', + 'router-string-flat-17m', + 'router-string-flat-32m', + 'router-string-rope-1m', + 'router-string-rope-4m', + 'router-string-rope-17m', + 'router-string-rope-32m', + ] + } + if (suite === 'strings') { + return [ + 'application-string-flat-1m', + 'application-string-flat-4m', + 'application-string-flat-17m', + 'application-string-rope-1m', + 'application-string-rope-4m', + 'application-string-rope-17m', + ] + } + if (suite === 'owner' || suite === 'owner-warm') { + return [ + 'hydration-owner-1x1k', + 'hydration-owner-16x1k', + 'hydration-owner-400x40k', + 'hydration-owner-4095x4k', + ] + } + if (suite === 'owner-soak') { + return ['hydration-owner-16x1k', 'hydration-owner-4095x4k'] + } + return [ + 'hydration-32k', + 'hydration-17m', + 'router-records-15m', + 'closing-heavy-17m', + 'react18-patches-17m', + 'react19-patches-17m', + ] +} + +function writeSummary(results, path, warmComparison) { + const provenance = [ + `Origin: ${originRef} (${originSha})`, + `Candidate: ${candidateRef} (${candidateSha ?? `worktree snapshot ${candidateSourceSha256}`})`, + `Node: ${process.version}; NODE_ENV=production`, + ] + if (warmComparison) { + const lines = [ + '# Warm SSR streaming benchmark results', + '', + ...provenance, + `Requests per timed batch: ${warmComparison.batchRequests}`, + '', + '| baseline | scenario | framework | safe point | mode | baseline mean us/request | candidate mean us/request | aggregate change | paired geometric mean | paired median | paired p10 | paired p90 | wall aggregate |', + '| --- | --- | --- | --- | --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: | ---: |', + ] + for (const comparison of warmComparison.comparisons) { + const baseline = results.find( + (value) => + value.scenario === comparison.scenario && + value.framework === comparison.framework && + value.rendererSafePoint === comparison.rendererSafePoint && + value.mode === comparison.mode && + value.implementation === comparison.baseline && + value.comparisonBaseline === comparison.baseline, + ) + const worktree = results.find( + (value) => + value.scenario === comparison.scenario && + value.framework === comparison.framework && + value.rendererSafePoint === comparison.rendererSafePoint && + value.mode === comparison.mode && + value.implementation === 'worktree' && + value.comparisonBaseline === comparison.baseline, + ) + if (!baseline || !worktree) { + throw new Error( + `Missing warm result row for ${comparison.scenario}/${comparison.framework}/${comparison.rendererSafePoint ?? '-'}/${comparison.mode}/${comparison.baseline}`, + ) + } + lines.push( + `| ${comparison.baseline} | ${comparison.scenario} | ${comparison.framework} | ${comparison.rendererSafePoint ?? '-'} | ${comparison.mode} | ${(baseline.statistics.elapsedMs.mean * 1000).toFixed(2)} | ${(worktree.statistics.elapsedMs.mean * 1000).toFixed(2)} | ${comparison.aggregateElapsedPercent.toFixed(1)}% | ${comparison.pairedElapsedPercent.geometricMean.toFixed(1)}% | ${comparison.pairedElapsedPercent.median.toFixed(1)}% | ${comparison.pairedElapsedPercent.p10.toFixed(1)}% | ${comparison.pairedElapsedPercent.p90.toFixed(1)}% | ${comparison.aggregateWallElapsedPercent.toFixed(1)}% |`, + ) + } + writeFileSync(path, `${lines.join('\n')}\n`) + return + } + + const lines = [ + '# SSR streaming benchmark results', + '', + ...provenance, + '', + '| implementation | run | scenario | framework | safe point | mode | TTFB ms | first router ms | MiB/s | heap peak MiB | external peak MiB | max chunk | records HWM |', + '| --- | ---: | --- | --- | --- | --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: |', + ] + const soakRows = [] + for (const value of results) { + if (value.outcome === 'expected-error') { + lines.push( + `| ${value.implementation} | ${value.run ?? '-'} | ${value.scenario} | ${value.framework} | ${value.rendererSafePoint ?? '-'} | ${value.mode} | - | - | expected guard | - | - | - | - |`, + ) + continue + } + if (value.implementation === 'v8-probe') { + for (const pass of value.passes) { + lines.push( + `| v8-probe | ${pass.pass} | ${value.scenario} | - | - | ${value.mode} | - | - | ${pass.throughputMiBPerSecond.toFixed(1)} | ${(pass.memoryPeakBytes.heapUsed / 1048576).toFixed(1)} | ${(pass.memoryPeakBytes.external / 1048576).toFixed(1)} | ${value.outputChunkBytes} | 0 |`, + ) + } + continue + } + if (value.mode === 'owner-soak') { + soakRows.push(value) + continue + } + lines.push( + `| ${value.implementation} | ${value.run ?? '-'} | ${value.scenario} | ${value.framework} | ${value.rendererSafePoint ?? '-'} | ${value.mode} | ${value.ttfbMs?.toFixed(2) ?? '-'} | ${value.firstRouterScriptMs?.toFixed(2) ?? '-'} | ${value.throughputMiBPerSecond.toFixed(1)} | ${(value.memoryPeakBytes.heapUsed / 1048576).toFixed(1)} | ${(value.memoryPeakBytes.external / 1048576).toFixed(1)} | ${value.maxOutputChunkBytes} | ${value.sourceRecordHighWater} |`, + ) + } + if (soakRows.length > 0) { + lines.push( + '', + '## Post-GC retention soak', + '', + '| implementation | run | scenario | requests | MiB/s including checkpoint GC | retained heap HWM MiB | retained external HWM MiB | retained ArrayBuffer HWM MiB |', + '| --- | ---: | --- | ---: | ---: | ---: | ---: | ---: |', + ) + for (const value of soakRows) { + lines.push( + `| ${value.implementation} | ${value.run ?? '-'} | ${value.scenario} | ${value.requests} | ${value.throughputIncludingGcMiBPerSecond.toFixed(1)} | ${(value.retainedHighWaterBytes.heapUsed / 1048576).toFixed(1)} | ${(value.retainedHighWaterBytes.external / 1048576).toFixed(1)} | ${(value.retainedHighWaterBytes.arrayBuffers / 1048576).toFixed(1)} |`, + ) + } + } + writeFileSync(path, `${lines.join('\n')}\n`) +} + +try { + const bundles = {} + for (const implementation of selectedImplementations) { + bundles[implementation] = await bundle(implementation) + } + const scenarios = tasksForSuite().filter( + (scenario) => !args.scenario || args.scenario.split(',').includes(scenario), + ) + const supportedModes = + suite === 'owner' || suite === 'owner-warm' || suite === 'owner-soak' + ? ['owner'] + : suite === 'source' || + suite === 'strings' || + suite === 'safe-points' || + suite === 'coalesced-close' + ? ['merge'] + : isWarmSuite + ? ['fast', 'merge'] + : ['raw', 'fast', 'merge'] + const modes = supportedModes.filter( + (mode) => !args.mode || args.mode.split(',').includes(mode), + ) + const implementations = selectedImplementations + const results = [] + const artifactPaths = { ...bundles } + let warmComparison + if ( + scenarios.length === 0 || + modes.length === 0 || + (!isWarmSuite && implementations.length === 0) + ) { + throw new Error('Benchmark filters selected no cells') + } + if (isWarmSuite) { + const warmBundle = await bundleWarmComparison() + artifactPaths['warm-comparison'] = warmBundle + const focusedSafePoints = + suite === 'safe-points' || suite === 'coalesced-close' + const warmups = Number(args.warmups ?? (focusedSafePoints ? 20 : 50)) + const iterations = Number(args.iterations ?? (focusedSafePoints ? 20 : 50)) + const batchRequests = Number( + args['batch-requests'] ?? (focusedSafePoints ? 250 : 1000), + ) + if ( + scenarios.length === 0 || + !Number.isInteger(warmups) || + warmups < 0 || + !Number.isInteger(iterations) || + iterations < 1 || + !Number.isInteger(batchRequests) || + batchRequests < 1 + ) { + throw new Error('Invalid warm-suite scenario or iteration count') + } + const child = spawnSync( + process.execPath, + [ + '--expose-gc', + ...(profileDir + ? [ + '--cpu-prof', + `--cpu-prof-dir=${profileDir}`, + `--cpu-prof-name=warm-${suite}.cpuprofile`, + ] + : []), + warmBundle, + `--scenarios=${scenarios.join(',')}`, + `--modes=${modes.join(',')}`, + `--warmups=${warmups}`, + `--iterations=${iterations}`, + `--batchRequests=${batchRequests}`, + ], + { + cwd: repo, + encoding: 'utf8', + maxBuffer: 10 * 1024 * 1024, + env: childEnvironment, + }, + ) + if (child.status !== 0) { + process.stderr.write(child.stderr) + process.stderr.write(child.stdout) + process.exit(child.status ?? 1) + } + warmComparison = JSON.parse(child.stdout.trim()) + if (warmComparison.comparisons.length === 0) { + throw new Error('Benchmark filters selected no warm comparison cells') + } + results.push(...warmComparison.results) + for (const comparison of warmComparison.comparisons) { + process.stdout.write( + `${comparison.baseline}->candidate ${comparison.scenario} ${comparison.framework} ${comparison.rendererSafePoint ?? 'no-extra-safe-point'} ${comparison.mode}: aggregate ${comparison.aggregateElapsedPercent.toFixed(1)}%, paired geometric mean ${comparison.pairedElapsedPercent.geometricMean.toFixed(1)}%\n`, + ) + } + } + for (const scenario of scenarios) { + const framework = + scenario.startsWith('hydration-solid-') || scenario.startsWith('solid-') + ? 'solid' + : scenario.startsWith('hydration-vue-') + ? 'vue' + : 'react' + const rendererSafePoint = + framework === 'react' + ? 'script-close' + : framework === 'solid' + ? 'record-end' + : undefined + for (const mode of modes) { + for (let run = 1; run <= runs; run++) { + const orders = [ + ['origin', 'worktree'], + ['worktree', 'origin'], + ] + const implementationOrder = orders[(run - 1) % orders.length].filter( + (implementation) => implementations.includes(implementation), + ) + for (const implementation of implementationOrder) { + const profileArgs = profileDir + ? [ + '--cpu-prof', + `--cpu-prof-dir=${profileDir}`, + `--cpu-prof-name=${implementation}-${scenario}-${mode}-${run}.cpuprofile`, + ] + : [] + const child = spawnSync( + process.execPath, + [ + '--expose-gc', + ...profileArgs, + bundles[implementation], + `--scenario=${scenario}`, + `--mode=${mode}`, + ], + { + cwd: repo, + encoding: 'utf8', + maxBuffer: 10 * 1024 * 1024, + env: childEnvironment, + }, + ) + if (child.status !== 0) { + const expectedHistoricalLimit = + mode !== 'merge' || !hasHistoricalBufferGuards[implementation] + ? undefined + : scenario === 'react18-patches-17m' + ? 'SSR stream tail exceeded maximum buffer' + : scenario === 'hydration-17m' || + /^router-string-(flat|rope)-(17|32)m$/.test(scenario) + ? 'SSR router HTML exceeded maximum buffer' + : undefined + const diagnostic = `${child.stderr}\n${child.stdout}` + if ( + expectedHistoricalLimit && + diagnostic.includes(expectedHistoricalLimit) + ) { + results.push({ + implementation, + scenario, + framework, + rendererSafePoint, + mode, + outcome: 'expected-error', + error: expectedHistoricalLimit, + run, + }) + process.stdout.write( + `${implementation} ${scenario} ${mode} ${run}/${runs}: expected historical buffer guard\n`, + ) + continue + } + process.stderr.write(child.stderr) + process.stderr.write(child.stdout) + process.exit(child.status ?? 1) + } + const value = JSON.parse(child.stdout.trim()) + value.run = run + results.push(value) + const throughput = + value.throughputMiBPerSecond ?? + value.throughputIncludingGcMiBPerSecond + process.stdout.write( + `${implementation} ${scenario} ${mode} ${run}/${runs}: ${throughput.toFixed(1)} MiB/s\n`, + ) + } + } + } + } + if (suite === 'source' && !args.scenario && !args.mode) { + for (const shape of ['flat', 'rope']) { + for (const size of [1, 4, 17, 32]) { + for (const strategy of ['suffix', 'window']) { + const profileArgs = profileDir + ? [ + '--cpu-prof', + `--cpu-prof-dir=${profileDir}`, + `--cpu-prof-name=probe-${shape}-${size}m-${strategy}.cpuprofile`, + ] + : [] + const child = spawnSync( + process.execPath, + [ + '--expose-gc', + ...profileArgs, + bundles.worktree ?? bundles.origin, + '--probe=true', + `--shape=${shape}`, + `--size=${size}`, + `--strategy=${strategy}`, + ], + { + cwd: repo, + encoding: 'utf8', + maxBuffer: 10 * 1024 * 1024, + env: childEnvironment, + }, + ) + if (child.status !== 0) { + process.stderr.write(child.stderr) + process.stderr.write(child.stdout) + process.exit(child.status ?? 1) + } + results.push(JSON.parse(child.stdout.trim())) + } + } + } + } + mkdirSync(dirname(outputPath), { recursive: true }) + writeFileSync( + outputPath, + `${JSON.stringify( + { + generatedAt: new Date().toISOString(), + node: process.version, + nodeEnv: 'production', + cpuProfiled, + platform: { os: platform(), arch: arch(), cpu: cpus()[0]?.model }, + originRef, + originSha, + originSourceSha256, + candidateRef, + candidateSha, + headSha, + candidateSourceSha256, + benchmarkInput: + suite === 'strings' + ? 'renderer string records' + : suite.startsWith('owner') + ? 'production hydration owner' + : 'Uint8Array renderer records', + measuredSourcePairSha256, + artifactSha256: Object.fromEntries( + Object.entries(artifactPaths) + .map(([name, path]) => [ + name, + createHash('sha256').update(readFileSync(path)).digest('hex'), + ]) + .concat( + profileDir + ? readdirSync(profileDir) + .filter((name) => name.endsWith('.cpuprofile')) + .sort() + .map((name) => [ + `profile:${name}`, + createHash('sha256') + .update(readFileSync(join(profileDir, name))) + .digest('hex'), + ]) + : [], + ), + ), + suite, + runs: isWarmSuite ? undefined : runs, + warmComparison, + results: isWarmSuite ? undefined : results, + }, + null, + 2, + )}\n`, + ) + const summaryPath = outputPath.replace(/\.json$/, '.md') + writeSummary(results, summaryPath, warmComparison) + process.stdout.write(`Raw results: ${outputPath}\nSummary: ${summaryPath}\n`) +} finally { + cleanupTemporaryArtifacts() + process.removeListener('exit', cleanupTemporaryArtifacts) +} diff --git a/packages/router-core/benchmarks/ssr-streaming/worker.ts b/packages/router-core/benchmarks/ssr-streaming/worker.ts new file mode 100644 index 0000000000..5a12fe2920 --- /dev/null +++ b/packages/router-core/benchmarks/ssr-streaming/worker.ts @@ -0,0 +1,2254 @@ +import { createHash } from 'node:crypto' +import { ReadableStream } from 'node:stream/web' +import { performance } from 'node:perf_hooks' + +const MiB = 1024 * 1024 +// Shared legacy-compatible input: origin finds the ID, while the current +// transform finds the exact boundary suffix. Both benchmark the same bytes. +const BARRIER = + '' +const SHELL_PREFIX = '
done
' +const PREFIX = `${SHELL_PREFIX}${BARRIER}` +const SUFFIX = '' +const SCRIPT_OPEN = '' +const REACT_PATCH_PREFIX = '' +const REACT_PATCH_BYTES = 32 * 1024 +const REACT_PATCH = + REACT_PATCH_PREFIX + + 'x'.repeat( + REACT_PATCH_BYTES - REACT_PATCH_PREFIX.length - REACT_PATCH_SUFFIX.length, + ) + + REACT_PATCH_SUFFIX +const SMALL_REACT_PATCH = + '' +const SMALL_SOLID_RECORD = '' +const COALESCED_PATCH = '' +const COALESCED_LAST_PATCH = '' +const COALESCED_FILLER = '
ordinary text
' +// Mirrors of `src/ssr/hydrationScripts.ts` limits and states. The worker +// also runs against a baseline worktree, so it cannot import them; keep these +// in step with MAX_HYDRATION_OUTPUT_CHUNK_BYTES, MAX_DIRECT_CODE_UNITS, +// MIN_OUTPUT_BYTES, and HydrationScriptOutputState. +const OUTPUT_BYTES = 64 * 1024 +const FILL_BYTES = 64 * 1024 +const DIRECT_HYDRATION_CODE_UNITS = 16 * 1024 +const MIN_HYDRATION_OUTPUT_BYTES = 256 + +const HydrationOutputState = { + Waiting: 0, + Ready: 1, + Active: 2, + Done: 3, + Failed: 4, +} as const +type HydrationOutputState = + (typeof HydrationOutputState)[keyof typeof HydrationOutputState] +const HydrationRecordPhase = { + Opening: 0, + Source: 1, + Closing: 2, +} as const +type HydrationRecordPhase = + (typeof HydrationRecordPhase)[keyof typeof HydrationRecordPhase] +const hydrationEncoder = new TextEncoder() + +type Mode = 'raw' | 'fast' | 'merge' +type Shape = 'flat' | 'rope' +type Framework = 'react' | 'solid' | 'vue' +type RendererSafePoint = 'script-close' | 'record-end' +type BaselineImplementation = 'origin' +type AppStreamValue = Uint8Array | string +type Transform = ( + router: any, + stream: ReadableStream, + options?: { rendererSafePoint?: RendererSafePoint }, +) => ReadableStream + +type Memory = { + heapUsed: number + external: number + arrayBuffers: number + rss: number +} + +type ScenarioMetadata = { + name: string + framework: Framework + rendererSafePoint?: RendererSafePoint +} + +type Scenario = + | (ScenarioMetadata & { + kind: 'hydration' + records: number + recordBytes: number + shape: Shape + }) + | (ScenarioMetadata & { + kind: 'closing' + bytes: number + framework: 'react' + rendererSafePoint: 'script-close' + }) + | (ScenarioMetadata & { + kind: 'renderer-records' + record: string + records: number + closeBeforeRecords: boolean + routerRecordBytes: number + framework: 'react' | 'solid' + rendererSafePoint: RendererSafePoint + }) + | (ScenarioMetadata & { + kind: 'coalesced-close' + bytes: number + scriptAtEnd: boolean + closeInNextChunk: boolean + framework: 'react' + rendererSafePoint: 'script-close' + }) + | (ScenarioMetadata & { + kind: 'application-string' + bytes: number + shape: Shape + routerRecordBytes: number + framework: 'react' + rendererSafePoint: 'script-close' + }) + +function parseScenario(name: string): Scenario { + const coalescedCloseMatch = + /^react-coalesced-(early-script|next-close|late-script)-(1|64)k$/.exec(name) + if (coalescedCloseMatch) { + return { + kind: 'coalesced-close', + name, + bytes: Number(coalescedCloseMatch[2]) * 1024, + scriptAtEnd: coalescedCloseMatch[1] === 'late-script', + closeInNextChunk: coalescedCloseMatch[1] === 'next-close', + framework: 'react', + rendererSafePoint: 'script-close', + } + } + const commonHydrationMatch = + /^hydration(?:(?:-(solid|vue))?)-(1|4|16|32|64)k$/.exec(name) + if (commonHydrationMatch) { + const framework = + (commonHydrationMatch[1] as Framework | undefined) ?? 'react' + return { + kind: 'hydration', + name, + records: 1, + recordBytes: Number(commonHydrationMatch[2]) * 1024, + shape: 'flat', + framework, + rendererSafePoint: + framework === 'react' + ? 'script-close' + : framework === 'solid' + ? 'record-end' + : undefined, + } + } + if (name === 'hydration-17m') { + return { + kind: 'hydration', + name, + records: 1, + recordBytes: 17 * MiB, + shape: 'flat', + framework: 'react', + rendererSafePoint: 'script-close', + } + } + if (name === 'router-records-15m') { + return { + kind: 'hydration', + name, + records: 480, + recordBytes: 32 * 1024, + shape: 'flat', + framework: 'react', + rendererSafePoint: 'script-close', + } + } + if (name === 'closing-heavy-17m') { + return { + kind: 'closing', + name, + bytes: 17 * MiB, + framework: 'react', + rendererSafePoint: 'script-close', + } + } + if (name === 'react18-patches-17m') { + return { + kind: 'renderer-records', + name, + record: REACT_PATCH, + records: (17 * MiB) / REACT_PATCH_BYTES, + closeBeforeRecords: true, + routerRecordBytes: 32 * 1024, + framework: 'react', + rendererSafePoint: 'script-close', + } + } + if (name === 'react19-patches-17m') { + return { + kind: 'renderer-records', + name, + record: REACT_PATCH, + records: (17 * MiB) / REACT_PATCH_BYTES, + closeBeforeRecords: false, + routerRecordBytes: 32 * 1024, + framework: 'react', + rendererSafePoint: 'script-close', + } + } + if (name === 'react-patches-64-records') { + return { + kind: 'renderer-records', + name, + record: SMALL_REACT_PATCH, + records: 64, + closeBeforeRecords: false, + routerRecordBytes: 1024, + framework: 'react', + rendererSafePoint: 'script-close', + } + } + if (name === 'solid-patches-64-records') { + return { + kind: 'renderer-records', + name, + record: SMALL_SOLID_RECORD, + records: 64, + closeBeforeRecords: false, + routerRecordBytes: 1024, + framework: 'solid', + rendererSafePoint: 'record-end', + } + } + const applicationStringMatch = + /^application-string-(flat|rope)-(1|4|17)m$/.exec(name) + if (applicationStringMatch) { + return { + kind: 'application-string', + name, + bytes: Number(applicationStringMatch[2]) * MiB, + shape: applicationStringMatch[1] as Shape, + routerRecordBytes: 1024, + framework: 'react', + rendererSafePoint: 'script-close', + } + } + const routerMatch = /^(router-string)-(flat|rope)-(1|4|17|32)m$/.exec(name) + if (routerMatch) { + return { + kind: 'hydration', + name, + records: 1, + recordBytes: Number(routerMatch[3]) * MiB, + shape: routerMatch[2] as Shape, + framework: 'react', + rendererSafePoint: 'script-close', + } + } + throw new Error(`Unknown benchmark scenario: ${name}`) +} + +function forceGc() { + if (typeof globalThis.gc !== 'function') { + throw new Error('The benchmark worker requires node --expose-gc') + } + globalThis.gc() + globalThis.gc() +} + +function memory(): Memory { + const value = process.memoryUsage() + return { + heapUsed: value.heapUsed, + external: value.external, + arrayBuffers: value.arrayBuffers, + rss: value.rss, + } +} + +function delta(value: Memory, baseline: Memory): Memory { + return { + heapUsed: value.heapUsed - baseline.heapUsed, + external: value.external - baseline.external, + arrayBuffers: value.arrayBuffers - baseline.arrayBuffers, + rss: value.rss - baseline.rss, + } +} + +function maxMemory(target: Memory, value: Memory) { + target.heapUsed = Math.max(target.heapUsed, value.heapUsed) + target.external = Math.max(target.external, value.external) + target.arrayBuffers = Math.max(target.arrayBuffers, value.arrayBuffers) + target.rss = Math.max(target.rss, value.rss) +} + +function marker(index: number) { + return `r${index.toString(36).padStart(6, '0')}:` +} + +function fillCode(index: number) { + return 97 + (index % 20) +} + +function createSource(bytes: number, index: number, shape: Shape) { + const recordMarker = marker(index) + const remaining = bytes - recordMarker.length + if (remaining < 0) { + throw new Error('Source record is smaller than its marker') + } + if (shape === 'flat') { + const source = Buffer.allocUnsafe(bytes) + source.fill(fillCode(index)) + source.write(recordMarker, 0, 'ascii') + return source.toString('latin1') + } + const piece = String.fromCharCode(fillCode(index)).repeat(4096) + let source = recordMarker + let left = remaining + while (left > 0) { + source += left >= piece.length ? piece : piece.slice(0, left) + left -= Math.min(left, piece.length) + } + return source +} + +function updateRepeated( + hash: ReturnType, + code: number, + bytes: number, +) { + const buffer = Buffer.allocUnsafe(Math.min(FILL_BYTES, bytes || 1)).fill(code) + let left = bytes + while (left > 0) { + const length = Math.min(left, buffer.length) + hash.update(buffer.subarray(0, length)) + left -= length + } +} + +function updateSource( + hash: ReturnType, + bytes: number, + index: number, +) { + const recordMarker = marker(index) + hash.update(recordMarker) + updateRepeated(hash, fillCode(index), bytes - recordMarker.length) +} + +type RouterSource = { + records: number + recordBytes: number + shape: Shape +} + +function getRouterSource(scenario: Scenario): RouterSource | undefined { + if (scenario.kind === 'hydration') { + return { + records: scenario.records, + recordBytes: scenario.recordBytes, + shape: scenario.shape, + } + } + if (scenario.kind === 'renderer-records') { + return { + records: 1, + recordBytes: scenario.routerRecordBytes, + shape: 'flat', + } + } + if (scenario.kind === 'application-string') { + return { + records: 1, + recordBytes: scenario.routerRecordBytes, + shape: 'flat', + } + } + return undefined +} + +function expected(scenario: Scenario, mode: Mode) { + const hash = createHash('sha256') + let bytes = 0 + const add = (value: string) => { + hash.update(value) + bytes += Buffer.byteLength(value) + } + const addRouterRecord = (recordBytes: number, index: number) => { + add(SCRIPT_OPEN) + updateSource(hash, recordBytes, index) + bytes += recordBytes + add(SCRIPT_CLOSE) + } + const addRouterSources = () => { + const source = getRouterSource(scenario) + if (!source) { + return + } + for (let index = 0; index < source.records; index++) { + addRouterRecord(source.recordBytes, index) + } + } + const addRendererRecords = (record: string, records: number) => { + for (let index = 0; index < records; index++) { + add(record) + } + } + + if (scenario.kind === 'coalesced-close') { + add(PREFIX) + if (!scenario.scriptAtEnd) { + add(COALESCED_PATCH) + } + add(createCoalescedFiller(scenario.bytes)) + if (scenario.scriptAtEnd) { + add(COALESCED_PATCH) + } + if (mode !== 'merge') { + add(SUFFIX) + } + add(COALESCED_LAST_PATCH) + if (mode === 'merge') { + add(SUFFIX) + } + } else if (scenario.kind === 'closing') { + add(SHELL_PREFIX) + const pattern = '
x
' + const repetitions = Math.floor(scenario.bytes / pattern.length) + const remainder = scenario.bytes % pattern.length + for (let index = 0; index < repetitions; index++) { + add(pattern) + } + add(pattern.slice(0, remainder)) + add(BARRIER) + add(SUFFIX) + } else if (scenario.kind === 'hydration') { + if (mode === 'merge') { + add(PREFIX) + addRouterSources() + } else { + add(SHELL_PREFIX) + addRouterSources() + add(BARRIER) + } + add(SUFFIX) + } else if (scenario.kind === 'renderer-records') { + if (mode === 'merge') { + add(PREFIX) + addRendererRecords(scenario.record, scenario.records) + addRouterSources() + add(SUFFIX) + } else { + add(SHELL_PREFIX) + addRouterSources() + add(BARRIER) + if (scenario.closeBeforeRecords) { + add(SUFFIX) + } + addRendererRecords(scenario.record, scenario.records) + if (!scenario.closeBeforeRecords) { + add(SUFFIX) + } + } + } else { + if (mode === 'merge') { + add(PREFIX) + addRouterSources() + } else { + add(SHELL_PREFIX) + addRouterSources() + add(BARRIER) + } + updateRepeated(hash, 'x'.charCodeAt(0), scenario.bytes) + bytes += scenario.bytes + add(SUFFIX) + } + return { bytes, digest: hash.digest('hex') } +} + +const expectedOutputCache = new Map>() + +function getExpectedOutput(scenario: Scenario, mode: Mode) { + const key = `${scenario.name}:${mode}` + let value = expectedOutputCache.get(key) + if (!value) { + value = expected(scenario, mode) + expectedOutputCache.set(key, value) + } + return value +} + +function* repeatedPatternBytes(pattern: string, bytes: number) { + const chunk = pattern.repeat(Math.floor(FILL_BYTES / pattern.length)) + let left = bytes + while (left > 0) { + const value = chunk.slice(0, Math.min(left, chunk.length)) + yield Buffer.from(value) + left -= value.length + } +} + +function* repeatedCompletePatternBytes( + pattern: string, + bytes: number, + maxChunkBytes = FILL_BYTES, +) { + let repetitions = Math.floor(bytes / pattern.length) + const repetitionsPerChunk = Math.max( + 1, + Math.floor(maxChunkBytes / pattern.length), + ) + const fullChunk = pattern.repeat(repetitionsPerChunk) + while (repetitions > 0) { + const count = Math.min(repetitions, repetitionsPerChunk) + yield Buffer.from( + count === repetitionsPerChunk ? fullChunk : pattern.repeat(count), + ) + repetitions -= count + } +} + +function* routerScriptBytes(source: RouterSource): Generator { + for (let index = 0; index < source.records; index++) { + yield Buffer.from(SCRIPT_OPEN + marker(index)) + let left = source.recordBytes - marker(index).length + while (left > 0) { + const length = Math.min(left, FILL_BYTES) + yield Buffer.alloc(length, fillCode(index)) + left -= length + } + yield Buffer.from(SCRIPT_CLOSE) + } +} + +function* integratedBytes(scenario: Scenario): Generator { + if (scenario.kind === 'coalesced-close') { + yield* coalescedCloseApplicationBytes(scenario) + return + } + if (scenario.kind === 'closing') { + yield Buffer.from(SHELL_PREFIX) + yield* repeatedPatternBytes('
x
', scenario.bytes) + yield Buffer.from(BARRIER) + yield Buffer.from(SUFFIX) + return + } + + yield Buffer.from(SHELL_PREFIX) + const source = getRouterSource(scenario) + if (source) { + yield* routerScriptBytes(source) + } + yield Buffer.from(BARRIER) + + if (scenario.kind === 'hydration') { + yield Buffer.from(SUFFIX) + } else if (scenario.kind === 'renderer-records') { + if (scenario.closeBeforeRecords) { + yield Buffer.from(SUFFIX) + } + yield* repeatedCompletePatternBytes( + scenario.record, + scenario.record.length * scenario.records, + scenario.record.length, + ) + if (!scenario.closeBeforeRecords) { + yield Buffer.from(SUFFIX) + } + } else { + yield Buffer.alloc(scenario.bytes, 'x'.charCodeAt(0)) + yield Buffer.from(SUFFIX) + } +} + +function createCoalescedFiller(bytes: number) { + return ( + COALESCED_FILLER.repeat(Math.floor(bytes / COALESCED_FILLER.length)) + + 'x'.repeat(bytes % COALESCED_FILLER.length) + ) +} + +function* coalescedCloseApplicationBytes( + scenario: Extract, +) { + const filler = createCoalescedFiller(scenario.bytes) + const content = + PREFIX + + (scenario.scriptAtEnd ? filler + COALESCED_PATCH : COALESCED_PATCH + filler) + const close = SUFFIX + COALESCED_LAST_PATCH + yield Buffer.from(content + (scenario.closeInNextChunk ? '' : close)) + if (scenario.closeInNextChunk) { + yield Buffer.from(close) + } + // Keep hydration Waiting while the coalesced bytes drain. Without this + // record, source prefetch can report EOF before the transform scans them. + yield new Uint8Array(0) +} + +function* rendererRecordApplicationBytes( + scenario: Extract, +) { + yield Buffer.from(PREFIX) + if (scenario.closeBeforeRecords) { + yield Buffer.from(SUFFIX) + } + yield* repeatedCompletePatternBytes( + scenario.record, + scenario.record.length * scenario.records, + scenario.record.length, + ) + if (!scenario.closeBeforeRecords) { + yield Buffer.from(SUFFIX) + } + // This empty record lets the transform consume all renderer bytes before + // the source reports EOF and starts the independent router producer. + yield new Uint8Array(0) +} + +function streamFromIterator( + iterator: Iterator, + onEof?: () => void, + beforeEof?: Promise, + onBeforeEof?: () => void, +) { + return new ReadableStream({ + async pull(controller) { + const next = iterator.next() + if (next.done) { + onBeforeEof?.() + await beforeEof + onEof?.() + controller.close() + } else { + controller.enqueue(next.value) + } + }, + }) +} + +function createApplicationString( + scenario: Extract, +) { + if (scenario.shape === 'flat') { + const value = Buffer.allocUnsafe( + PREFIX.length + scenario.bytes + SUFFIX.length, + ) + value.write(PREFIX, 0, 'ascii') + value.fill('x'.charCodeAt(0), PREFIX.length, PREFIX.length + scenario.bytes) + value.write(SUFFIX, PREFIX.length + scenario.bytes, 'ascii') + return value.toString('latin1') + } + const piece = 'x'.repeat(4096) + let value = PREFIX + let left = scenario.bytes + while (left > 0) { + value += left >= piece.length ? piece : piece.slice(0, left) + left -= Math.min(left, piece.length) + } + return value + SUFFIX +} + +function makeRouter(serializationFinished: boolean) { + let finished = serializationFinished + let streamFastPathReserved = false + let cleanupCount = 0 + let renderFinishedCount = 0 + let reserveCalls = 0 + let scriptSubscriptions = 0 + let htmlSubscriptions = 0 + let bufferedHtmlReads = 0 + let fastPathGrants = 0 + let hydrationOutputClaims = 0 + let hydrationOutputSubscriptions = 0 + let hydrationOutputPulls = 0 + const scriptListeners = new Set<(parts: ReadonlyArray) => void>() + const htmlListeners = new Set<(html: string) => void>() + const finishedListeners = new Set<() => void>() + const pendingScripts: Array = [] + const bufferedHtml: Array = [] + const hydrationSources: Array = [] + let hydrationSourceHead = 0 + let hydrationSource: string | undefined + let hydrationSegment = '' + let hydrationSegmentOffset = 0 + let hydrationPhase: HydrationRecordPhase = HydrationRecordPhase.Opening + let hydrationOutputCapacity = MIN_HYDRATION_OUTPUT_BYTES + let hydrationState: HydrationOutputState = HydrationOutputState.Waiting + let hydrationError: unknown + let hydrationListener: (() => void) | undefined + let hydrationOutput: + | { + readonly state: number + readonly error: unknown + pullChunk(): Uint8Array + subscribe(onChange: () => void): () => void + } + | undefined + let liftBarrier!: () => void + const barrier = new Promise((resolve) => { + liftBarrier = resolve + }) + + function hydrationQueueIsEmpty() { + return hydrationSourceHead === hydrationSources.length + } + + function refreshHydrationState(notify = true) { + const next = hydrationSource + ? HydrationOutputState.Active + : !hydrationQueueIsEmpty() + ? HydrationOutputState.Ready + : finished + ? HydrationOutputState.Done + : HydrationOutputState.Waiting + if (hydrationState !== next) { + hydrationState = next + if (notify) { + hydrationListener?.() + } + } + } + + function releaseHydrationSource() { + hydrationSources[hydrationSourceHead++] = undefined + if (hydrationQueueIsEmpty()) { + hydrationSources.length = 0 + hydrationSourceHead = 0 + } + hydrationSource = undefined + hydrationSegment = '' + hydrationSegmentOffset = 0 + hydrationPhase = HydrationRecordPhase.Opening + refreshHydrationState(false) + } + + function startHydrationSource(codeUnits: number) { + hydrationSource = hydrationSources[hydrationSourceHead]! + hydrationPhase = HydrationRecordPhase.Opening + hydrationSegment = SCRIPT_OPEN + hydrationSegmentOffset = 0 + hydrationOutputCapacity = Math.max( + MIN_HYDRATION_OUTPUT_BYTES, + Math.min(OUTPUT_BYTES, codeUnits), + ) + hydrationState = HydrationOutputState.Active + } + + function advanceHydrationSegment() { + if (hydrationPhase === HydrationRecordPhase.Opening) { + hydrationPhase = HydrationRecordPhase.Source + hydrationSegment = hydrationSource! + hydrationSegmentOffset = 0 + } else if (hydrationPhase === HydrationRecordPhase.Source) { + hydrationPhase = HydrationRecordPhase.Closing + hydrationSegment = SCRIPT_CLOSE + hydrationSegmentOffset = 0 + } else { + releaseHydrationSource() + } + } + + function pullHydrationChunk() { + hydrationOutputPulls++ + if ( + hydrationState !== HydrationOutputState.Ready && + hydrationState !== HydrationOutputState.Active + ) { + throw new Error('Benchmark hydration output is not ready') + } + + try { + if (hydrationState === HydrationOutputState.Ready) { + const source = hydrationSources[hydrationSourceHead]! + const codeUnits = + SCRIPT_OPEN.length + source.length + SCRIPT_CLOSE.length + if (codeUnits <= DIRECT_HYDRATION_CODE_UNITS) { + const bytes = hydrationEncoder.encode( + SCRIPT_OPEN + source + SCRIPT_CLOSE, + ) + hydrationSource = source + releaseHydrationSource() + return bytes + } + startHydrationSource(codeUnits) + } + + const bytes = new Uint8Array(hydrationOutputCapacity) + let outputOffset = 0 + while (hydrationSource) { + if (hydrationSegmentOffset === hydrationSegment.length) { + advanceHydrationSegment() + } else if (outputOffset === bytes.length) { + break + } else { + const target = + outputOffset === 0 ? bytes : bytes.subarray(outputOffset) + const result = hydrationEncoder.encodeInto( + hydrationSegment.slice(hydrationSegmentOffset), + target, + ) + if (result.read === 0) { + if (outputOffset === 0) { + throw new Error('Benchmark hydration encoder made no progress') + } + break + } + hydrationSegmentOffset += result.read + outputOffset += result.written + } + } + if (outputOffset === 0) { + throw new Error('Benchmark hydration record produced no output') + } + return outputOffset === bytes.length + ? bytes + : bytes.subarray(0, outputOffset) + } catch (error) { + hydrationError = error + hydrationState = HydrationOutputState.Failed + hydrationListener?.() + throw error + } + } + + function reserveFastPath(output?: typeof hydrationOutput) { + reserveCalls++ + if ( + !finished || + streamFastPathReserved || + pendingScripts.length > 0 || + hydrationSource !== undefined || + !hydrationQueueIsEmpty() || + (hydrationOutput ? output !== hydrationOutput : output !== undefined) + ) { + return false + } + streamFastPathReserved = true + fastPathGrants++ + return true + } + + function claimOutput() { + hydrationOutputClaims++ + if (hydrationOutput) { + throw new Error('Benchmark hydration output already has a consumer') + } + hydrationOutput = { + get state() { + return hydrationState + }, + get error() { + return hydrationError + }, + pullChunk: pullHydrationChunk, + subscribe(onChange: () => void) { + hydrationOutputSubscriptions++ + if (hydrationListener) { + throw new Error('Benchmark hydration output already has a subscriber') + } + hydrationListener = onChange + return () => { + if (hydrationListener === onChange) { + hydrationListener = undefined + } + } + }, + } + refreshHydrationState(false) + return hydrationOutput + } + + const hydrationScripts = { + reserveFastPath, + claimOutput, + liftBarrier, + // The worktree transform skips barrier scanning until the initial take. + // The synthetic fixture renders the boundary in its input, so report the + // take as already done. + isInitialTaken: () => true, + // The worktree transform arms the serialization deadline through the + // transport; the fixture manages its own timing. + startSerializationTimeout: (_timeoutMs: number) => {}, + } + + const serverSsr = { + hydrationScripts, + isSerializationFinished: () => finished, + // Keep the old transport shape so this one fixture can run origin and the + // candidate baseline against the same synthetic request. + reserveStreamFastPath: reserveFastPath, + claimHydrationScriptOutput: claimOutput, + onScriptBatch(listener: (parts: ReadonlyArray) => void) { + scriptSubscriptions++ + scriptListeners.add(listener) + if (pendingScripts.length > 0) { + const parts = pendingScripts.splice(0) + listener(parts) + } + return () => scriptListeners.delete(listener) + }, + onInjectedHtml(listener: (html: string) => void) { + htmlSubscriptions++ + htmlListeners.add(listener) + return () => htmlListeners.delete(listener) + }, + takeBufferedHtml() { + bufferedHtmlReads++ + return bufferedHtml.shift() + }, + onSerializationFinished(listener: () => void) { + finishedListeners.add(listener) + return () => finishedListeners.delete(listener) + }, + setRenderFinished() { + renderFinishedCount++ + liftBarrier() + }, + liftScriptBarrier: liftBarrier, + // The worktree transform registers a cleanup listener to tear down + // promptly on external cleanup. The fixture drives termination itself, + // so registration is accepted and ignored. + onCleanup(_listener: () => void) {}, + cleanup() { + cleanupCount++ + scriptListeners.clear() + htmlListeners.clear() + finishedListeners.clear() + pendingScripts.length = 0 + bufferedHtml.length = 0 + hydrationSources.length = 0 + hydrationSourceHead = 0 + hydrationSource = undefined + hydrationSegment = '' + hydrationSegmentOffset = 0 + hydrationPhase = HydrationRecordPhase.Opening + hydrationOutputCapacity = MIN_HYDRATION_OUTPUT_BYTES + hydrationListener = undefined + hydrationOutput = undefined + hydrationError = undefined + hydrationState = HydrationOutputState.Done + }, + } + return { + router: { options: {}, serverSsr }, + emit(source: string) { + if (hydrationOutput) { + hydrationSources.push(source) + refreshHydrationState() + } else if (scriptListeners.size > 0) { + for (const listener of scriptListeners) { + listener([source]) + } + } else { + pendingScripts.push(source) + } + if (htmlListeners.size > 0) { + const html = SCRIPT_OPEN + source + SCRIPT_CLOSE + bufferedHtml.push(html) + for (const listener of htmlListeners) { + listener(html) + } + if (bufferedHtml[0] === html) { + bufferedHtml.shift() + } + } + }, + finish() { + finished = true + refreshHydrationState() + for (const listener of finishedListeners) { + listener() + } + }, + barrier, + counts: () => ({ + cleanupCount, + renderFinishedCount, + reserveCalls, + fastPathGrants, + scriptSubscriptions, + htmlSubscriptions, + bufferedHtmlReads, + hydrationOutputClaims, + hydrationOutputSubscriptions, + hydrationOutputPulls, + }), + } +} + +function createInput( + scenario: Scenario, + mode: Mode, + onEof: () => void, + beforeEof?: Promise, + onBeforeEof?: () => void, +) { + if (mode === 'merge' && scenario.kind === 'application-string') { + return streamFromIterator( + [createApplicationString(scenario)][Symbol.iterator](), + onEof, + beforeEof, + onBeforeEof, + ) + } + if (mode === 'merge' && scenario.kind === 'hydration') { + return streamFromIterator( + [Buffer.from(PREFIX), Buffer.from(SUFFIX)][Symbol.iterator](), + onEof, + beforeEof, + onBeforeEof, + ) + } + if (mode === 'merge' && scenario.kind === 'renderer-records') { + return streamFromIterator( + rendererRecordApplicationBytes(scenario), + onEof, + beforeEof, + onBeforeEof, + ) + } + return streamFromIterator( + integratedBytes(scenario), + onEof, + beforeEof, + onBeforeEof, + ) +} + +function findNeedle(chunk: Uint8Array, needle: Buffer, tail: Buffer) { + const value = Buffer.from(chunk.buffer, chunk.byteOffset, chunk.byteLength) + let count = 0 + + if (tail.length > 0 && value.length > 0) { + const headLength = Math.min(value.length, needle.length - 1) + const boundary = Buffer.allocUnsafe(tail.length + headLength) + boundary.set(tail) + boundary.set(value.subarray(0, headLength), tail.length) + let offset = 0 + for (;;) { + const found = boundary.indexOf(needle, offset) + if (found === -1) { + break + } + if (found < tail.length && found + needle.length > tail.length) { + count++ + } + offset = found + 1 + } + } + + let offset = 0 + for (;;) { + const found = value.indexOf(needle, offset) + if (found === -1) { + break + } + count++ + offset = found + 1 + } + + const keep = Math.min(needle.length - 1, tail.length + value.length) + let nextTail: Buffer + if (keep === 0) { + nextTail = Buffer.alloc(0) + } else if (value.length >= keep) { + nextTail = Buffer.from(value.subarray(value.length - keep)) + } else { + nextTail = Buffer.allocUnsafe(keep) + const tailBytes = keep - value.length + nextTail.set(tail.subarray(tail.length - tailBytes)) + nextTail.set(value, tailBytes) + } + return { + count, + tail: nextTail, + } +} + +export async function run( + transform: Transform, + implementation: string, + scenarioName: string, + mode: Mode, + writeResult = true, + measureMemory = true, + validateOutput = true, +) { + const scenario = parseScenario(scenarioName) + const expectedOutput = getExpectedOutput(scenario, mode) + const routerSource = getRouterSource(scenario) + const containsRouterScripts = routerSource !== undefined + const hasLateScripts = mode === 'merge' && containsRouterScripts + const fake = makeRouter(mode !== 'merge') + let resolveProducerComplete!: () => void + const producerComplete = new Promise((resolve) => { + resolveProducerComplete = resolve + }) + if (!hasLateScripts) { + resolveProducerComplete() + } + let resolveAppContentConsumed!: () => void + const appContentConsumed = new Promise((resolve) => { + resolveAppContentConsumed = resolve + }) + if (scenario.kind !== 'renderer-records' || mode !== 'merge') { + resolveAppContentConsumed() + } + let startedAt = 0 + let rendererEofMs: number | null = null + const input = createInput( + scenario, + mode, + () => { + rendererEofMs = performance.now() - startedAt + if (mode === 'merge' && !hasLateScripts) { + fake.finish() + } + }, + hasLateScripts ? producerComplete : undefined, + resolveAppContentConsumed, + ) + if (measureMemory) { + forceGc() + } + const baseline = measureMemory ? memory() : undefined + const peak: Memory = { heapUsed: 0, external: 0, arrayBuffers: 0, rss: 0 } + const sample = () => { + if (!measureMemory) { + return + } + const value = delta(memory(), baseline!) + maxMemory(peak, value) + } + + startedAt = performance.now() + const output = + mode === 'raw' + ? (input as ReadableStream) + : transform( + fake.router, + input, + scenario.rendererSafePoint + ? { rendererSafePoint: scenario.rendererSafePoint } + : {}, + ) + + let sourceProducerMs = 0 + let producerFinishedMs: number | null = null + let outstandingSourceRecords = 0 + let outstandingSourceCodeUnits = 0 + let sourceRecordHighWater = 0 + let sourceCodeUnitHighWater = 0 + const producer = hasLateScripts + ? (async () => { + await fake.barrier + await appContentConsumed + const sourceStartedAt = performance.now() + for (let index = 0; index < routerSource!.records; index++) { + const source = createSource( + routerSource!.recordBytes, + index, + routerSource!.shape, + ) + outstandingSourceRecords++ + outstandingSourceCodeUnits += source.length + sourceRecordHighWater = Math.max( + sourceRecordHighWater, + outstandingSourceRecords, + ) + sourceCodeUnitHighWater = Math.max( + sourceCodeUnitHighWater, + outstandingSourceCodeUnits, + ) + fake.emit(source) + if (index % 16 === 15) { + await new Promise((resolve) => setImmediate(resolve)) + } + } + fake.finish() + sourceProducerMs = performance.now() - sourceStartedAt + producerFinishedMs = performance.now() - startedAt + sample() + resolveProducerComplete() + })() + : Promise.resolve() + + const reader = output.getReader() + const hash = validateOutput ? createHash('sha256') : undefined + const firstScriptNeedle = Buffer.from(marker(0)) + const completedScriptNeedle = Buffer.from(SCRIPT_CLOSE) + let firstScriptTail: Buffer = Buffer.alloc(0) + let completedScriptTail: Buffer = Buffer.alloc(0) + let firstRouterScriptMs: number | null = null + let bytes = 0 + let chunks = 0 + let maxOutputChunkBytes = 0 + let ttfbMs: number | null = null + for (;;) { + const result = await reader.read() + if (result.done) { + break + } + const now = performance.now() + if (ttfbMs === null) { + ttfbMs = now - startedAt + } + const value = result.value + bytes += value.byteLength + chunks++ + maxOutputChunkBytes = Math.max(maxOutputChunkBytes, value.byteLength) + hash?.update(value) + if ( + validateOutput && + containsRouterScripts && + firstRouterScriptMs === null + ) { + const match = findNeedle(value, firstScriptNeedle, firstScriptTail) + firstScriptTail = match.tail + if (match.count > 0) { + firstRouterScriptMs = now - startedAt + } + } + if (validateOutput && hasLateScripts) { + const completed = findNeedle( + value, + completedScriptNeedle, + completedScriptTail, + ) + completedScriptTail = completed.tail + if (completed.count > 0) { + outstandingSourceRecords -= completed.count + outstandingSourceCodeUnits -= + completed.count * routerSource!.recordBytes + } + } + if (chunks % 16 === 0) { + sample() + } + } + await producer + sample() + const elapsedMs = performance.now() - startedAt + const digest = hash?.digest('hex') ?? expectedOutput.digest + const memoryBeforeFinalGc = measureMemory ? memory() : undefined + if (measureMemory) { + maxMemory(peak, delta(memoryBeforeFinalGc!, baseline!)) + forceGc() + } + const finalMemory = measureMemory ? memory() : undefined + const counts = fake.counts() + let selectedApi: + | 'none' + | 'hydration-output' + | 'script-batch' + | 'injected-html' + | 'buffered-html' = 'none' + if ( + bytes !== expectedOutput.bytes || + (validateOutput && digest !== expectedOutput.digest) + ) { + throw new Error( + `Output validation failed: ${bytes}/${digest} !== ${expectedOutput.bytes}/${expectedOutput.digest}`, + ) + } + if (validateOutput && hasLateScripts && outstandingSourceRecords !== 0) { + throw new Error( + `Only ${routerSource!.records - outstandingSourceRecords} router records completed`, + ) + } + if (validateOutput && containsRouterScripts && firstRouterScriptMs === null) { + throw new Error('The output did not contain the first router script') + } + if ( + validateOutput && + hasLateScripts && + scenario.kind === 'hydration' && + (firstRouterScriptMs === null || + rendererEofMs === null || + firstRouterScriptMs >= rendererEofMs) + ) { + throw new Error( + `Router source did not start before renderer EOF: ${firstRouterScriptMs}/${rendererEofMs}`, + ) + } + if ( + validateOutput && + hasLateScripts && + (producerFinishedMs === null || + rendererEofMs === null || + producerFinishedMs > rendererEofMs) + ) { + throw new Error( + `Router producer finished after renderer EOF: ${producerFinishedMs}/${rendererEofMs}`, + ) + } + if ( + mode !== 'raw' && + (counts.cleanupCount < 1 || counts.renderFinishedCount !== 1) + ) { + throw new Error(`Invalid lifecycle counts: ${JSON.stringify(counts)}`) + } + if ( + mode === 'fast' && + (counts.reserveCalls !== 1 || + counts.fastPathGrants !== 1 || + counts.hydrationOutputClaims !== 0 || + counts.hydrationOutputSubscriptions !== 0 || + counts.hydrationOutputPulls !== 0) + ) { + throw new Error( + `Fast path was not selected exactly once: ${JSON.stringify(counts)}`, + ) + } + if (mode === 'merge') { + const mergeApi = + counts.hydrationOutputClaims === 1 && + counts.hydrationOutputSubscriptions === 1 && + counts.scriptSubscriptions === 0 && + counts.htmlSubscriptions === 0 + ? 'hydration-output' + : counts.hydrationOutputClaims === 0 && + counts.scriptSubscriptions === 1 && + counts.htmlSubscriptions === 0 + ? 'script-batch' + : counts.hydrationOutputClaims === 0 && + counts.scriptSubscriptions === 0 && + counts.htmlSubscriptions === 1 + ? counts.bufferedHtmlReads > 0 + ? 'buffered-html' + : 'injected-html' + : undefined + if (!mergeApi || counts.reserveCalls < 1) { + throw new Error( + `Merge path/API assertion failed: ${JSON.stringify(counts)}`, + ) + } + selectedApi = mergeApi + } + const dynamicPassThroughSelected = + mode === 'merge' && counts.fastPathGrants === 1 + const result = { + implementation, + scenario: scenario.name, + framework: scenario.framework, + rendererSafePoint: scenario.rendererSafePoint, + mode, + memoryMeasured: measureMemory, + selectedApi, + dynamicPassThroughSelected, + outputBytes: bytes, + outputSha256: digest, + chunks, + maxOutputChunkBytes, + ttfbMs, + firstRouterScriptMs, + producerFinishedMs, + rendererEofMs, + elapsedMs, + throughputMiBPerSecond: bytes / MiB / (elapsedMs / 1000), + sourceProducerMs, + sourceRecordHighWater, + sourceCodeUnitHighWater, + memoryBaselineBytes: baseline, + memoryPeakBytes: measureMemory ? peak : undefined, + memoryBeforeFinalGcBytes: memoryBeforeFinalGc, + memoryBeforeFinalGcDeltaBytes: measureMemory + ? delta(memoryBeforeFinalGc!, baseline!) + : undefined, + memoryAfterFinalGcBytes: finalMemory, + memoryAfterFinalGcDeltaBytes: measureMemory + ? delta(finalMemory!, baseline!) + : undefined, + resourceUsage: measureMemory ? process.resourceUsage() : undefined, + lifecycle: counts, + } + if (writeResult) { + process.stdout.write(`${JSON.stringify(result)}\n`) + } + return result +} + +type NumericSummary = { + mean: number + median: number + p10: number + p90: number + min: number + max: number +} + +function summarizeNumbers(values: Array): NumericSummary { + const sorted = values.slice().sort((a, b) => a - b) + const at = (fraction: number) => + sorted[Math.floor((sorted.length - 1) * fraction)]! + const middle = Math.floor(sorted.length / 2) + const median = + sorted.length % 2 === 0 + ? (sorted[middle - 1]! + sorted[middle]!) / 2 + : sorted[middle]! + return { + mean: values.reduce((sum, value) => sum + value, 0) / values.length, + median, + p10: at(0.1), + p90: at(0.9), + min: sorted[0]!, + max: sorted[sorted.length - 1]!, + } +} + +type MeasuredRun = Awaited> + +type WarmBatch = { + requests: number + elapsedMs: number + wallElapsedMs: number + ttfbMs: number + outputBytes: number + outputSha256: string + chunks: number + maxOutputChunkBytes: number + sourceRecordHighWater: number + dynamicPassThroughRequests: number +} + +type WarmBatchAccumulator = Omit< + WarmBatch, + 'outputBytes' | 'outputSha256' | 'chunks' +> & { + first?: MeasuredRun +} + +function createWarmBatchAccumulator(requests: number): WarmBatchAccumulator { + return { + requests, + elapsedMs: 0, + wallElapsedMs: 0, + ttfbMs: 0, + maxOutputChunkBytes: 0, + sourceRecordHighWater: 0, + dynamicPassThroughRequests: 0, + } +} + +function recordWarmRun( + batch: WarmBatchAccumulator, + row: MeasuredRun, + wallElapsedMs: number, +) { + batch.first ??= row + batch.elapsedMs += row.elapsedMs + batch.wallElapsedMs += wallElapsedMs + batch.ttfbMs += row.ttfbMs! + batch.maxOutputChunkBytes = Math.max( + batch.maxOutputChunkBytes, + row.maxOutputChunkBytes, + ) + batch.sourceRecordHighWater = Math.max( + batch.sourceRecordHighWater, + row.sourceRecordHighWater, + ) + if (row.dynamicPassThroughSelected) { + batch.dynamicPassThroughRequests++ + } +} + +function finishWarmBatch(batch: WarmBatchAccumulator): WarmBatch { + const { first, ...totals } = batch + if (!first) { + throw new Error('A warm benchmark batch did not run any requests') + } + return { + ...totals, + outputBytes: first.outputBytes, + outputSha256: first.outputSha256, + chunks: first.chunks, + } +} + +async function runWarmPair( + baselineName: BaselineImplementation, + baselineTransform: Transform, + worktreeTransform: Transform, + scenario: Scenario, + mode: Mode, + requests: number, + startWith: 'baseline' | 'worktree', +) { + const batches = { + baseline: createWarmBatchAccumulator(requests), + worktree: createWarmBatchAccumulator(requests), + } + + for (let index = 0; index < requests; index++) { + const baselineFirst = (index & 1) === (startWith === 'baseline' ? 0 : 1) + let implementation: 'baseline' | 'worktree' = baselineFirst + ? 'baseline' + : 'worktree' + for (let position = 0; position < 2; position++) { + const wallStartedAt = performance.now() + const row = await run( + implementation === 'baseline' ? baselineTransform : worktreeTransform, + implementation === 'baseline' ? baselineName : 'worktree', + scenario.name, + mode, + false, + false, + false, + ) + recordWarmRun( + batches[implementation], + row, + performance.now() - wallStartedAt, + ) + implementation = implementation === 'baseline' ? 'worktree' : 'baseline' + } + } + + return { + baseline: finishWarmBatch(batches.baseline), + worktree: finishWarmBatch(batches.worktree), + } +} + +function summarizeWarmBatches( + implementation: string, + scenario: Scenario, + mode: Mode, + rows: Array, +) { + const batchRequests = rows[0]!.requests + const elapsedMs = summarizeNumbers( + rows.map((row) => row.elapsedMs / row.requests), + ) + const batchElapsedMs = summarizeNumbers(rows.map((row) => row.elapsedMs)) + const batchWallElapsedMs = summarizeNumbers( + rows.map((row) => row.wallElapsedMs), + ) + const ttfbMs = summarizeNumbers(rows.map((row) => row.ttfbMs / row.requests)) + const throughputMiBPerSecond = summarizeNumbers( + rows.map( + (row) => (row.outputBytes * row.requests) / MiB / (row.elapsedMs / 1000), + ), + ) + const dynamicPassThroughRequests = rows.reduce( + (total, row) => total + row.dynamicPassThroughRequests, + 0, + ) + return { + implementation, + scenario: scenario.name, + framework: scenario.framework, + rendererSafePoint: scenario.rendererSafePoint, + mode, + measurement: 'warm', + memoryMeasured: false, + iterations: rows.length, + batchRequests, + measuredRequests: rows.length * batchRequests, + dynamicPassThroughRequests, + dynamicPassThroughRate: + dynamicPassThroughRequests / (rows.length * batchRequests), + outputBytes: rows[0]!.outputBytes, + outputSha256: rows[0]!.outputSha256, + chunks: rows[0]!.chunks, + maxOutputChunkBytes: Math.max( + ...rows.map((row) => row.maxOutputChunkBytes), + ), + ttfbMs: ttfbMs.median, + elapsedMs: elapsedMs.median, + throughputMiBPerSecond: throughputMiBPerSecond.median, + sourceRecordHighWater: Math.max( + ...rows.map((row) => row.sourceRecordHighWater), + ), + statistics: { + elapsedMs, + batchElapsedMs, + batchWallElapsedMs, + ttfbMs, + throughputMiBPerSecond, + }, + } +} + +function summarizePercentRatios(values: Array) { + const logs = summarizeNumbers(values.map((value) => Math.log(value))) + const toPercent = (value: number) => (Math.exp(value) - 1) * 100 + return { + geometricMean: toPercent(logs.mean), + median: toPercent(logs.median), + p10: toPercent(logs.p10), + p90: toPercent(logs.p90), + min: toPercent(logs.min), + max: toPercent(logs.max), + } +} + +async function measureWarmComparison( + baselineName: BaselineImplementation, + baselineTransform: Transform, + worktreeTransform: Transform, + scenarioNames: Array, + requestedModes: Array, + warmups: number, + iterations: number, + batchRequests: number, +) { + const results = [] + const comparisons = [] + + for (const scenarioName of scenarioNames) { + const scenario = parseScenario(scenarioName) + const availableModes: Array = + scenario.kind === 'application-string' || + scenario.kind === 'coalesced-close' + ? ['merge'] + : scenario.kind !== 'renderer-records' && scenario.framework === 'react' + ? ['fast', 'merge'] + : ['merge'] + const modes = availableModes.filter((mode) => requestedModes.includes(mode)) + for (const mode of modes) { + await run( + baselineTransform, + baselineName, + scenario.name, + mode, + false, + false, + true, + ) + await run( + worktreeTransform, + 'worktree', + scenario.name, + mode, + false, + false, + true, + ) + forceGc() + for (let index = 0; index < warmups; index++) { + const order: Array<'baseline' | 'worktree'> = + index % 2 === 0 ? ['baseline', 'worktree'] : ['worktree', 'baseline'] + for (const implementation of order) { + await run( + implementation === 'baseline' + ? baselineTransform + : worktreeTransform, + implementation === 'baseline' ? baselineName : 'worktree', + scenario.name, + mode, + false, + false, + ) + } + } + + const rows: Record<'baseline' | 'worktree', Array> = { + baseline: [], + worktree: [], + } + const elapsedRatios: Array = [] + const wallElapsedRatios: Array = [] + for (let index = 0; index < iterations; index++) { + const pair = await runWarmPair( + baselineName, + baselineTransform, + worktreeTransform, + scenario, + mode, + batchRequests, + index % 2 === 0 ? 'baseline' : 'worktree', + ) + rows.baseline.push(pair.baseline) + rows.worktree.push(pair.worktree) + elapsedRatios.push(pair.worktree.elapsedMs / pair.baseline.elapsedMs) + wallElapsedRatios.push( + pair.worktree.wallElapsedMs / pair.baseline.wallElapsedMs, + ) + } + + const baseline = summarizeWarmBatches( + baselineName, + scenario, + mode, + rows.baseline, + ) + const worktree = summarizeWarmBatches( + 'worktree', + scenario, + mode, + rows.worktree, + ) + const baselineElapsedTotal = rows.baseline.reduce( + (total, row) => total + row.elapsedMs, + 0, + ) + const worktreeElapsedTotal = rows.worktree.reduce( + (total, row) => total + row.elapsedMs, + 0, + ) + const baselineWallTotal = rows.baseline.reduce( + (total, row) => total + row.wallElapsedMs, + 0, + ) + const worktreeWallTotal = rows.worktree.reduce( + (total, row) => total + row.wallElapsedMs, + 0, + ) + results.push( + { ...baseline, comparisonBaseline: baselineName }, + { ...worktree, comparisonBaseline: baselineName }, + ) + comparisons.push({ + baseline: baselineName, + scenario: scenario.name, + framework: scenario.framework, + rendererSafePoint: scenario.rendererSafePoint, + mode, + pairedElapsedPercent: summarizePercentRatios(elapsedRatios), + pairedWallElapsedPercent: summarizePercentRatios(wallElapsedRatios), + aggregateElapsedPercent: + (worktreeElapsedTotal / baselineElapsedTotal - 1) * 100, + aggregateWallElapsedPercent: + (worktreeWallTotal / baselineWallTotal - 1) * 100, + elapsedMedianPercent: + (worktree.statistics.elapsedMs.median / + baseline.statistics.elapsedMs.median - + 1) * + 100, + samples: rows.baseline.map((baselineRow, index) => ({ + baselineElapsedMs: baselineRow.elapsedMs, + candidateElapsedMs: rows.worktree[index]!.elapsedMs, + baselineWallElapsedMs: baselineRow.wallElapsedMs, + candidateWallElapsedMs: rows.worktree[index]!.wallElapsedMs, + elapsedRatio: elapsedRatios[index]!, + wallElapsedRatio: wallElapsedRatios[index]!, + })), + }) + } + } + + return { + warmups, + iterations, + batchRequests, + measuredRequestsPerImplementation: iterations * batchRequests, + scenarios: scenarioNames, + order: `${baselineName}/worktree order alternates for every request and reverses at each batch start`, + validation: + 'SHA-256 and marker checks in untimed preflight/warm-up requests; timed requests retain byte, lifecycle, and API checks', + source: + 'fresh renderer bytes for fast mode and one fresh router source string for merge mode', + memory: 'not measured in the warm latency loop', + garbageCollection: + 'forced once before warm-up; natural GC remains enabled for all measured batches', + results, + comparisons, + } +} + +export function runWarmComparison( + transforms: Record<'origin' | 'worktree', Transform>, + scenarioNames: Array, + requestedModes: Array, + warmups: number, + iterations: number, + batchRequests: number, +) { + return measureWarmComparison( + 'origin', + transforms.origin, + transforms.worktree, + scenarioNames, + requestedModes, + warmups, + iterations, + batchRequests, + ) +} + +function safeWindowEnd(value: string, start: number, wantedEnd: number) { + const end = Math.min(wantedEnd, value.length) + if (end <= start || end >= value.length) { + return end + } + const previous = value.charCodeAt(end - 1) + const next = value.charCodeAt(end) + return previous >= 0xd800 && + previous <= 0xdbff && + next >= 0xdc00 && + next <= 0xdfff + ? end - 1 + : end +} + +export function runProbe( + shape: Shape, + sizeMiB: number, + strategy: 'suffix' | 'window', +) { + const bytes = sizeMiB * MiB + const source = createSource(bytes, 0, shape) + const expectedHash = createHash('sha256') + updateSource(expectedHash, bytes, 0) + const expectedDigest = expectedHash.digest('hex') + forceGc() + const baseline = memory() + const encoder = new TextEncoder() + const passes = [] + for (let pass = 1; pass <= 2; pass++) { + const hash = createHash('sha256') + const peak: Memory = { heapUsed: 0, external: 0, arrayBuffers: 0, rss: 0 } + let offset = 0 + let chunks = 0 + const startedAt = performance.now() + while (offset < source.length) { + const output = new Uint8Array(OUTPUT_BYTES) + const input = + strategy === 'suffix' + ? source.slice(offset) + : source.slice( + offset, + safeWindowEnd(source, offset, offset + OUTPUT_BYTES), + ) + const encoded = encoder.encodeInto(input, output) + if (encoded.read === 0) { + throw new Error('Probe encoder made no progress') + } + offset += encoded.read + hash.update(output.subarray(0, encoded.written)) + chunks++ + if (chunks % 16 === 0) { + maxMemory(peak, delta(memory(), baseline)) + } + } + const elapsedMs = performance.now() - startedAt + const digest = hash.digest('hex') + if (digest !== expectedDigest || offset !== source.length) { + throw new Error('Source-window probe validation failed') + } + maxMemory(peak, delta(memory(), baseline)) + forceGc() + const afterGc = delta(memory(), baseline) + passes.push({ + pass, + elapsedMs, + throughputMiBPerSecond: bytes / MiB / (elapsedMs / 1000), + chunks, + memoryPeakBytes: peak, + memoryAfterGcBytes: afterGc, + }) + } + process.stdout.write( + `${JSON.stringify({ + implementation: 'v8-probe', + scenario: `encode-${shape}-${sizeMiB}m`, + mode: strategy, + sourceReadyBaselineBytes: baseline, + outputBytes: bytes, + outputChunkBytes: OUTPUT_BYTES, + outputSha256: expectedDigest, + passes, + })}\n`, + ) +} + +type HydrationOwner = { + takeInitialHydrationScriptTags(): unknown + claimOutput(): { + state: number + pullChunk(): Uint8Array + } + liftBarrier(): void + pushSource(source: string): void + finish(): void + cleanup(): void +} + +type CreateHydrationOwner = ( + nonce: string | undefined, + initialSources: ReadonlyArray, +) => HydrationOwner + +type HydrationOwnerExpected = { + records: number + recordBytes: number + bytes: number + digest: string +} + +const hydrationOwnerExpectedCache = new Map() + +function getHydrationOwnerExpected(scenarioName: string) { + const cached = hydrationOwnerExpectedCache.get(scenarioName) + if (cached) { + return cached + } + const match = /^hydration-owner-(\d+)x(\d+)k$/.exec(scenarioName) + if (!match) { + throw new Error(`Unknown hydration-owner scenario: ${scenarioName}`) + } + const records = Number(match[1]) + const recordBytes = Number(match[2]) * 1024 + const hash = createHash('sha256') + let bytes = 0 + const addExpected = (value: string) => { + hash.update(value) + bytes += Buffer.byteLength(value) + } + let partIndex = 0 + while (partIndex <= records) { + const batchStart = partIndex + let codeUnits = SCRIPT_OPEN.length + SCRIPT_CLOSE.length - 1 + while (partIndex <= records) { + const partLength = + partIndex === records ? '$_TSR.e()'.length : recordBytes + const nextCodeUnits = codeUnits + 1 + partLength + if (partIndex > batchStart && nextCodeUnits > OUTPUT_BYTES) { + break + } + codeUnits = nextCodeUnits + partIndex++ + if (codeUnits > OUTPUT_BYTES) { + break + } + } + addExpected(SCRIPT_OPEN) + for (let index = batchStart; index < partIndex; index++) { + if (index > batchStart) { + addExpected(';') + } + if (index === records) { + addExpected('$_TSR.e()') + } else { + updateSource(hash, recordBytes, index) + bytes += recordBytes + } + } + addExpected(SCRIPT_CLOSE) + } + const expected = { + records, + recordBytes, + bytes, + digest: hash.digest('hex'), + } + hydrationOwnerExpectedCache.set(scenarioName, expected) + return expected +} + +function measureHydrationOwner( + createHydrationOwner: CreateHydrationOwner, + implementation: string, + scenarioName: string, + measureMemory: boolean, + validateOutput = true, +) { + const expected = getHydrationOwnerExpected(scenarioName) + if (measureMemory) { + forceGc() + } + const baseline = measureMemory ? memory() : undefined + const peak: Memory = { heapUsed: 0, external: 0, arrayBuffers: 0, rss: 0 } + const sample = () => { + if (measureMemory) { + maxMemory(peak, delta(memory(), baseline!)) + } + } + const owner = createHydrationOwner(undefined, []) + owner.takeInitialHydrationScriptTags() + const output = owner.claimOutput() + owner.liftBarrier() + for (let index = 0; index < expected.records; index++) { + owner.pushSource(createSource(expected.recordBytes, index, 'flat')) + } + owner.finish() + sample() + const hash = validateOutput ? createHash('sha256') : undefined + let bytes = 0 + let chunks = 0 + let maxOutputChunkBytes = 0 + const startedAt = performance.now() + while ( + output.state === HydrationOutputState.Ready || + output.state === HydrationOutputState.Active + ) { + const chunk = output.pullChunk() + hash?.update(chunk) + bytes += chunk.byteLength + chunks++ + maxOutputChunkBytes = Math.max(maxOutputChunkBytes, chunk.byteLength) + if (measureMemory && (chunks & 15) === 0) { + sample() + } + } + const elapsedMs = performance.now() - startedAt + if (measureMemory) { + sample() + } + const digest = hash?.digest('hex') ?? expected.digest + if ( + output.state !== HydrationOutputState.Done || + bytes !== expected.bytes || + (validateOutput && digest !== expected.digest) || + maxOutputChunkBytes > OUTPUT_BYTES + ) { + throw new Error( + `Hydration-owner validation failed: ${output.state}/${bytes}/${digest}/${maxOutputChunkBytes}`, + ) + } + owner.cleanup() + return { + implementation, + scenario: scenarioName, + framework: 'router-core', + mode: 'owner', + outputBytes: bytes, + outputSha256: digest, + chunks, + maxOutputChunkBytes, + elapsedMs, + throughputMiBPerSecond: bytes / MiB / (elapsedMs / 1000), + memoryPeakBytes: measureMemory ? peak : undefined, + sourceRecordHighWater: expected.records + 1, + } +} + +export function runHydrationOwner( + createHydrationOwner: CreateHydrationOwner, + implementation: string, + scenarioName: string, +) { + process.stdout.write( + `${JSON.stringify( + measureHydrationOwner( + createHydrationOwner, + implementation, + scenarioName, + true, + ), + )}\n`, + ) +} + +export function runHydrationOwnerSoak( + createHydrationOwner: CreateHydrationOwner, + implementation: string, + scenarioName: string, +) { + const expected = getHydrationOwnerExpected(scenarioName) + const requestsPerBlock = expected.records > 1000 ? 5 : 500 + const blocks = 10 + measureHydrationOwner( + createHydrationOwner, + implementation, + scenarioName, + false, + true, + ) + for (let index = 0; index < Math.min(100, requestsPerBlock); index++) { + measureHydrationOwner( + createHydrationOwner, + implementation, + scenarioName, + false, + false, + ) + } + forceGc() + const baseline = memory() + const highWater: Memory = { + heapUsed: 0, + external: 0, + arrayBuffers: 0, + rss: 0, + } + const checkpoints = [] + const startedAt = performance.now() + for (let block = 1; block <= blocks; block++) { + for (let request = 0; request < requestsPerBlock; request++) { + measureHydrationOwner( + createHydrationOwner, + implementation, + scenarioName, + false, + false, + ) + } + forceGc() + const retained = delta(memory(), baseline) + maxMemory(highWater, retained) + checkpoints.push({ block, requests: block * requestsPerBlock, retained }) + } + const elapsedMs = performance.now() - startedAt + const finalRetained = checkpoints.at(-1)!.retained + process.stdout.write( + `${JSON.stringify({ + implementation, + scenario: scenarioName, + framework: 'router-core', + mode: 'owner-soak', + requests: blocks * requestsPerBlock, + aggregateOutputBytes: expected.bytes * blocks * requestsPerBlock, + validatedPerRequestOutputSha256: expected.digest, + elapsedIncludingGcMs: elapsedMs, + throughputIncludingGcMiBPerSecond: + (expected.bytes * blocks * requestsPerBlock) / MiB / (elapsedMs / 1000), + retainedHighWaterBytes: highWater, + retainedAfterFinalGcBytes: finalRetained, + retentionCheckpoints: checkpoints, + sourceRecordHighWater: expected.records + 1, + })}\n`, + ) +} + +export function runWarmHydrationOwnerComparison( + factories: Record<'origin' | 'worktree', CreateHydrationOwner>, + scenarioNames: Array, + warmups: number, + iterations: number, + batchRequests: number, +) { + const results = [] + const comparisons = [] + for (const scenarioName of scenarioNames) { + measureHydrationOwner(factories.origin, 'origin', scenarioName, false, true) + measureHydrationOwner( + factories.worktree, + 'worktree', + scenarioName, + false, + true, + ) + forceGc() + for (let index = 0; index < warmups; index++) { + const first = index % 2 === 0 ? 'origin' : 'worktree' + const second = first === 'origin' ? 'worktree' : 'origin' + measureHydrationOwner(factories[first], first, scenarioName, false, false) + measureHydrationOwner( + factories[second], + second, + scenarioName, + false, + false, + ) + } + const elapsed: Record<'origin' | 'worktree', Array> = { + origin: [], + worktree: [], + } + const wall: Record<'origin' | 'worktree', Array> = { + origin: [], + worktree: [], + } + const samples = [] + const firstResult: Partial< + Record<'origin' | 'worktree', ReturnType> + > = {} + for (let iteration = 0; iteration < iterations; iteration++) { + const totals = { + origin: { elapsed: 0, wall: 0 }, + worktree: { elapsed: 0, wall: 0 }, + } + for (let request = 0; request < batchRequests; request++) { + const originFirst = (request & 1) === (iteration & 1) + const order: Array<'origin' | 'worktree'> = originFirst + ? ['origin', 'worktree'] + : ['worktree', 'origin'] + for (const implementation of order) { + const startedAt = performance.now() + const row = measureHydrationOwner( + factories[implementation], + implementation, + scenarioName, + false, + false, + ) + firstResult[implementation] ??= row + totals[implementation].wall += performance.now() - startedAt + totals[implementation].elapsed += row.elapsedMs + } + } + elapsed.origin.push(totals.origin.elapsed / batchRequests) + elapsed.worktree.push(totals.worktree.elapsed / batchRequests) + wall.origin.push(totals.origin.wall / batchRequests) + wall.worktree.push(totals.worktree.wall / batchRequests) + samples.push({ + baselineElapsedMs: totals.origin.elapsed, + candidateElapsedMs: totals.worktree.elapsed, + baselineWallElapsedMs: totals.origin.wall, + candidateWallElapsedMs: totals.worktree.wall, + elapsedRatio: totals.worktree.elapsed / totals.origin.elapsed, + wallElapsedRatio: totals.worktree.wall / totals.origin.wall, + }) + } + const originElapsed = summarizeNumbers(elapsed.origin) + const worktreeElapsed = summarizeNumbers(elapsed.worktree) + for (const implementation of ['origin', 'worktree'] as const) { + const statistics = summarizeNumbers(elapsed[implementation]) + results.push({ + ...firstResult[implementation], + implementation, + measurement: 'warm', + memoryMeasured: false, + iterations, + batchRequests, + measuredRequests: iterations * batchRequests, + elapsedMs: statistics.median, + throughputMiBPerSecond: + firstResult[implementation]!.outputBytes / + MiB / + (statistics.median / 1000), + statistics: { elapsedMs: statistics }, + comparisonBaseline: 'origin', + }) + } + comparisons.push({ + baseline: 'origin', + scenario: scenarioName, + framework: 'router-core', + mode: 'owner', + pairedElapsedPercent: summarizePercentRatios( + samples.map((sample) => sample.elapsedRatio), + ), + pairedWallElapsedPercent: summarizePercentRatios( + samples.map((sample) => sample.wallElapsedRatio), + ), + aggregateElapsedPercent: + (worktreeElapsed.mean / originElapsed.mean - 1) * 100, + aggregateWallElapsedPercent: + (summarizeNumbers(wall.worktree).mean / + summarizeNumbers(wall.origin).mean - + 1) * + 100, + elapsedMedianPercent: + (worktreeElapsed.median / originElapsed.median - 1) * 100, + samples, + }) + } + return { + warmups, + iterations, + batchRequests, + measuredRequestsPerImplementation: iterations * batchRequests, + scenarios: scenarioNames, + order: 'origin/worktree order alternates for every request and batch', + validation: + 'SHA-256 in one untimed preflight per implementation; timed requests retain byte, state, and output-limit checks', + memory: 'not measured in the warm latency loop', + garbageCollection: 'forced once before each scenario warm-up', + results, + comparisons, + } +} diff --git a/packages/router-core/src/await-signal.ts b/packages/router-core/src/await-signal.ts index c3506e2abd..61d59bde2d 100644 --- a/packages/router-core/src/await-signal.ts +++ b/packages/router-core/src/await-signal.ts @@ -1,27 +1,61 @@ +function observeLate( + callback: ((value: T) => unknown) | undefined, + value: T, +) { + if (!callback) { + return + } + + try { + const result = callback(value) + if (result !== undefined) { + void Promise.resolve(result).catch(() => {}) + } + } catch {} +} + +/** + * Await `value` unless `signal` aborts first. A result that settles after the + * abort is passed to `onLate` / `onLateError` instead. + * + * One abort listener per wait: SSR requests nest at most a few waits on one + * signal, so pooling them was measurably slower than this. + */ export function waitForReason( value: T | PromiseLike, signal: AbortSignal, - onLate?: (value: T) => void, + onLate?: (value: T) => unknown, + onLateError?: (reason: unknown) => unknown, ): Promise { const promise = Promise.resolve(value) if (signal.aborted) { - if (!onLate) { - return Promise.race([Promise.reject(signal.reason), promise]) - } - void promise.then(onLate, () => {}) + void promise.then( + (result) => observeLate(onLate, result), + (error) => observeLate(onLateError, error), + ) return Promise.reject(signal.reason) } + return new Promise((resolve, reject) => { const abort = () => reject(signal.reason) signal.addEventListener('abort', abort, { once: true }) - promise - .then((result) => { + void promise.then( + (result) => { + signal.removeEventListener('abort', abort) if (signal.aborted) { - onLate?.(result) + observeLate(onLate, result) } else { resolve(result) } - }, reject) - .finally(() => signal.removeEventListener('abort', abort)) + }, + (error) => { + signal.removeEventListener('abort', abort) + if (signal.aborted) { + observeLate(onLateError, error) + } else { + reject(error) + } + }, + ) }) } diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 28d450ad24..9d0e0e8b07 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -104,6 +104,7 @@ export { } from './manifest' export { isMatch } from './Matches' export { _getAssetMatches, _getRenderedMatches } from './load-client' +export { composeSsrBodyScripts, getSsrBodyScriptParts } from './ssr/bodyScripts' export type { AnyMatchAndValue, FindValueByIndex, @@ -275,7 +276,6 @@ export type { ParseLocationFn, InvalidateFn, ControllablePromise, - InjectedHtmlEntry, EmitFn, LoadFn, SubscribeFn, @@ -316,6 +316,7 @@ export { replaceEqualDeep, deepEqual, createControlledPromise, + isPromise, isModuleNotFoundError, DEFAULT_PROTOCOL_ALLOWLIST, escapeHtml, @@ -472,19 +473,10 @@ export type { SerializationError, } from './ssr/serializer/transformer' -export { - createSerializationAdapter, - makeSerovalPlugin, - makeSsrSerovalPlugin, -} from './ssr/serializer/transformer' +export { createSerializationAdapter } from './ssr/serializer/transformer' +export { makeSerovalPlugin } from './ssr/serializer/makeSerovalPlugin' -export { defaultSerovalPlugins } from './ssr/serializer/seroval-plugins' - -export { - RawStream, - createRawStreamRPCPlugin, - createRawStreamDeserializePlugin, -} from './ssr/serializer/RawStream' +export { RawStream } from './ssr/serializer/RawStream' export type { OnRawStreamCallback, RawStreamHint, diff --git a/packages/router-core/src/load-client.ts b/packages/router-core/src/load-client.ts index 1994eb2c37..ea4f270447 100644 --- a/packages/router-core/src/load-client.ts +++ b/packages/router-core/src/load-client.ts @@ -9,7 +9,6 @@ import { } from './router' import { hydrateSsrMatchId } from './ssr/ssr-match-id' import type { GLOBAL_SEROVAL, GLOBAL_TSR } from './ssr/constants' -import type { AnySerializationAdapter } from './ssr/serializer/transformer' import type { TsrSsrGlobal } from './ssr/types' import type { ParsedLocation } from './location' import type { NavigateOptions } from './link' @@ -2185,9 +2184,7 @@ export async function hydrate(router: AnyRouter): Promise { } const tsr = window.$_TSR! - const adapters = router.options.serializationAdapters as - | Array - | undefined + const adapters = router.options.serializationAdapters if (adapters?.length) { tsr.t = new Map( adapters.map((adapter) => [adapter.key, adapter.fromSerializable]), diff --git a/packages/router-core/src/load-server.ts b/packages/router-core/src/load-server.ts index 1991828d4f..aff9e11d26 100644 --- a/packages/router-core/src/load-server.ts +++ b/packages/router-core/src/load-server.ts @@ -48,6 +48,16 @@ const NOT_FOUND = 2 const REDIRECTED = 3 const SKIPPED = 4 +const MATCH_SETTLED_ABORT_REASON = Object.freeze({ + name: 'AbortError', + message: 'TanStack Router aborted this server match because it settled.', +}) + +const REDIRECT_ABORT_REASON = Object.freeze({ + name: 'AbortError', + message: 'TanStack Router aborted this server match because of a redirect.', +}) + type LoaderOutcome = | [typeof SUCCESS, data: unknown] | [typeof ERROR, error: unknown] @@ -450,7 +460,10 @@ function createLoaderTask( (cause) => normalize(cause, true), ) .then((result): LoaderOutcome => { - if (signal?.aborted || match.abortController.signal.reason === lane) { + if ( + signal?.aborted || + match.abortController.signal.reason === REDIRECT_ABORT_REASON + ) { return [SKIPPED] } if (result[0] === ERROR) { @@ -519,7 +532,7 @@ async function getNotFoundBoundary( function abortMatches( matches: Array, start = 0, - reason?: unknown, + reason: unknown = MATCH_SETTLED_ABORT_REASON, ): void { for (let index = start; index < matches.length; index++) { matches[index]!.abortController.abort(reason) @@ -683,7 +696,12 @@ async function executeServerLane( abortController: new AbortController(), })), } as MatchedLane - const abortLane = () => abortMatches(matched.matches, 0, signal?.reason) + const abortLane = () => + abortMatches( + matched.matches, + 0, + signal?.reason ?? MATCH_SETTLED_ABORT_REASON, + ) if (signal?.aborted) { abortLane() signal.throwIfAborted() @@ -773,7 +791,7 @@ async function executeServerLane( signal?.throwIfAborted() if (control?.[1][0] === REDIRECTED) { - abortMatches(lane.matches, 0, lane) + abortMatches(lane.matches, 0, REDIRECT_ABORT_REASON) return { type: 'redirect', redirect: control[1][1] } } @@ -817,7 +835,7 @@ async function executeServerLane( signal?.throwIfAborted() if (requiredFailure) { if (requiredFailure[1][0] === REDIRECTED) { - abortMatches(lane.matches) + abortMatches(lane.matches, 0, REDIRECT_ABORT_REASON) return { type: 'redirect', redirect: requiredFailure[1][1] } } failure = requiredFailure @@ -854,7 +872,24 @@ async function executeServerLane( signal, ) signal?.throwIfAborted() - router.serverSsr?.onCleanup(abortLane) + // Deferred loader work can outlive this lane, and the request signal above + // only covers one way a response ends. SSR cleanup covers them all: + // + // - client disconnected -> abort (work may be pending) + // - serialization or lifetime timeout -> abort (a deferred value hung) + // - body disposed server-side (HEAD strip, + // middleware replaced the response) -> abort (never delivered) + // - plain response / `hydrate: false`: the + // loader data was never dehydrated -> abort (never consumed) + // - stream completed: every dehydrated value + // already settled -> nothing left to abort + // + // `settled` is false in exactly the first four cases. + router.serverSsr?.onCleanup((settled) => { + if (!settled) { + abortLane() + } + }) return { type: 'render', status: terminal.status, matches: lane.matches } } finally { signal?.removeEventListener('abort', abortLane) diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 18de1cf47f..1974690b39 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -115,17 +115,17 @@ import type { CommitLocationOptions, NavigateFn, } from './RouterProvider' -import type { - Manifest, - ManifestRouteAssets, - RouterManagedTag, -} from './manifest' +import type { Manifest, ManifestRouteAssets } from './manifest' import type { AnySchema, AnyValidator } from './validators' import type { NavigateOptions, ResolveRelativePath, ToOptions } from './link' import type { AnySerializationAdapter, ValidateSerializableInput, } from './ssr/serializer/transformer' +import type { + HydrationScriptOutput, + InitialHydrationScriptTags, +} from './ssr/hydrationScripts' import type { GetStoreConfig, RouterStores } from './stores' function isExternalUrl(url: URL, origin: string) { @@ -146,8 +146,6 @@ export type ControllablePromise = Promise & { reject: (value?: any) => void } -export type InjectedHtmlEntry = Promise - export interface Register { // Lots of things on here like... // router @@ -828,17 +826,25 @@ export type ClearCacheFn = (opts?: { filter?: (d: MakeRouteMatchUnion) => boolean }) => void +/** + * Server-side SSR request contract. + * + * Tiering rule: the flat methods are the adapter/framework contract; + * `hydrationScripts` is transport for the core SSR stream merger only. + * New members must land on the matching tier. + */ export interface ServerSsr { - /** Framework-only: injects router-owned HTML into the SSR stream. */ - injectHtml: (html: string) => void - /** Framework-only: injects a router-owned script tag into the SSR stream. */ - injectScript: (script: string) => void - isDehydrated: () => boolean - isSerializationFinished: () => boolean - /** Framework-only: atomically reserves the pass-through stream path if safe. */ - reserveStreamFastPath: () => boolean - /** Framework-only. */ - onInjectedHtml: (listener: () => void) => () => void + /** @internal Transport access for the core SSR stream merger. */ + readonly hydrationScripts: { + /** Request signal already observed by the live response transform. */ + requestSignal?: AbortSignal + reserveFastPath: (output?: HydrationScriptOutput) => boolean + claimOutput: () => HydrationScriptOutput + liftBarrier: () => void + isInitialTaken: () => boolean + skipInitialTake: () => void + startSerializationTimeout: (timeoutMs: number) => void + } /** Framework-only. */ onRenderFinished: (listener: () => void) => void /** Framework-only. */ @@ -851,19 +857,28 @@ export interface ServerSsr { * resources whose references would otherwise pin the router (e.g. query * cache subscriptions, gcTime timers, abort controllers). * + * `settled` is true when every value the router dehydrated has settled, so + * no loader work can still be pending. It is false when the response ended + * early (abort, cancellation, timeout) or never consumed the loader data. + * * Listeners run synchronously and exactly once. Errors are caught and logged. + * A listener registered after cleanup already ran is invoked immediately. */ - onCleanup: (listener: () => void) => void + onCleanup: (listener: (settled: boolean) => void) => void /** Framework-only. */ - onSerializationFinished: (listener: () => void) => () => void + dehydrate: (opts?: { + requestAssets?: ManifestRouteAssets + signal?: AbortSignal + }) => Promise + /** + * Framework-only: opt this request out of hydration output entirely (for + * example a `hydrate: false` page). Call instead of `dehydrate()`, before + * rendering starts. No hydration scripts are emitted, `` renders + * no boundary, and the response takes the pass-through stream path. + */ + disableHydration: () => void /** Framework-only. */ - dehydrate: (opts?: { requestAssets?: ManifestRouteAssets }) => Promise - /** Framework-only. */ - takeBufferedScripts: () => RouterManagedTag | undefined - /** Framework-only: takes buffered router-owned HTML. */ - takeBufferedHtml: () => string | undefined - /** Framework-only. */ - liftScriptBarrier: () => void + takeInitialHydrationScriptTags: () => InitialHydrationScriptTags | undefined } export interface RouterSsrLifecycle { diff --git a/packages/router-core/src/ssr/STREAMING.md b/packages/router-core/src/ssr/STREAMING.md new file mode 100644 index 0000000000..12d3bd7b08 --- /dev/null +++ b/packages/router-core/src/ssr/STREAMING.md @@ -0,0 +1,617 @@ +# SSR streaming + +This document explains how TanStack Router adds hydration scripts to server-rendered HTML. +It describes the transport in `router-core` and the React, Solid, and Vue adapters. + +## Main terms + +The renderer and Seroval produce output independently. + +- The **application output** is the HTML from the framework renderer. +- A **hydration source** is one complete JavaScript source string from the router or Seroval. +- An **initial tag** is a hydration `` as a safe point. +After the boundary, each such sequence must be a position where script insertion is valid. + +These rules are application and adapter contracts. +The byte scanner cannot tell structural markup from matching text. + +## The boundary + +The boundary is a private transport marker emitted by ``. +The boundary script removes itself in the browser. + +The transform scans for the boundary only after the initial take. +Before that take, it forwards consumed application bytes without a boundary scan. + +When the transform finds the boundary, it enters the `Merge` phase and lifts the hydration barrier. +Queued late sources then become eligible for output. + +If application EOF arrives before the boundary, hydration-enabled merge mode releases the initial sources as late records. +The transform then drains them after the delivered document, as it does for any EOF safe point. +The page cannot hydrate without the route scripts that `` renders, but the response completes. +Disabled hydration and initial pass-through do not require a boundary. + +## Transform paths + +One stream implementation serves every request. +It starts in pass-through when the hydration state can reserve the fast path before any application output. +Otherwise it starts in merge mode and can change to pass-through later. +Both entries use the same `PassThrough` phase. + +### Initial pass-through + +The hydration state reserves initial pass-through only when all these conditions are true: + +- The state is live and has no failure. +- Serialization is complete. +- The initial take or `disableHydration()` committed the initial output. +- No queued or active hydration output remains. +- No consumer or earlier fast-path reservation conflicts with this reservation. + +The stream then never claims the hydration output and never scans. +It forwards each `Uint8Array` from the renderer unchanged. +It does not scan, copy, or move those bytes. + +A Node renderer can also send string records. +The path encodes one string record at a time in chunks of at most 64 KiB. +It does not join separate string records. + +At application EOF, the path marks rendering as complete and closes normally. + +### Disabled hydration + +`serverSsr.disableHydration()` disables router hydration output for one request. +Call it instead of `dehydrate()`, before rendering starts. + +The runtime also rejects calls after any of these events: + +- `dehydrate()` starts. +- The first `` take commits initial output. +- The transform claims the hydration output. +- The hydration producer completes or starts an active record. + +The call removes the queued bootstrap sources. +It commits the initial state, lifts the barrier, and marks the producer as complete. + +The request emits no hydration tags or router boundary. +`` can still render normal route and manifest scripts. +The transform can use initial pass-through. + +### Merge mode + +The transform uses merge mode when it cannot reserve initial pass-through. +Merge mode claims the request hydration output for one consumer. +A second consumer causes an error. + +Merge mode recognizes these universal byte patterns: + +1. The fixed router boundary suffix. +2. The exact canonical close. + +An adapter can add one safe-point profile: + +- `script-close` matches exact lowercase ``. +- `record-end` uses the end of a complete renderer record. + +The core does not select a profile from a framework name. +The adapter selects it. + +The boundary and script-close matchers keep partial matches across input chunks. +Their patterns have a unique first byte. + +The canonical close repeats its first byte. +The transform uses an exact search and a carry of at most 13 bytes for that pattern. + +### Merge phases + +| Phase | Meaning | +| ---------------- | -------------------------------------------------------------- | +| `BeforeBoundary` | Forward application output and wait for the one-time boundary. | +| `Merge` | Find safe points and the canonical close. | +| `HeldClose` | Keep the canonical close while later output drains. | +| `PassThrough` | Forward all later application output without scanning. | + +A stream starts in `PassThrough` when initial pass-through is reserved; otherwise only `Merge` can enter it. +`HeldClose` must preserve final document order, so it cannot enter that phase. + +A ready late record starts only after the boundary and at a safe point. +An active late record drains completely before application output resumes. + +### Dynamic pass-through + +Merge mode can stop scanning after the boundary. +It does this only when all these conditions are true: + +- The hydration output is `Done`. +- No hydration source or active record remains. +- The transform holds no partial canonical close. +- The hydration state can reserve the fast path for the current consumer. + +After the switch, all later application output passes through unchanged. +The transform does not scan or move later document closes. + +## Adapter safe points + +| Adapter or path | Additional safe point | +| --------------- | --------------------------------- | +| React | Exact lowercase `` | +| Solid | End of a complete renderer record | +| Vue | None | +| Eager string | None | + +The boundary and canonical close are safe points for every adapter. +Ordinary EOF is also a safe point after the boundary. +A partial canonical close at EOF is forwarded as ordinary content, as described below. + +### React + +The transform treats React chunk boundaries as arbitrary. +It does not use them as safe points. + +The script-close profile lets a late record follow a complete React patch script. +It can also emit router data while React waits for later Suspense work. + +The adapter uses `renderToReadableStream` when that function exists. +Otherwise, it uses `renderToPipeableStream`. +Both paths use the same script-close profile. +Both paths set `progressiveChunkSize` to positive infinity so React does not split completed Suspense boundaries into separate patches based only on output size. +The adapter does not inspect the React version. + +### Solid + +The Solid adapter preserves each complete shell or patch string as one renderer record. +It uses the end of that record as a safe point. + +An internal 64 KiB encoding chunk is not a record end. +The safe point occurs only after the complete source record drains. + +### Vue + +The Vue adapter does not treat renderer record ends as safe points. +It uses only the boundary, the canonical close, and eligible EOF. + +The Vue application output must have one `` element as its outer root. +An outer Vue Fragment or root array is not supported. +Its closing marker follows ``, and the transform does not preserve that position. +Fragments inside `` are supported. + +## Canonical document close + +Merge mode recognizes only this exact adjacent lowercase sequence: + +```html + +``` + +While the transform remains in the `Merge` phase, the first matching sequence after the boundary becomes the held canonical close. +The transform emits preceding application bytes and holds the 14-byte close. + +A match inside one byte chunk advances past the close without copying it. +The transform can emit the preceding prefix as a view of that chunk. +A match across chunks uses the carry and one small combined buffer. +The transform caches the search result for the current byte chunk, including a missing match. +Returning from a renderer safe point reuses that result; advancing to another byte chunk clears it. + +The transform continues to process renderer patches and late records after it holds the close. +All other application bytes keep their order. +Late records keep FIFO order. +The two streams can interleave only at safe points. + +After successful completion, the transform emits a fresh 14-byte copy of the held close last. +On failure or cancellation, the transform does not emit the held close. +Bytes already delivered to the consumer remain delivered. + +The match is case-sensitive and byte-exact. +Whitespace or a text node between `` and `` prevents a match. + +If the transform completes successfully without a canonical match, it preserves all application bytes. +A later record can then appear after ``. +This can happen at a React script close, a Solid record end, or EOF. + +Supporting every equivalent HTML form requires an HTML parser. +This transport uses exact byte matching instead. + +Initial and dynamic pass-through never move a document close. +They also preserve bytes that follow ``. + +### EOF rules + +After the boundary, ordinary EOF can provide the final safe point. +If a late record is `Active`, it drains first. +These rules apply after no record is active: + +- If output is `Ready`, the transform drains ready late records at EOF. +- If output is `Waiting`, the transform waits for a state change. +- If normal serialization reaches `Done`, the transform completes. +- If output is `Failed`, the transform fails immediately. + +A partial canonical-close prefix at EOF is ordinary application content. +The transform forwards those bytes first and then applies the rules above. +A late record can follow them, exactly as after a document without a canonical close. + +Server cleanup terminates the transform instead of using these `Done` rules. + +## Hydration output states + +`claimOutput()` creates one pull view for merge mode. +The view has five states: + +| State | Meaning | +| --------- | ---------------------------------------------------------------------------------- | +| `Waiting` | No late record is eligible. The queue can still contain blocked sources. | +| `Ready` | Queued sources can start at the next safe point. | +| `Active` | One late record is in progress and must finish. | +| `Done` | Normal output drained, hydration is disabled, or cleanup made the output inactive. | +| `Failed` | The response must fail immediately. | + +The hydration output permits one consumer claim. +While it is live, it permits one active subscriber at a time. +Another subscriber can register after the first subscriber unregisters. +After cleanup, subscription returns a function that does nothing. + +The transform calls `pullChunk()` only from a response-stream pull. +Each call returns at most 64 KiB of bytes. + +## Late record framing + +`hydrationScripts.ts` owns the complete framing of every late record. +The framing includes the opening tag, escaped nonce, separators, self-removal source, and closing tag. + +A late record has this logical form: + +```text + +``` + +The nonce attribute is absent when the request has no nonce. +The code escapes `&`, double quotes, single quotes, `<`, and `>` in a dynamic nonce. + +The transform does not inspect this framing. + +### Late record size + +The hydration output selects a FIFO source prefix for each late record. +Its target is at most 64 Ki UTF-16 code units for the complete framed record. + +The hydration output never splits one hydration source across script tags. +Therefore, one large source can create a record above the target. + +If a complete record is at most 16 Ki code units, the hydration output joins and encodes it once. +The hydration output encodes larger records in bounded parts with `encodeInto()`. + +Every returned byte chunk is at most 64 KiB. +Application output cannot appear inside an active record. + +### Queue ownership + +The queue uses one source array and a head index. +When it selects the complete unconsumed array, it can reuse that array internally. + +For a partial selection, it copies the selected prefix. +It replaces consumed queue slots with empty slots instead of shifting the live suffix. + +The queue removes its backing array when it becomes empty. +For a busy queue, it can compact after at least 1,024 consumed entries. +The consumed prefix must also be at least as large as the live suffix. + +Compaction keeps FIFO order. + +The hydration output releases a source from backlog accounting after its text finishes encoding. +The record stays `Active` until its separators and closing code drain. + +The boundary does not move or copy queued source strings. +It only makes them eligible for a pull. + +Normal serialization adds `$_TSR.e()` as the final hydration source. +The hydration output becomes `Done` after that source and all earlier sources drain. + +A backlog error changes the state to `Failed`, drops queued and active sources, +and causes Router to dispose of the SSR serializer. +Cleanup clears the queue and changes a claimed output to `Done`. + +## Backpressure and memory limits + +One downstream pull emits at most one output chunk. +The transform starts at most one application read ahead. + +The merge path can retain these main values: + +- One current application record and its encoder cursor, or one in-flight or prefetched nonterminal application read. +- One encoded application-string chunk of at most 64 KiB. The current input string record can be larger. +- At most 13 bytes from a partial canonical close. +- One active late record with its selected sources. +- One queue of later hydration sources. +- One hydration output buffer of at most 64 KiB. + +The hydration state permits at most 4,096 retained sources across initial, queued, and active output. +It also permits at most 16,777,216 UTF-16 code units of regular retained source text. + +These limits include constructor seeds and later sources. +They apply before and after the initial take. + +The limits apply to the pending backlog, not to total response output. +Initial-source accounting ends at the initial take. +Late-source accounting ends when each source finishes encoding. + +One source can exceed the 16 Mi-code-unit limit. +This exception supports one large loader or query value. +A second oversized source cannot be retained while the first is queued or being encoded. + +Cleanup clears source arrays, active encoder state, callbacks, timers, and stored errors. + +New eligible output and failures can wake the transform through one subscription. +`pullChunk()` does not notify the subscriber about successful state transitions. +When a producer update or barrier transition changes the output state, the hydration state still notifies the transform. +This notification can occur while a response-stream pull is pending. +Server cleanup terminates through a separate cleanup listener. +Application reads wake the transform separately. +The transform uses one waiting resolver at a time. +It does not create `Promise.race()` handlers in its pump. + +## Unicode and string input + +Built-in streaming adapters send UTF-8 `Uint8Array` records. +The transform forwards application bytes without decoding them. +A UTF-8 character can span byte records. + +A Node pipeable stream can also send string records. +The transform encodes each string record independently in chunks of at most 64 KiB. + +It does not repair a surrogate pair that spans two separate string records. +A record-end safe point occurs after the complete string, not after an internal encoding chunk. + +Each hydration source is one complete JavaScript string. +A semicolon separates adjacent sources in one tag. +HTML markup separates sources in different tags. + +`TextEncoder` and `encodeInto()` do not split a valid surrogate pair inside one source. +The implementation does not cut sources at estimated UTF-16 offsets. + +### Eager string output + +The eager helper uses the same merge path when initial pass-through is unavailable. +It encodes `` and the HTML string in bounded parts. + +It decodes merged output incrementally with `TextDecoder`. +It does not first collect one complete byte buffer or call `Response.text()`. + +When initial pass-through is available, the helper returns `` plus the original HTML string. +It then cleans the server state in a `finally` block. + +## Completion and cleanup + +The streaming paths use one finalizer. +The eager fast path uses its own `try` and `finally` because it has no response stream. + +| Result | Response output | Application reader | `onAbort` | +| ------------------------ | --------------- | ------------------ | --------- | +| Natural completion | Close | Release | No | +| Request abort | Error | Cancel | Yes | +| Consumer cancellation | No extra signal | Cancel | Yes | +| Stream or output failure | Error | Cancel | Yes | +| Serialization timeout | Error | Cancel | Yes | +| Lifetime timeout | Error | Cancel | Yes | +| External server cleanup | Error | Cancel | Yes | + +The terminal guard makes cleanup run once. +A non-success result calls the adapter `onAbort` function at most once. + +After natural completion, the transform releases the application reader. +After another result, it cancels the reader. +Reader cancellation can finish after router cleanup. + +Finally, server cleanup disposes of the SSR serializer and clears Router-owned hydration state. +It also stops the reader pump that Router's SSR RawStream bridge creates. +It clears the request router's `router.ssr` and `router.serverSsr` slots. + +Cleanup listeners receive one boolean, `settled`. +It is true when every value the router dehydrated has settled. +Rejected hydration output, including a backlog failure, stops serialization without marking deferred values as settled. +Router aborts the request's route-match controllers only when `settled` is false, because only then can loader work still be pending. + +Canceling a RawStream that the SSR or JSON bridge reconstructs removes Router's Seroval-stream listener. +Seroval and its official plugins remain responsible for work that they create. + +### Timeouts + +In merge mode, application EOF starts the serialization timeout and calls `setRenderFinished()`. +This happens as soon as a prefetched read reports EOF, even if the consumer pauses. +The default serialization timeout is 60 seconds. + +The timeout runs only while Seroval remains active. +It changes hydration output to `Failed` when it expires. + +Every live streaming transform also has a lifetime timeout. +Its default is twice the serialization timeout. + +Some Web runtimes return numeric timer IDs with no `unref()` method. +The code calls `unref()` only when the returned timer handle provides it. + +The serialization timeout stays referenced because it protects active work after application rendering ends. + +### External cleanup and response disposal + +`ServerSsr.cleanup()` notifies each live transform. +The transform then fails with an `AbortError`, cancels its reader, and calls the adapter abort function. + +A stream response also provides an idempotent `dispose()` function. +Disposal removes router ownership before it cancels the response body. +A renderer can ignore that body cancellation. + +After response handoff, request-abort binding has four cases: + +- If the request is already aborted, handoff disposes the stream immediately. +- If the live transform already observes the same request signal, handoff reuses its listener. On request abort, SSR cleanup also disposes the final response, including a body wrapped by middleware. +- Otherwise, with live router SSR state, handoff adds a listener to dispose the stream, and SSR cleanup removes that listener. +- Without live router SSR state, abort still disposes the stream. The one-time listener ends with the request signal. + +### Adapter cancellation limits + +Every streaming adapter rejects a request that is already aborted before renderer setup. +The adapters and core transform also detect an abort during synchronous setup before they return a response. + +The React readable path passes the request signal to `renderToReadableStream`. +The React pipeable path passes `abort()` to the transform. + +For Solid, cancelling the transform's reader errors the writable used by its renderer. +Vue pipes its public readable renderer stream into the transform, so reader cancellation propagates to Vue. +Neither renderer provides a disposal handle for unresolved component work. + +The adapters stop outgoing bytes and release router-owned state. +An unresolved Solid or Vue resource can retain its renderer closure until that resource settles. + +React and Solid bot-readiness waits observe an adapter signal that the transform aborts on failure or cancellation, including request abort, lifetime expiry, and external SSR cleanup. +These waits cannot keep the response promise pending after the transform terminates. +The extra controller is allocated only for bot waits on the readable-stream paths. +Each wait removes its listener when the wait ends. + +## Test coverage + +Unit tests cover every byte split of the boundary and script-close patterns. +They also cover every internal split of the canonical close. + +Hydration-state tests cover initial ownership, exact framing, nonce escaping, FIFO order, size limits, completion, failure, and cleanup. + +Transform tests cover safe points, content after ``, EOF, close carry, ordering, cancellation, timeouts, Unicode, and stream errors. + +Adapter tests make sure that React, Solid, and Vue select the documented safe-point profiles. +Real-renderer tests cover React 19 script closes and Solid record ends. + +React and Solid browser suites cover CSP for ordinary SSR output. +No browser CSP test forces a late dynamic hydration record. +Vue has no equivalent browser CSP suite. + +Normal unit tests cover backpressure correctness and lost-record prevention. +Slow-consumer memory tests run only when `RUN_BACKPRESSURE_PERF=1`. + +Browser tests cover hydration data, interaction, data order, and removal of initial hydration tags and the boundary. + +The [SSR streaming benchmark](../../benchmarks/ssr-streaming/README.md) measures throughput and retained memory. +Use interleaved warm runs for latency comparisons. +Use isolated processes with forced garbage collection for memory comparisons. + +Treat machine-specific measurements as supporting evidence. +They are not part of the transport contract. diff --git a/packages/router-core/src/ssr/bodyScripts.ts b/packages/router-core/src/ssr/bodyScripts.ts new file mode 100644 index 0000000000..b2472ec30b --- /dev/null +++ b/packages/router-core/src/ssr/bodyScripts.ts @@ -0,0 +1,57 @@ +import { _getAssetMatches } from '../load-client' +import type { Manifest, RouterManagedTag } from '../manifest' +import type { AnyRouteMatch } from '../Matches' +import type { InitialHydrationScriptTags } from './hydrationScripts' + +type ScriptTags = Array +export type SsrBodyScriptParts = readonly [ScriptTags, ScriptTags] + +export function getSsrBodyScriptParts( + matches: Array, + manifest: Manifest | undefined, + nonce: string | undefined, + routeScriptAttrs?: Record, +): SsrBodyScriptParts { + const assetMatches = _getAssetMatches(matches) + const routeScripts: ScriptTags = [] + const manifestScripts: ScriptTags = [] + for (const match of assetMatches) { + for (const script of Array.isArray(match.scripts) ? match.scripts : []) { + if (!script) { + continue + } + const { children, ...attrs } = script + routeScripts.push({ + tag: 'script', + attrs: { ...attrs, ...routeScriptAttrs, nonce }, + children, + }) + } + } + if (manifest) { + for (const match of assetMatches) { + for (const asset of manifest.routes[match.routeId]?.scripts ?? []) { + manifestScripts.push({ + tag: 'script', + attrs: { ...asset.attrs, nonce }, + children: asset.children, + }) + } + } + } + return [routeScripts, manifestScripts] +} +export function composeSsrBodyScripts( + [routeScripts, manifestScripts]: SsrBodyScriptParts, + initialHydrationScripts?: InitialHydrationScriptTags, +): Array { + if (!initialHydrationScripts) { + return [...routeScripts, ...manifestScripts] + } + return [ + ...initialHydrationScripts.before, + ...routeScripts, + ...manifestScripts, + initialHydrationScripts.boundary, + ] +} diff --git a/packages/router-core/src/ssr/client.ts b/packages/router-core/src/ssr/client.ts index 79ed2f1e8a..dc769e7495 100644 --- a/packages/router-core/src/ssr/client.ts +++ b/packages/router-core/src/ssr/client.ts @@ -4,3 +4,11 @@ export type { JsonResponse } from './json' export { hydrate } from './ssr-client' export * from './ssr-client' export type { TsrSsrGlobal, DehydratedMatch, DehydratedRouter } from './types' +export { + createDefaultSerovalPlugins, + defaultSerovalPlugins, + defaultSerovalDeserializerPlugins, +} from './serializer/seroval-plugins' +export { makeSerovalPlugin } from './serializer/makeSerovalPlugin' +export type { AnySerializationAdapter } from './serializer/transformer' +export { createRawStreamDeserializePlugin } from './serializer/RawStreamRPCPlugin' diff --git a/packages/router-core/src/ssr/constants.ts b/packages/router-core/src/ssr/constants.ts index 59d6c16100..8ce3dcfa0d 100644 --- a/packages/router-core/src/ssr/constants.ts +++ b/packages/router-core/src/ssr/constants.ts @@ -1,3 +1,2 @@ export const GLOBAL_TSR = '$_TSR' export declare const GLOBAL_SEROVAL: '$R' -export const TSR_SCRIPT_BARRIER_ID = '$tsr-stream-barrier' diff --git a/packages/router-core/src/ssr/createRequestHandler.ts b/packages/router-core/src/ssr/createRequestHandler.ts index 27f864c6e3..e3297730d0 100644 --- a/packages/router-core/src/ssr/createRequestHandler.ts +++ b/packages/router-core/src/ssr/createRequestHandler.ts @@ -1,5 +1,6 @@ import { createServerHistory } from '@tanstack/history' import { _getRenderedMatches } from '../load-client' +import { waitForReason as waitForRequest } from '../await-signal' import { mergeHeaders } from './headers' import { attachRouterServerSsrUtils, @@ -8,7 +9,8 @@ import { } from './ssr-server' import { bindSsrResponseToRequest, - disposeSsrResponseDetached, + disposeSsrResponse, + isSsrResponse, } from './handlerCallback' import type { HandlerCallback } from './handlerCallback' import type { AnyHeaders } from './headers' @@ -19,77 +21,14 @@ export type RequestHandler = ( cb: HandlerCallback, ) => Promise -type RequestWaiter = ((reason: unknown) => void) | undefined +export { waitForRequest } -const requestWaiters = new WeakMap>() - -function removeRequestWaiter( - waiters: Array, - index: number, - reject: (reason: unknown) => void, -) { - if (waiters[index] !== reject) { - return - } - if (index !== waiters.length - 1) { - waiters[index] = undefined - return - } - - waiters.pop() - while (waiters.length && waiters[waiters.length - 1] === undefined) { - waiters.pop() - } -} - -export function waitForRequest( - value: T | PromiseLike, - signal: AbortSignal, - onLate?: (value: T) => void, -): Promise { - const promise = Promise.resolve(value) - if (signal.aborted) { - void promise.then(onLate, () => {}) - return Promise.reject(signal.reason) - } - - return new Promise((resolve, reject) => { - let waiters = requestWaiters.get(signal) - let index: number - if (waiters) { - index = waiters.push(reject) - 1 - } else { - const newWaiters: Array = [reject] - waiters = newWaiters - index = 0 - requestWaiters.set(signal, newWaiters) - signal.addEventListener( - 'abort', - () => { - requestWaiters.delete(signal) - for (const rejectWaiter of newWaiters) { - rejectWaiter?.(signal.reason) - } - newWaiters.length = 0 - }, - { once: true }, - ) +function createLateResponseDisposer(signal: AbortSignal) { + return (result: unknown) => { + if (result instanceof Response || isSsrResponse(result)) { + disposeSsrResponse(result, signal.reason) } - void promise.then( - (result) => { - removeRequestWaiter(waiters, index, reject) - if (signal.aborted) { - onLate?.(result) - } else { - resolve(result) - } - }, - (error) => { - removeRequestWaiter(waiters, index, reject) - reject(error) - }, - ) - }) + } } export function createRequestHandler({ @@ -102,14 +41,19 @@ export function createRequestHandler({ getRouterManifest?: () => ServerManifest | Promise }): RequestHandler { return async (cb) => { - request.signal.throwIfAborted() + const signal = request.signal + signal.throwIfAborted() + const manifest = getRouterManifest + ? await waitForRequest(getRouterManifest(), signal) + : undefined + signal.throwIfAborted() const router = createRouter() let responseOwnsCleanup = false try { attachRouterServerSsrUtils({ router, - manifest: await waitForRequest(getRouterManifest?.(), request.signal), + manifest, }) // normalizing and sanitizing the pathname here for server, so we always deal with the same format during SSR. @@ -127,40 +71,36 @@ export function createRequestHandler({ }) await router.load({ - _signal: request.signal, + _signal: signal, }) - request.signal.throwIfAborted() + signal.throwIfAborted() const result = router._serverResult if (result?.type === 'redirect') { return result.redirect } - await waitForRequest(router.serverSsr?.dehydrate(), request.signal) - request.signal.throwIfAborted() + await router.serverSsr?.dehydrate({ signal }) + signal.throwIfAborted() const responseHeaders = getRequestHeaders({ router, }) - request.signal.throwIfAborted() + signal.throwIfAborted() + const disposeLate = createLateResponseDisposer(signal) const response = await waitForRequest( cb({ request, router, responseHeaders, }), - request.signal, - (late) => { - disposeSsrResponseDetached(late, request.signal.reason) - }, + signal, + disposeLate, + disposeLate, ) - const ssrResponse = bindSsrResponseToRequest( - router, - response, - request.signal, - ) - request.signal.throwIfAborted() + const ssrResponse = bindSsrResponseToRequest(router, response, signal) + signal.throwIfAborted() responseOwnsCleanup = ssrResponse.serverSsrCleanup === 'stream' return ssrResponse.response } finally { diff --git a/packages/router-core/src/ssr/handlerCallback.ts b/packages/router-core/src/ssr/handlerCallback.ts index 368c8a2a61..c64f5c0d0c 100644 --- a/packages/router-core/src/ssr/handlerCallback.ts +++ b/packages/router-core/src/ssr/handlerCallback.ts @@ -8,7 +8,7 @@ export type SsrResponse = | { response: Response serverSsrCleanup: 'stream' - dispose: (reason?: unknown) => Promise + dispose: (reason?: unknown) => undefined } export type HandlerCallbackResult = Response | SsrResponse @@ -30,67 +30,51 @@ export function normalizeSsrResponse( : { response: result, serverSsrCleanup: 'none' } } -export function disposeSsrResponse( - response: SsrResponse, - reason?: unknown, -): Promise { - if (response.serverSsrCleanup !== 'stream') { - return Promise.resolve() - } - try { - return Promise.resolve(response.dispose(reason)) - } catch (error) { - return Promise.reject(error) - } -} - -export function disposeSsrResponseDetached( - result: HandlerCallbackResult, - reason?: unknown, - onError: (error: unknown) => void = console.error, -): void { - const ssrResponse = normalizeSsrResponse(result) - if (ssrResponse.serverSsrCleanup === 'stream') { - void disposeSsrResponse(ssrResponse, reason).catch(onError) +function cancelResponseBody(response: Response, reason?: unknown): void { + const body = response.body + if (!body) { return } + void body.cancel(reason).catch(console.error) +} - if (ssrResponse.response.body) { - try { - void ssrResponse.response.body.cancel(reason).catch(onError) - } catch (error) { - onError(error) - } +export function disposeSsrResponse( + result: HandlerCallbackResult, + reason?: unknown, +): undefined { + const response = normalizeSsrResponse(result) + if (response.serverSsrCleanup === 'stream') { + response.dispose(reason) + } else { + cancelResponseBody(response.response, reason) } } -export function createSsrStreamResponse( - router: TRouter, +/** The HTTP status that Router's server load selected for this render. */ +export function getSsrStatus(router: AnyRouter) { + return router._serverResult?.type === 'render' + ? router._serverResult.status + : 200 +} + +export function createSsrStreamResponse( + router: AnyRouter, response: Response, -): SsrResponse { - if (!response.body) { +): Extract { + const body = response.body + if (!body) { throw new Error('Invariant failed: SSR stream response requires a body') } - let disposed = false return { response, serverSsrCleanup: 'stream', - async dispose(reason?: unknown) { - if (disposed) { - return - } - disposed = true - + dispose(reason?: unknown): undefined { // Sever router ownership before asking user/renderer stream machinery to // cancel. A custom stream is allowed to ignore cancellation forever. router.serverSsr?.cleanup() - try { - await response.body!.cancel(reason) - } catch { - // Cleanup above already released router SSR state. - } + void body.cancel(reason).catch(() => {}) }, } } @@ -103,46 +87,57 @@ export function bindSsrResponseToRequest( const ssrResponse = normalizeSsrResponse(result) if (ssrResponse.serverSsrCleanup !== 'stream') { if (signal.aborted) { - disposeSsrResponseDetached(result, signal.reason) + disposeSsrResponse(result, signal.reason) } return ssrResponse } - const failed = (error: unknown) => { - router?.serverSsr?.cleanup() - console.error(error) - } const abort = () => { - disposeSsrResponseDetached(ssrResponse, signal.reason, failed) + disposeSsrResponse(ssrResponse, signal.reason) } if (signal.aborted) { abort() return ssrResponse } + const serverSsr = router?.serverSsr + if (serverSsr?.hydrationScripts.requestSignal === signal) { + // The transform already observes this request. Its cleanup must also + // dispose the final response, including any middleware-owned body. + serverSsr.onCleanup(() => { + if (signal.aborted) { + abort() + } + }) + return ssrResponse + } + signal.addEventListener('abort', abort, { once: true }) - router?.serverSsr?.onCleanup(() => { + if (!serverSsr) { + return ssrResponse + } + + serverSsr.onCleanup(() => { signal.removeEventListener('abort', abort) }) return ssrResponse } -export async function replaceSsrResponse( +export function replaceSsrResponse( result: HandlerCallbackResult, response: Response, reason?: unknown, -): Promise { - const ssrResponse = normalizeSsrResponse(result) - await disposeSsrResponse(ssrResponse, reason) +): Extract { + disposeSsrResponse(result, reason) return { response, serverSsrCleanup: 'none' } } -export async function stripSsrResponseBody( +export function stripSsrResponseBody( result: HandlerCallbackResult, reason?: unknown, -): Promise { +): Extract { const ssrResponse = normalizeSsrResponse(result) - await disposeSsrResponse(ssrResponse, reason) + disposeSsrResponse(ssrResponse, reason) return { response: new Response(null, ssrResponse.response), serverSsrCleanup: 'none', diff --git a/packages/router-core/src/ssr/htmlBoundaryScanner.ts b/packages/router-core/src/ssr/htmlBoundaryScanner.ts new file mode 100644 index 0000000000..4a46f7c55f --- /dev/null +++ b/packages/router-core/src/ssr/htmlBoundaryScanner.ts @@ -0,0 +1,138 @@ +const textEncoder = new TextEncoder() + +const DOCUMENT_CLOSE = '' +export const SCRIPT_CLOSE = '' +export const DOCUMENT_CLOSE_ANCHOR_INDEX = DOCUMENT_CLOSE.indexOf('y') +export const SCRIPT_CLOSE_ANCHOR_INDEX = SCRIPT_CLOSE.indexOf('p') + +export const DOCUMENT_CLOSE_BYTES = textEncoder.encode(DOCUMENT_CLOSE) +export const SCRIPT_CLOSE_BYTES = textEncoder.encode(SCRIPT_CLOSE) + +export function encodeIntoBoundedChunk( + source: string, + sourceOffset: number, + output: Uint8Array, + outputOffset = 0, +) { + // encodeInto() stops before a code point that does not fit, so it never + // splits a surrogate pair across chunks. + return textEncoder.encodeInto( + sourceOffset === 0 ? source : source.slice(sourceOffset), + outputOffset === 0 ? output : output.subarray(outputOffset), + ) +} + +/** + * State for matching a fixed ASCII sequence across input chunks. + * + * The pattern must be non-empty, its first byte must be unique, and the anchor + * index must point inside the pattern. + */ +export type ByteMatcherState = { + readonly pattern: Uint8Array + readonly anchorIndex: number + matched: number +} + +/** Advance matcher state and return the local offset after a complete match. */ +export function advanceByteMatcher( + matcher: ByteMatcherState, + value: Uint8Array, + startIndex = 0, + findLast = false, +) { + const { pattern, anchorIndex } = matcher + let matched = matcher.matched + let lastMatchEnd: number | undefined + let index = startIndex + while (index < value.length) { + if (matched === 0) { + if (anchorIndex > 0 && index < value.length - anchorIndex) { + const anchor = value.indexOf(pattern[anchorIndex]!, index + anchorIndex) + if (anchor < 0) { + index = value.length - anchorIndex + continue + } + index = anchor - anchorIndex + } else { + index = value.indexOf(pattern[0]!, index) + if (index < 0) { + matcher.matched = matched + return lastMatchEnd + } + } + } + + const byte = value[index]! + if (byte === pattern[matched]) { + matched++ + } else { + matched = byte === pattern[0] ? 1 : 0 + } + index++ + + if (matched === pattern.length) { + matched = 0 + if (!findLast) { + matcher.matched = matched + return index + } + lastMatchEnd = index + } + } + matcher.matched = matched + return lastMatchEnd +} + +/** Find a complete fixed sequence that is contained in one byte chunk. */ +export function findExactBytes( + value: Uint8Array, + pattern: Uint8Array, + startIndex = 0, + anchorIndex = 0, +) { + let anchor = value.indexOf(pattern[anchorIndex]!, startIndex + anchorIndex) + while (anchor >= 0) { + const candidate = anchor - anchorIndex + if (candidate + pattern.length > value.length) { + return -1 + } + let patternIndex = 0 + while ( + patternIndex < pattern.length && + value[candidate + patternIndex] === pattern[patternIndex] + ) { + patternIndex++ + } + if (patternIndex === pattern.length) { + return candidate + } + anchor = value.indexOf(pattern[anchorIndex]!, anchor + 1) + } + return -1 +} + +/** + * Find the longest suffix that can become the fixed sequence in the next + * chunk. The returned index starts that suffix. + */ +export function getExactBytesPrefixAtEnd( + value: Uint8Array, + pattern: Uint8Array, + startIndex = 0, +) { + candidate: for ( + let length = Math.min(pattern.length - 1, value.length - startIndex); + length > 0; + length-- + ) { + const candidateStart = value.length - length + for (let index = 0; index < length; index++) { + if (value[candidateStart + index] !== pattern[index]) { + continue candidate + } + } + return candidateStart + } + return undefined +} diff --git a/packages/router-core/src/ssr/hydrationScripts.ts b/packages/router-core/src/ssr/hydrationScripts.ts new file mode 100644 index 0000000000..79222e5d73 --- /dev/null +++ b/packages/router-core/src/ssr/hydrationScripts.ts @@ -0,0 +1,689 @@ +/* eslint-disable @typescript-eslint/triple-slash-reference */ +/// + +import { getCrossReferenceHeader } from 'seroval' +import { invariant } from '../invariant' +import minifiedTsrBootStrapScript from './tsrScript?script-string' +import { GLOBAL_TSR } from './constants' +import { encodeIntoBoundedChunk } from './htmlBoundaryScanner' +import type { RouterManagedTag } from '../manifest' + +export const SSR_SERIALIZATION_SCOPE_ID = 'tsr' +const HYDRATION_SCRIPT_BOUNDARY_TAIL = ';/*$tsr-stream-boundary*/' + +const encoder = new TextEncoder() +const SOURCE_SEPARATOR = ';' +const MAX_INITIAL_SOURCE_CODE_UNITS = 16 * 1024 +const MAX_BACKLOG_CODE_UNITS = 16 * 1024 * 1024 +const MAX_BACKLOG_SOURCES = 4_096 +const MIN_OUTPUT_BYTES = 256 +const MAX_DIRECT_CODE_UNITS = 16 * 1024 +export const MAX_HYDRATION_OUTPUT_CHUNK_BYTES = 64 * 1024 +const MAX_DYNAMIC_RECORD_CODE_UNITS = MAX_HYDRATION_OUTPUT_CHUNK_BYTES + +const STREAM_PART_ATTRIBUTE = 'data-tsr-stream-part' +const INITIAL_CLEANUP_SOURCE = `{let s=document.currentScript,p;while((p=s.previousElementSibling)&&p.hasAttribute('${STREAM_PART_ATTRIBUTE}'))p.remove();s.remove()}` +const INITIAL_CLEANUP_SUFFIX = SOURCE_SEPARATOR + INITIAL_CLEANUP_SOURCE +const DYNAMIC_CLOSE_SOURCE = 'document.currentScript.remove()' +const HYDRATION_SCRIPT_BOUNDARY_SOURCE = + `document.currentScript.remove()` + HYDRATION_SCRIPT_BOUNDARY_TAIL +const HYDRATION_SCRIPT_BOUNDARY_SUFFIX = + HYDRATION_SCRIPT_BOUNDARY_TAIL + '' +export const HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX = + HYDRATION_SCRIPT_BOUNDARY_SUFFIX.lastIndexOf('*') +export const HYDRATION_SCRIPT_BOUNDARY_BYTES = encoder.encode( + HYDRATION_SCRIPT_BOUNDARY_SUFFIX, +) + +const ROUTER_PREFIX = GLOBAL_TSR + '.router=' +const PROMISE_PREFIX = GLOBAL_TSR + '.p(()=>' +const DEFAULT_INITIAL_SOURCES = [ + getCrossReferenceHeader(SSR_SERIALIZATION_SCOPE_ID), + minifiedTsrBootStrapScript, +] + +export const HydrationScriptOutputState = { + Waiting: 0, + Ready: 1, + Active: 2, + Done: 3, + Failed: 4, +} as const + +export type HydrationScriptOutputState = + (typeof HydrationScriptOutputState)[keyof typeof HydrationScriptOutputState] + +/** A request-local, single-consumer stream of complete records. */ +export type HydrationScriptOutput = { + readonly state: HydrationScriptOutputState + readonly error: unknown + pullChunk: () => Uint8Array + subscribe: (onChange: () => void) => () => void +} + +type ConsumerOwnership = + | HydrationScriptOutput + | 'fast-path' + | 'cleaned' + | undefined + +/** The one-time initial `` take: hydration tags plus the boundary. */ +export type InitialHydrationScriptTags = { + before: Array + boundary: RouterManagedTag +} + +function escapeAttribute(value: string) { + return value.replace(/[&"'<>]/g, (char) => `&#${char.charCodeAt(0)};`) +} + +function createInitialTags( + sources: ReadonlyArray, + nonce: string | undefined, +): InitialHydrationScriptTags { + const before: Array = [] + for (const source of sources) { + if (!source) { + continue + } + const previous = before[before.length - 1] + if ( + previous?.children && + previous.children.length + SOURCE_SEPARATOR.length + source.length <= + MAX_INITIAL_SOURCE_CODE_UNITS + ) { + previous.children += SOURCE_SEPARATOR + source + } else { + before.push({ + tag: 'script', + attrs: { nonce, [STREAM_PART_ATTRIBUTE]: '' }, + children: source, + }) + } + } + // Cleanup runs before route and asset scripts. If hydration code fails, its + // transport tags can remain because that page cannot hydrate successfully. + const lastHydrationTag = before[before.length - 1] + if (lastHydrationTag) { + const lastSource = lastHydrationTag.children! + if ( + lastSource.length + INITIAL_CLEANUP_SUFFIX.length <= + MAX_INITIAL_SOURCE_CODE_UNITS + ) { + lastHydrationTag.children = lastSource + INITIAL_CLEANUP_SUFFIX + } else { + // Do not concatenate onto a large source. A renderer could flatten the + // result and temporarily retain a second copy of the hydration payload. + before.push({ + tag: 'script', + attrs: { nonce, [STREAM_PART_ATTRIBUTE]: '' }, + children: INITIAL_CLEANUP_SOURCE, + }) + } + } + return { + before, + boundary: { + tag: 'script', + attrs: { nonce }, + children: HYDRATION_SCRIPT_BOUNDARY_SOURCE, + } satisfies RouterManagedTag, + } +} + +type HydrationScripts = { + pushSerializedSource: ( + data: string, + initial: boolean, + wrap: boolean, + ) => boolean + pushSource: (nextSource: string) => boolean + fail: (reason: unknown) => void + finish: () => void + takeInitialHydrationScriptTags: () => InitialHydrationScriptTags | undefined + disableHydration: () => void + isInitialTaken: () => boolean + skipInitialTake: () => void + liftBarrier: () => void + claimOutput: () => HydrationScriptOutput + reserveFastPath: (output?: HydrationScriptOutput) => boolean + startSerializationTimeout: (timeoutMs: number) => void + cleanup: () => void +} + +class HydrationScriptsOwner implements HydrationScriptOutput { + private queuedSources: Array = [] + private queuedSourceHead = 0 + private initialTaken = false + private barrierLifted = false + private producerDone = false + private consumer: ConsumerOwnership + private listener: (() => void) | undefined + + private active: Array | undefined + private retainedSources = 0 + private regularCodeUnits = 0 + private hasOversizedSource = false + + private segmentIndex = 0 + private closingSegmentIndex = 0 + private source = '' + private sourceOffset = 0 + private outputCapacity = MIN_OUTPUT_BYTES + + private outputState: HydrationScriptOutputState = + HydrationScriptOutputState.Waiting + private outputError: unknown + private timeout: ReturnType | undefined + private opening: string | undefined + + constructor( + private readonly nonce: string | undefined, + initialSources?: ReadonlyArray, + ) { + // ServerSsr exposes this method as a bare callback, so keep this single + // method bound while all other owner operations live on the prototype. + this.takeInitialHydrationScriptTags = + this.takeInitialHydrationScriptTags.bind(this) + + const seedSources = initialSources ?? DEFAULT_INITIAL_SOURCES + for (const seedSource of seedSources) { + if (!this.account(seedSource)) { + break + } + this.queuedSources.push(seedSource) + } + } + + get state() { + return this.outputState + } + + get error() { + return this.outputError + } + + private notify() { + try { + this.listener?.() + } catch (listenerError) { + console.error('Hydration script output listener error:', listenerError) + } + } + + private refresh(notifyChange = true) { + const next = + this.outputState === HydrationScriptOutputState.Failed + ? HydrationScriptOutputState.Failed + : this.active + ? HydrationScriptOutputState.Active + : typeof this.consumer === 'object' && + this.initialTaken && + this.barrierLifted && + !this.queueIsEmpty() + ? HydrationScriptOutputState.Ready + : this.producerDone && this.initialTaken && this.queueIsEmpty() + ? HydrationScriptOutputState.Done + : HydrationScriptOutputState.Waiting + if (this.outputState !== next) { + this.outputState = next + if (notifyChange) { + this.notify() + } + } + } + + private clearTimeoutIfSet() { + if (this.timeout !== undefined) { + clearTimeout(this.timeout) + this.timeout = undefined + } + } + + private queueIsEmpty() { + return this.queuedSourceHead === this.queuedSources.length + } + + private clearQueue() { + this.queuedSources = [] + this.queuedSourceHead = 0 + } + + private dropBufferedOutput() { + this.clearQueue() + this.active = undefined + this.retainedSources = 0 + this.regularCodeUnits = 0 + this.hasOversizedSource = false + this.segmentIndex = 0 + this.closingSegmentIndex = 0 + this.source = '' + this.sourceOffset = 0 + this.outputCapacity = MIN_OUTPUT_BYTES + this.opening = undefined + } + + fail(reason: unknown) { + if ( + this.consumer === 'cleaned' || + this.outputState === HydrationScriptOutputState.Failed + ) { + return + } + this.outputError = reason + this.clearTimeoutIfSet() + this.dropBufferedOutput() + this.outputState = HydrationScriptOutputState.Failed + this.notify() + } + + private rejectBacklog(kind: 'source-part' | 'code-unit') { + this.fail(new Error(`SSR hydration backlog exceeded maximum ${kind} count`)) + return false + } + + private account(nextSource: string) { + if (this.retainedSources === MAX_BACKLOG_SOURCES) { + return this.rejectBacklog('source-part') + } + if (nextSource.length > MAX_BACKLOG_CODE_UNITS) { + if (this.hasOversizedSource) { + return this.rejectBacklog('code-unit') + } + this.hasOversizedSource = true + } else if ( + this.regularCodeUnits + nextSource.length > + MAX_BACKLOG_CODE_UNITS + ) { + return this.rejectBacklog('code-unit') + } else { + this.regularCodeUnits += nextSource.length + } + this.retainedSources++ + return true + } + + private releaseSource(part: string) { + this.retainedSources-- + if (part.length > MAX_BACKLOG_CODE_UNITS) { + this.hasOversizedSource = false + } else { + this.regularCodeUnits -= part.length + } + } + + private releaseAccounting(batch: ReadonlyArray) { + for (const part of batch) { + if (part !== undefined) { + this.releaseSource(part) + } + } + } + + liftBarrier() { + if (this.consumer !== 'cleaned' && !this.barrierLifted) { + this.barrierLifted = true + this.refresh() + } + } + + private producerCanWrite() { + return ( + this.consumer !== 'cleaned' && + this.outputState !== HydrationScriptOutputState.Failed && + !this.producerDone + ) + } + + pushSource(nextSource: string) { + if (!this.producerCanWrite()) { + return false + } + if (this.account(nextSource)) { + this.queuedSources.push(nextSource) + if (this.initialTaken) { + this.refresh() + } + } else { + return false + } + // A notification can synchronously fail or clean up this owner. + return this.producerCanWrite() + } + + private takeQueuedBatch(batchLength: number) { + if ( + this.queuedSourceHead === 0 && + batchLength === this.queuedSources.length + ) { + const batch = this.queuedSources + this.clearQueue() + return batch + } + const end = this.queuedSourceHead + batchLength + const batch = this.queuedSources.slice(this.queuedSourceHead, end) + for (let index = this.queuedSourceHead; index < end; index++) { + this.queuedSources[index] = undefined + } + this.queuedSourceHead = end + if (this.queueIsEmpty()) { + this.clearQueue() + } else if ( + this.queuedSourceHead >= 1024 && + this.queuedSourceHead >= this.queuedSources.length - this.queuedSourceHead + ) { + this.queuedSources = this.queuedSources.slice(this.queuedSourceHead) + this.queuedSourceHead = 0 + } + return batch + } + + private release(batch: Array) { + this.releaseAccounting(batch) + this.active = undefined + this.source = '' + this.sourceOffset = 0 + this.refresh(false) + } + + private advanceSource() { + const batch = this.active! + if (this.segmentIndex > 0 && this.segmentIndex < this.closingSegmentIndex) { + const partIndex = (this.segmentIndex - 1) >> 1 + if (this.segmentIndex % 2 === 1) { + const part = batch[partIndex] + if (part !== undefined) { + this.releaseSource(part) + batch[partIndex] = undefined + } + } + } + this.segmentIndex++ + // Segment 0 is the opening tag. Sources and separators alternate until + // the closing segment. The next advance releases the complete record. + if (this.segmentIndex < this.closingSegmentIndex) { + const partIndex = (this.segmentIndex - 1) >> 1 + this.source = + this.segmentIndex % 2 === 1 ? batch[partIndex]! : SOURCE_SEPARATOR + } else if (this.segmentIndex === this.closingSegmentIndex) { + this.source = DYNAMIC_CLOSE_SOURCE + } else { + this.release(batch) + } + this.sourceOffset = 0 + } + + private pullActive() { + const bytes = new Uint8Array(this.outputCapacity) + let offset = 0 + while (this.active) { + if (this.sourceOffset === this.source.length) { + this.advanceSource() + } else if (offset === bytes.length) { + break + } else { + const result = encodeIntoBoundedChunk( + this.source, + this.sourceOffset, + bytes, + offset, + ) + if (result.read === 0) { + break + } + this.sourceOffset += result.read + offset += result.written + } + } + if (offset === 0) { + throw new Error('SSR router script record produced no output') + } + if (offset === bytes.length) { + return bytes + } + // A subarray view pins the whole output buffer. Copy mostly-empty tail + // chunks (typically the final close-tag remnant) so the large buffer can + // be collected immediately. + return offset * 2 < bytes.length + ? bytes.slice(0, offset) + : bytes.subarray(0, offset) + } + + private pullReady() { + const scriptOpening = (this.opening ??= this.nonce + ? `` - serverSsr.injectHtml(html) - }, - dehydrate: async (opts?: { requestAssets?: ManifestRouteAssets }) => { - if (_dehydrated) { + hydrationScripts, + dehydrate: async (opts?: { + requestAssets?: ManifestRouteAssets + signal?: AbortSignal + }) => { + // Guard synchronously before the first await: a concurrent second call + // would double-serialize and corrupt the hydration payload. + if (dehydrationPhase !== 'idle') { if (process.env.NODE_ENV !== 'production') { - throw new Error('Invariant failed: router is already dehydrated!') + throw new Error( + dehydrationPhase === 'disabled' + ? 'Invariant failed: hydration is disabled for this request!' + : 'Invariant failed: router is already dehydrated!', + ) } invariant() } + opts?.signal?.throwIfAborted() + dehydrationPhase = 'started' let matchesToDehydrate = _getRenderedMatches(router.stores.matches.get()) const isShell = router.isShell() if (isShell) { @@ -515,210 +445,192 @@ export function attachRouterServerSsrUtils({ cacheKey, ) - manifestToDehydrate = { - ...(manifest.scriptFormat - ? { scriptFormat: manifest.scriptFormat } - : {}), - ...(preparedManifest.inlineCssHrefs - ? { inlineStyle: createInlineCssPlaceholderAsset() } - : {}), - routes: preparedManifest.routes, - } - - // Merge request-scoped assets into root route (without mutating cached manifest) - const requestAssets = opts?.requestAssets - if (hasRequestAssets(requestAssets)) { - const existingRoot = manifestToDehydrate.routes[rootRouteId] - manifestToDehydrate.routes = { - ...manifestToDehydrate.routes, - [rootRouteId]: mergeRequestAssetsIntoRootRoute( - existingRoot, - requestAssets, - ), - } - } + manifestToDehydrate = composeManifest( + manifest.scriptFormat, + preparedManifest.inlineCssHrefs + ? createInlineCssPlaceholderAsset() + : undefined, + preparedManifest.routes, + opts?.requestAssets, + ) } const dehydratedRouter: DehydratedRouter = { manifest: manifestToDehydrate, matches, } - const dehydratedData = await router.options.dehydrate?.() + const dehydrate = router.options.dehydrate + const dehydratedData = dehydrate + ? opts?.signal + ? await waitForReason(dehydrate.call(router.options), opts.signal) + : await dehydrate.call(router.options) + : undefined + opts?.signal?.throwIfAborted() if (cleanupStarted) { return } - if (dehydratedData) { + if (dehydratedData !== undefined) { dehydratedRouter.dehydratedData = dehydratedData } - _dehydrated = true - const trackPlugins = { didRun: false } - const serializationAdapters = router.options.serializationAdapters as - | Array - | undefined + const serializationAdapters = router.options.serializationAdapters const plugins = serializationAdapters - ? serializationAdapters - .map((t) => makeSsrSerovalPlugin(t, trackPlugins)) - .concat(defaultSerovalPlugins) - : defaultSerovalPlugins + ? [ + ...serializationAdapters.map((adapter) => + makeSsrSerovalPlugin(adapter, trackPlugins), + ), + ...ssrSerovalPlugins, + ] + : ssrSerovalPlugins let serializationCompleteSignaled = false - const signalSerializationComplete = () => { - if (serializationCompleteSignaled || cleanupStarted) return + let initialSerialized = false + const completeScriptSerialization = ( + result: boolean | { error: unknown }, + ) => { + if (serializationCompleteSignaled || cleanupStarted) { + return + } serializationCompleteSignaled = true - _serializationFinished = true - - const listeners = serializationFinishedListeners.slice() - serializationFinishedListeners.length = 0 - - for (const l of listeners) { - try { - l() - } catch (err) { - console.error('Serialization listener error:', err) - } + const dispose = disposeSerialization + disposeSerialization = undefined + if (result === true) { + settled = true + hydrationScripts.finish() + } else if (result) { + hydrationScripts.fail(result.error) + } + if (dispose) { + // Seroval invokes completion callbacks before it marks its stream as + // inactive. Clear ownership before notifying the hydration consumer, + // which can synchronously clean up this request, then dispose later. + queueMicrotask(() => disposeSerializationSafely(dispose)) } } - const finishScriptSerialization = () => { - if (serializationCompleteSignaled || cleanupStarted) return - scriptBuffer.enqueue(GLOBAL_TSR + '.e()') - // Must synchronously notify injected HTML listeners before signaling - // completion; otherwise the held tail could flush ahead of the - // end script. - scriptBuffer.flush() - signalSerializationComplete() - } - - crossSerializeStream(dehydratedRouter, { + let synchronousFailure: { error: unknown } | undefined + const dispose = crossSerializeStream(dehydratedRouter, { refs: new Map(), plugins, onSerialize: (data, initial) => { - let serialized = initial ? TSR_PREFIX + data : data - if (trackPlugins.didRun) { - serialized = P_PREFIX + serialized + P_SUFFIX + if (serializationCompleteSignaled || cleanupStarted) { + return + } + initialSerialized ||= initial + if ( + !hydrationScripts.pushSerializedSource( + data, + initial, + trackPlugins.didRun, + ) + ) { + // Rejected output stops the producer while deferred work may remain. + completeScriptSerialization(false) } - scriptBuffer.enqueue(serialized) }, onError: (err: unknown) => { - console.error('Serialization error:', err) - if (err && (err as any).stack) { - console.error((err as any).stack) + if (serializationCompleteSignaled || cleanupStarted) { + return } - finishScriptSerialization() + console.error('Serialization error:', err) + synchronousFailure = { error: err } + completeScriptSerialization({ error: err }) }, - scopeId: SCOPE_ID, + scopeId: SSR_SERIALIZATION_SCOPE_ID, onDone: () => { - finishScriptSerialization() + if (initialSerialized) { + completeScriptSerialization(true) + } }, }) - }, - isDehydrated() { - return _dehydrated - }, - isSerializationFinished() { - return _serializationFinished - }, - reserveStreamFastPath() { - if ( - !cleanupStarted && - _serializationFinished && - !streamFastPathReserved && - renderFinishedListeners.length === 0 && - !injectedHtmlBuffer && - !scriptBuffer.hasPending() - ) { - streamFastPathReserved = true - return true + // Seroval can call onDone synchronously before it returns dispose(). + if (cleanupStarted || serializationCompleteSignaled) { + disposeSerializationSafely(dispose) + } else { + disposeSerialization = dispose + } + if (synchronousFailure) { + throw synchronousFailure.error } - return false - }, - onInjectedHtml: (listener) => { - if (cleanupStarted) return () => {} - injectedHtmlListeners.push(listener) - return () => removeListener(injectedHtmlListeners, listener) }, onRenderFinished: (listener) => { - if (cleanupStarted || streamFastPathReserved) return - renderFinishedListeners.push(listener) - }, - onSerializationFinished: (listener) => { - if (cleanupStarted) return () => {} - if (_serializationFinished && !cleanupStarted) { + if (cleanupStarted) { + return + } + if (renderFinished) { try { listener() - } catch (err) { - console.error('Serialization listener error:', err) + } catch (error) { + console.error('Error in render finished listener:', error) } - return () => {} + return } - serializationFinishedListeners.push(listener) - return () => removeListener(serializationFinishedListeners, listener) + renderFinishedListeners.push(listener) }, onCleanup: (listener) => { - if (cleanupStarted) return + if (cleanupStarted) { + // Cleanup already happened (or is running). Invoke immediately so + // late registrants can still release their resources instead of + // silently retaining them (standard disposer convention). + try { + listener(settled) + } catch (error) { + console.error('Error in SSR cleanup listener:', error) + } + return + } cleanupListeners.push(listener) }, setRenderFinished: () => { - if (cleanupStarted) return - scriptBuffer.liftBarrier() - const listeners = renderFinishedListeners.slice() - renderFinishedListeners.length = 0 - for (const l of listeners) { - try { - l() - } catch (err) { - console.error('Error in render finished listener:', err) + if (cleanupStarted || renderFinished) { + return + } + renderFinished = true + hydrationScripts.liftBarrier() + notifyAndClearListeners( + renderFinishedListeners, + 'Error in render finished listener:', + undefined, + ) + }, + disableHydration: () => { + if (cleanupStarted || dehydrationPhase === 'disabled') { + return + } + if (dehydrationPhase !== 'idle') { + if (process.env.NODE_ENV !== 'production') { + throw new Error( + 'Invariant failed: cannot disable hydration after dehydrate()!', + ) } + + invariant() } - if (_serializationFinished) { - scriptBuffer.flush() - } - }, - takeBufferedScripts() { - const scripts = scriptBuffer.takeAll() - if (!scripts) return undefined - const serverBufferedScript: RouterManagedTag = { - tag: 'script', - attrs: { - nonce: router.options.ssr?.nonce, - className: '$tsr', - id: TSR_SCRIPT_BARRIER_ID, - }, - children: scripts, - } - return serverBufferedScript - }, - liftScriptBarrier() { - scriptBuffer.liftBarrier() - }, - takeBufferedHtml() { - if (!injectedHtmlBuffer) { - return undefined - } - const buffered = injectedHtmlBuffer - injectedHtmlBuffer = '' - return buffered + // The owner rejects later takes/claims; guard order matters so a + // throwing owner does not leave the phase half-set. + hydrationScripts.disableHydration() + dehydrationPhase = 'disabled' }, + takeInitialHydrationScriptTags: + hydrationScripts.takeInitialHydrationScriptTags, cleanup() { // Guard against multiple/reentrant cleanup calls. A listener could call // cleanup() again indirectly; snapshot + clear before invoking so each // listener runs exactly once and reentry is a no-op. - if (cleanupStarted) return - cleanupStarted = true - const listeners = cleanupListeners.slice() - cleanupListeners.length = 0 - for (const l of listeners) { - try { - l() - } catch (err) { - console.error('Error in SSR cleanup listener:', err) - } + if (cleanupStarted) { + return } + cleanupStarted = true + hydrationScripts.cleanup() + const dispose = disposeSerialization + disposeSerialization = undefined + disposeSerializationSafely(dispose) + notifyAndClearListeners( + cleanupListeners, + 'Error in SSR cleanup listener:', + settled, + ) renderFinishedListeners.length = 0 - injectedHtmlListeners.length = 0 - serializationFinishedListeners.length = 0 - injectedHtmlBuffer = '' - scriptBuffer.cleanup() + router.ssr = undefined router.serverSsr = undefined }, } @@ -762,7 +674,9 @@ export function getOrigin(request: Request) { // chromium treats search params differently than paths, i.e. "|" is not encoded in search params. export function getNormalizedURL(url: string | URL, base?: string | URL) { // ensure backslashes are encoded correctly in the URL - if (typeof url === 'string') url = url.replace('\\', '%5C') + if (typeof url === 'string') { + url = url.replace('\\', '%5C') + } const rawUrl = new URL(url, base) // URL parsing has already handled backslashes and ignored controls. A pathname diff --git a/packages/router-core/src/ssr/transformStreamWithRouter.ts b/packages/router-core/src/ssr/transformStreamWithRouter.ts index 03c6ecf2e1..d253034073 100644 --- a/packages/router-core/src/ssr/transformStreamWithRouter.ts +++ b/packages/router-core/src/ssr/transformStreamWithRouter.ts @@ -1,32 +1,53 @@ -import { ReadableStream } from 'node:stream/web' import { Readable } from 'node:stream' -import { TSR_SCRIPT_BARRIER_ID } from './constants' +import { + DOCUMENT_CLOSE_ANCHOR_INDEX, + DOCUMENT_CLOSE_BYTES, + SCRIPT_CLOSE_ANCHOR_INDEX, + SCRIPT_CLOSE_BYTES, + advanceByteMatcher, + encodeIntoBoundedChunk, + findExactBytes, + getExactBytesPrefixAtEnd, +} from './htmlBoundaryScanner' +import { + HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, + HYDRATION_SCRIPT_BOUNDARY_BYTES, + HydrationScriptOutputState, +} from './hydrationScripts' +import type { ReadableStream as NodeReadableStream } from 'node:stream/web' import type { AnyRouter } from '../router' +import type { ByteMatcherState } from './htmlBoundaryScanner' +import type { HydrationScriptOutput } from './hydrationScripts' export type TransformStreamWithRouterOptions = { - /** The request lifetime that owns this response stream. */ - signal?: AbortSignal /** Timeout for serialization to complete after app render finishes (default: 60000ms) */ timeoutMs?: number - /** Maximum lifetime of the stream transform (default: 120000ms). Safety net for cleanup. */ + /** Maximum lifetime of the stream transform. Defaults to twice timeoutMs. */ lifetimeMs?: number + /** Cancels the transform and releases SSR state when the request ends. */ + signal?: AbortSignal + /** + * Additional point after which the renderer guarantees that a router script + * can be inserted. This is an adapter contract, not a user streaming policy. + * The router boundary, canonical document close, and EOF are always safe. + */ + rendererSafePoint?: 'script-close' | 'record-end' /** * Called exactly once when the stream is torn down due to abort/error/ * cancel/timeout — NOT on natural successful completion. Use this to - * abort a hidden producer upstream of any PassThrough you passed in - * (e.g. React `renderToPipeableStream`'s `abort()`). + * abort a hidden producer upstream of any stream passed to this transform. * Errors thrown from this callback are swallowed. */ onAbort?: (reason?: unknown) => void } -export function transformReadableStreamWithRouter( - router: AnyRouter, - routerStream: ReadableStream, - opts?: TransformStreamWithRouterOptions, -) { - return transformStreamWithRouter(router, routerStream, opts) -} +type AppStreamValue = Uint8Array | string +/** Renderer output: UTF-8 bytes, or string records from a Node pipeable. */ +type AppStream = + | ReadableStream + | ReadableStream + | ReadableStream + | NodeReadableStream export function transformPipeableStreamWithRouter( router: AnyRouter, @@ -34,880 +55,913 @@ export function transformPipeableStreamWithRouter( opts?: TransformStreamWithRouterOptions, ) { return Readable.fromWeb( - transformStreamWithRouter(router, Readable.toWeb(routerStream), opts), + transformReadableStreamWithRouter( + router, + Readable.toWeb(routerStream) as AppStream, + opts, + ) as NodeReadableStream, ) } -// Minimum length of a valid closing tag:
= 4 characters -const MIN_CLOSING_TAG_LENGTH = 4 - -// Default timeout values (in milliseconds) -const DEFAULT_SERIALIZATION_TIMEOUT_MS = 60000 -const DEFAULT_LIFETIME_TIMEOUT_MS = DEFAULT_SERIALIZATION_TIMEOUT_MS * 2 -const MAX_LEFTOVER_CHARS = 2048 -const MAX_TAIL_CHARS = 64 * 1024 -const MAX_ROUTER_HTML_CHARS = 16 * 1024 * 1024 -const MAX_PENDING_WRITE_CHARS = 16 * 1024 * 1024 - -// Merge lifecycle: body bytes can stream, router HTML must precede tail, -// terminal states own close/error/cleanup exactly once. -const MergeState = { - ReadingBody: 0, - HoldingTail: 1, - AppDone: 2, - Draining: 3, - Done: 4, -} as const - -type MergeState = (typeof MergeState)[keyof typeof MergeState] - -// Module-level encoder (stateless, safe to reuse) -const textEncoder = new TextEncoder() - -const noop = () => {} -const resolvedPromise = Promise.resolve() - -// Returns -bodyEndIndex - 2 when is found; otherwise returns -// the position after the last valid closing tag, or -1 when none exists. -function findHtmlBoundary(str: string): number { - let lastClosingTagEnd = -1 - let searchFrom = str.length - MIN_CLOSING_TAG_LENGTH - - while (searchFrom >= 0) { - const openSlash = str.lastIndexOf('. Negative return encodes the - // body start index without allocating a result object. - if ( - (str.charCodeAt(openSlash + 2) | 32) === 98 && - (str.charCodeAt(openSlash + 3) | 32) === 111 && - (str.charCodeAt(openSlash + 4) | 32) === 100 && - (str.charCodeAt(openSlash + 5) | 32) === 121 && - str.charCodeAt(openSlash + 6) === 62 - ) { - return -openSlash - 2 - } - - if (lastClosingTagEnd === -1) { - let i = openSlash + 2 - const startCode = str.charCodeAt(i) - if ( - (startCode >= 97 && startCode <= 122) || - (startCode >= 65 && startCode <= 90) - ) { - i++ - while (i < str.length) { - const code = str.charCodeAt(i) - if ( - (code >= 97 && code <= 122) || // a-z - (code >= 65 && code <= 90) || // A-Z - (code >= 48 && code <= 57) || // 0-9 - code === 95 || // _ - code === 58 || // : - code === 46 || // . - code === 45 // - - ) { - i++ - } else { - break - } - } - - if (str.charCodeAt(i) === 62) { - lastClosingTagEnd = i + 1 - } - } - } - - searchFrom = openSlash - 1 - } - - return lastClosingTagEnd -} - -/** - * Releasing the lock can throw if a pending read is still settling or if the - * lock was already released. - */ -type ReaderOps = { - cancel: (reason?: unknown) => Promise - releaseLock: () => void -} - -function safeReleaseReader(reader: ReaderOps) { - try { - reader.releaseLock() - return true - } catch { - return false - } -} - -/** - * Cancel a reader without producing an unhandled rejection. `reader.cancel()` - * can reject (e.g. when the underlying source's cancel() throws), and - * downstream cancel() should still wait for upstream teardown when possible. - */ -function safeCancelReader(reader: ReaderOps, reason?: unknown): Promise { - let cancelPromise: Promise | undefined - try { - cancelPromise = reader.cancel(reason) - } catch { - // ignore - } - - if (!safeReleaseReader(reader) && cancelPromise) { - return cancelPromise.then(noop, noop).then(() => { - safeReleaseReader(reader) - }) - } - - return cancelPromise ? cancelPromise.then(noop, noop) : resolvedPromise -} - -function createReaderState(appStream: ReadableStream) { - const reader = appStream.getReader() - let released = false - - return { - reader, - cancel: (reason?: unknown) => { - if (released) return resolvedPromise - released = true - return safeCancelReader(reader, reason) - }, - release: () => { - if (released) return - released = true - safeReleaseReader(reader) - }, - } -} - -function createAbortNotifier(opts?: TransformStreamWithRouterOptions) { - let abortNotified = false - return (reason?: unknown) => { - if (abortNotified) return - abortNotified = true - try { - opts?.onAbort?.(reason) - } catch { - // swallow user errors - } - } -} - -function listenToAbort( - signal: AbortSignal | undefined, - onAbort: (reason?: unknown) => void, -) { - if (!signal) { - return - } - if (signal.aborted) { - onAbort(signal.reason) - return - } - const listener = () => onAbort(signal.reason) - signal.addEventListener('abort', listener, { once: true }) - return () => signal.removeEventListener('abort', listener) -} - -export function transformStreamWithRouter( +export async function transformHtmlStringWithRouter( router: AnyRouter, - appStream: ReadableStream, + html: string, opts?: TransformStreamWithRouterOptions, ) { const serverSsr = router.serverSsr if (!serverSsr) { throw new Error('Invariant failed: router.serverSsr is required') } - if (serverSsr.reserveStreamFastPath()) { - return makeFastPathStream(appStream, opts, serverSsr) + const hydrationScripts = serverSsr.hydrationScripts + if (hydrationScripts.reserveFastPath()) { + try { + opts?.signal?.throwIfAborted() + serverSsr.setRenderFinished() + return '' + html + } catch (error) { + try { + opts?.onAbort?.(error) + } catch { + // User cleanup must not block SSR cleanup. + } + throw error + } finally { + serverSsr.cleanup() + } } - return makeMainStream(serverSsr, appStream, opts) + // The merge path chunks string records itself. + const appStream = new ReadableStream({ + start(controller) { + controller.enqueue('') + controller.enqueue(html) + controller.close() + }, + }) + const output = transformReadableStreamWithRouter(router, appStream, opts) + return readUtf8Stream(output) } -// ===================================================================== -// Fast path: passthrough with cleanup + backpressure on app reads. -// ===================================================================== -function makeFastPathStream( - appStream: ReadableStream, - opts?: TransformStreamWithRouterOptions, - serverSsr?: NonNullable, -) { - let cleanedUp = false - let controller: ReadableStreamDefaultController | undefined - let state: MergeState = MergeState.ReadingBody - let lifetimeTimeoutHandle: ReturnType | undefined - let stopListeningToAbort: (() => void) | undefined - let stopListeningToInjectedHtml: (() => void) | undefined - const readerState = createReaderState(appStream) - const notifyAbort = createAbortNotifier(opts) - const isDone = () => state === MergeState.Done - let renderFinished = false +async function readUtf8Stream(stream: ReadableStream) { + const reader = stream.getReader() + const decoder = new TextDecoder() + let text = '' + try { + for (;;) { + const { done, value } = await reader.read() + if (done) { + break + } + text += decoder.decode(value, { stream: true }) + } + return text + decoder.decode() + } finally { + reader.releaseLock() + } +} - const finishSsrRendering = () => { - if (!serverSsr || renderFinished) return true - renderFinished = true +const DEFAULT_SERIALIZATION_TIMEOUT_MS = 60_000 +const MIN_APPLICATION_STRING_CHUNK_BYTES = 256 +const MAX_APPLICATION_STRING_CHUNK_BYTES = 64 * 1024 + +const ApplicationPhase = { + BeforeBoundary: 0, + Merge: 1, + HeldClose: 2, + PassThrough: 3, +} as const + +type ApplicationPhase = (typeof ApplicationPhase)[keyof typeof ApplicationPhase] +type Termination = 'complete' | 'cancel' | 'failure' +type AppStreamReader = ReadableStreamDefaultReader + +function releaseReader(reader: AppStreamReader) { + try { + reader.releaseLock() + } catch { + // A nonstandard reader may still reject lock release. + } +} + +function cancelReader(reader: AppStreamReader, reason?: unknown) { + const cancelled = reader.cancel(reason).catch(() => {}) + // Native readers close synchronously when cancel() starts. Release the lock + // before an arbitrary underlying cancel promise has a chance to park. + releaseReader(reader) + return cancelled +} + +function finalizeSsrStream( + kind: Termination, + reason: unknown, + controller: ReadableStreamDefaultController, + reader: AppStreamReader, + serverSsr: NonNullable, + onAbort?: (reason?: unknown) => void, +) { + try { + if (kind === 'complete') { + controller.close() + } else if (kind === 'failure') { + controller.error(reason) + } + } catch { + // The stream already reached a terminal state. + } + + const aborted = kind !== 'complete' + if (aborted) { try { - serverSsr.setRenderFinished() - return true - } catch (error) { - safeError(error) - cleanup(error) + onAbort?.(reason) + } catch { + // User cleanup must not block SSR cleanup. + } + } + + const readerDone = aborted + ? cancelReader(reader, reason) + : releaseReader(reader) + serverSsr.cleanup() + return readerDone +} + +function getLifetimeMs(opts?: TransformStreamWithRouterOptions) { + return ( + opts?.lifetimeMs ?? + (opts?.timeoutMs ?? DEFAULT_SERIALIZATION_TIMEOUT_MS) * 2 + ) +} + +// External serverSsr.cleanup() severs router ownership. The transform must +// release the renderer, timers, listeners, and buffers immediately instead of +// retaining them until the lifetime backstop fires. AbortError identifies this +// intentional cancellation to downstream consumers. +function createCleanupAbortError() { + const error = new Error('SSR stream transform aborted by router SSR cleanup') + error.name = 'AbortError' + return error +} + +function listenForAbort( + signal: AbortSignal | undefined, + onAbort: (reason: unknown) => void, +) { + if (!signal) { + return undefined + } + const listener = () => onAbort(signal.reason) + signal.addEventListener('abort', listener, { once: true }) + return () => signal.removeEventListener('abort', listener) +} + +/** + * Create a timer that does not keep the Node.js process alive when this + * last-resort stream backstop is the only remaining work. + * + * Node's global `setTimeout()` returns a `Timeout` object with `unref()`. + * Web-standard runtimes return a numeric timer ID instead. Cloudflare Workers + * retain that Web behavior for global timers even when `nodejs_compat` is + * enabled. Accessing an optional property on a numeric ID is safe, so timer + * creation can normalize the Node-only capability without allocating a + * wrapper object. The native handle is returned unchanged for `clearTimeout`. + */ +function setUnrefTimeout(callback: () => void, timeoutMs: number) { + const handle = setTimeout(callback, timeoutMs) + const portableHandle = handle as typeof handle & { unref?: () => void } + portableHandle.unref?.() + return handle +} + +/** + * Arm the shared teardown triggers of a transform stream: the lifetime + * backstop timer, the request-abort listener, and the external-cleanup + * listener. Returns a disarm function that `terminate()` calls exactly once; + * teardown ordering must stay identical between the fast and merge paths. + */ +function armStreamLifecycle( + serverSsr: NonNullable, + opts: TransformStreamWithRouterOptions | undefined, + isTerminal: () => boolean, + terminate: (kind: Termination, reason?: unknown) => unknown, +) { + const signal = opts?.signal + let lifetimeTimeoutHandle: ReturnType | undefined + let stopAbortListener: (() => void) | undefined + const disarm = () => { + stopAbortListener?.() + stopAbortListener = undefined + if (signal && serverSsr.hydrationScripts.requestSignal === signal) { + serverSsr.hydrationScripts.requestSignal = undefined + } + if (lifetimeTimeoutHandle !== undefined) { + clearTimeout(lifetimeTimeoutHandle) + lifetimeTimeoutHandle = undefined + } + } + + const lifetimeMs = getLifetimeMs(opts) + lifetimeTimeoutHandle = setUnrefTimeout(() => { + if (isTerminal()) { + return + } + const error = new Error('Stream lifetime exceeded') + console.warn( + `SSR stream transform exceeded maximum lifetime (${lifetimeMs}ms), forcing cleanup`, + ) + terminate('failure', error) + }, lifetimeMs) + stopAbortListener = listenForAbort(signal, (reason) => { + terminate('failure', reason) + }) + if (signal) { + serverSsr.hydrationScripts.requestSignal = signal + } + // External serverSsr.cleanup() must release the reader, renderer, timer, + // and buffers promptly — a parked pump only wakes through its own + // subscriptions, and a discarded response never pulls at all. + serverSsr.onCleanup(() => { + if (!isTerminal()) { + terminate('failure', createCleanupAbortError()) + } + }) + return disarm +} + +function cleanupFailedStreamCreation( + serverSsr: NonNullable, + onAbort: TransformStreamWithRouterOptions['onAbort'], + error: unknown, +) { + try { + onAbort?.(error) + } catch { + // User cleanup must not block SSR cleanup. + } + serverSsr.cleanup() +} + +function encodeStringSource(value: string, offset: number) { + const remaining = value.length - offset + const capacity = Math.min( + MAX_APPLICATION_STRING_CHUNK_BYTES, + Math.max( + MIN_APPLICATION_STRING_CHUNK_BYTES, + Math.min(value.length, remaining * 3), + ), + ) + const output = new Uint8Array(capacity) + const { read, written } = encodeIntoBoundedChunk(value, offset, output) + return { + bytes: written === output.length ? output : output.subarray(0, written), + read, + } +} + +export function transformReadableStreamWithRouter( + router: AnyRouter, + appStream: AppStream, + opts?: TransformStreamWithRouterOptions, +) { + const serverSsr = router.serverSsr + if (!serverSsr) { + throw new Error('Invariant failed: router.serverSsr is required') + } + const hydrationScripts = serverSsr.hydrationScripts + + let reader: AppStreamReader + try { + reader = appStream.getReader() as AppStreamReader + } catch (error) { + cleanupFailedStreamCreation(serverSsr, opts?.onAbort, error) + throw error + } + + try { + opts?.signal?.throwIfAborted() + if (hydrationScripts.reserveFastPath()) { + // Hydration already drained: pass application output through from the + // first byte. The merge stream handles this with the same pass-through + // it uses after hydration finishes mid-stream. + return makeMergeStream(serverSsr, reader, undefined, opts) + } + const hydrationOutput = hydrationScripts.claimOutput() + if (hydrationOutput.state === HydrationScriptOutputState.Failed) { + throw hydrationOutput.error + } + return makeMergeStream(serverSsr, reader, hydrationOutput, opts) + } catch (error) { + void cancelReader(reader, error) + cleanupFailedStreamCreation(serverSsr, opts?.onAbort, error) + throw error + } +} + +// The merge path searches only router- and renderer-owned ASCII delimiters. +// Application bytes otherwise leave through zero-copy subarray views. +// Without a hydration output the stream starts in pass-through. +function makeMergeStream( + serverSsr: NonNullable, + reader: AppStreamReader, + hydrationOutput: HydrationScriptOutput | undefined, + opts?: TransformStreamWithRouterOptions, +) { + const hydrationScripts = serverSsr.hydrationScripts + let controller!: ReadableStreamDefaultController + let terminal = false + let appDone = false + let applicationPhase: ApplicationPhase = hydrationOutput + ? ApplicationPhase.BeforeBoundary + : ApplicationPhase.PassThrough + let insertionBoundary = false + + let stopHydrationOutputListener: (() => void) | undefined + let appReadPending = false + let settledAppRead: ReadableStreamReadValueResult | undefined + + let appBytes: Uint8Array | undefined + let appOffset = 0 + let documentCloseIndex: number | undefined + let appString: string | undefined + let appStringOffset = 0 + + const useScriptCloseSafePoints = opts?.rendererSafePoint === 'script-close' + const useRecordEndSafePoints = opts?.rendererSafePoint === 'record-end' + + // Both matchers are created on first use; pass-through never needs them. + let barrierMatcher: ByteMatcherState | undefined + let safePointMatcher: ByteMatcherState | undefined + // Split document closes carry at most 13 bytes across chunks. This uses + // findExactBytes + getExactBytesPrefixAtEnd instead of advanceByteMatcher + // because `` repeats its first byte (`<` at 0 and 7), which + // violates the matcher's unique-first-byte resync precondition. + let closeCarry: Uint8Array | undefined + + let wakeResolve: (() => void) | undefined + // Assigned after the stream exists; `terminate` can run before that when an + // already-cleaned owner fires its cleanup listener synchronously. + let disarmLifecycle = (): void => {} + + function waitForWake() { + return new Promise((resolve) => { + wakeResolve = resolve + }) + } + + function wakePump() { + const resolve = wakeResolve + wakeResolve = undefined + resolve?.() + } + + // Returns true when a chunk was enqueued. Every process* function + // propagates this boolean so pump() emits at most one chunk per downstream + // pull — the backpressure contract of this transform. + function enqueueAppBytes(value: Uint8Array) { + if (value.length === 0) { return false } + controller.enqueue(value) + return true } - const cleanup = (reason?: unknown, cancelReader = true) => { - if (cleanedUp) return resolvedPromise - cleanedUp = true - - if (lifetimeTimeoutHandle !== undefined) { - clearTimeout(lifetimeTimeoutHandle) - lifetimeTimeoutHandle = undefined - } - stopListeningToAbort?.() - stopListeningToAbort = undefined - try { - stopListeningToInjectedHtml?.() - } catch { - // ignore - } - stopListeningToInjectedHtml = undefined - - if (cancelReader) { - // Notify the producer immediately. Reader cancellation may take time to - // settle, and upstream renderers must tolerate abort + cancel overlap. - notifyAbort(reason) - } - const readerDone = cancelReader - ? readerState.cancel(reason) - : (readerState.release(), resolvedPromise) - if (serverSsr) { - try { - serverSsr.cleanup() - } catch (error) { - console.error('Error in SSR cleanup:', error) - } - } - return readerDone - } - - const safeClose = () => { - if (isDone()) return - state = MergeState.Done - try { - controller?.close() - } catch { - // ignore + function finishAppChunk() { + appBytes = undefined + documentCloseIndex = undefined + if ( + appString === undefined && + useRecordEndSafePoints && + closeCarry === undefined + ) { + insertionBoundary = true } } - const safeError = (error: unknown) => { - if (isDone()) return - state = MergeState.Done - try { - controller?.error(error) - } catch { - // ignore + function emitAppRange( + end: number, + safePoint: boolean, + finishCurrentChunk = end === appBytes!.length, + ) { + const value = appBytes! + const output = + appOffset === 0 && end === value.length + ? value + : value.subarray(appOffset, end) + appOffset = end + if (safePoint) { + insertionBoundary = true + } + if (finishCurrentChunk) { + finishAppChunk() + } + return enqueueAppBytes(output) + } + + function loadNextAppStringChunk() { + const value = appString! + const encoded = encodeStringSource(value, appStringOffset) + appStringOffset += encoded.read + appBytes = encoded.bytes + appOffset = 0 + if (appStringOffset === value.length) { + appString = undefined } } - if (serverSsr) { - stopListeningToInjectedHtml = serverSsr.onInjectedHtml(() => { - const err = new Error('SSR router HTML injected during fast path') - safeError(err) - cleanup(err) - }) + function processUntilBarrier() { + const value = appBytes! + if (!hydrationScripts.isInitialTaken()) { + // The rendered boundary can only exist after the initial script take, + // so earlier renderer bytes pass through without scanning. This skips + // the barrier scan for the whole pre- document and prevents + // barrier-lookalike bytes in application content from lifting the + // barrier early. + return emitAppRange(value.length, false) + } + const matchEnd = advanceByteMatcher( + (barrierMatcher ??= { + pattern: HYDRATION_SCRIPT_BOUNDARY_BYTES, + anchorIndex: HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, + matched: 0, + }), + value, + appOffset, + ) + if (matchEnd === undefined) { + return emitAppRange(value.length, false) + } + + applicationPhase = ApplicationPhase.Merge + hydrationScripts.liftBarrier() + return emitAppRange(matchEnd, true) } - const lifetimeMs = opts?.lifetimeMs ?? DEFAULT_LIFETIME_TIMEOUT_MS - lifetimeTimeoutHandle = setTimeout(() => { - if (!cleanedUp && !isDone()) { - const err = new Error('Stream lifetime exceeded') - console.warn( - `SSR stream transform exceeded maximum lifetime (${lifetimeMs}ms), forcing cleanup`, - ) - safeError(err) - cleanup(err) + // Advance past a canonical close that ends `consumed` bytes into the current + // chunk and hold it until the transform completes. + function enterHeldClose(consumed: number, prefix: Uint8Array | undefined) { + appOffset = consumed + applicationPhase = ApplicationPhase.HeldClose + if (safePointMatcher) { + // The removed close breaks byte continuity with later renderer bytes. + safePointMatcher.matched = 0 } - }, lifetimeMs) - - const stream = new ReadableStream({ - start(c) { - controller = c - }, - async pull(c) { - if (cleanedUp || isDone()) return - try { - const { done, value } = await readerState.reader.read() - if (!done) { - if (!cleanedUp && !isDone()) { - c.enqueue(value) - } - return - } - - if (cleanedUp || isDone()) return - - if (!finishSsrRendering()) return - safeClose() - return cleanup(undefined, false) - } catch (error) { - if (cleanedUp) return - console.error('Error reading appStream:', error) - if (state < MergeState.AppDone) { - try { - serverSsr?.setRenderFinished() - } catch { - // ignore - } - } - safeError(error) - return cleanup(error) - } finally { - if (cleanedUp || isDone()) { - readerState.release() - } - } - }, - cancel(reason) { - state = MergeState.Done - return cleanup(reason) - }, - }) - - stopListeningToAbort = listenToAbort(opts?.signal, (reason) => { - safeError(reason) - cleanup(reason) - }) - - return stream -} - -// ===================================================================== -// Main path: scan + inject router HTML/scripts with full backpressure. -// -// ALL output (app chunks AND router-injected HTML/scripts) flows through a -// single pendingWrites queue and is only enqueued onto the downstream -// controller when desiredSize > 0. This prevents native-memory growth of -// queued Uint8Arrays under slow HTTP consumers. -// ===================================================================== -function makeMainStream( - serverSsr: NonNullable, - appStream: ReadableStream, - opts?: TransformStreamWithRouterOptions, -) { - let stopListeningToInjectedHtml: (() => void) | undefined - let stopListeningToSerializationFinished: (() => void) | undefined - let serializationTimeoutHandle: ReturnType | undefined - let lifetimeTimeoutHandle: ReturnType | undefined - let stopListeningToAbort: (() => void) | undefined - let cleanedUp = false - - let controller: ReadableStreamDefaultController | undefined - let closeWhenDrained = false - let state: MergeState = MergeState.ReadingBody - - const readerState = createReaderState(appStream) - const notifyAbort = createAbortNotifier(opts) - - // Single output queue: app chunks + router-injected HTML/scripts. - // Stored as STRINGS to avoid holding native-backed Uint8Arrays in our queue - // while waiting for downstream capacity. Encoding happens at enqueue time - // (drainPending) so the bytes live only inside the controller's internal - // queue, not in two places. - // - // Uses an index pointer instead of Array.prototype.shift() (which is O(n)) - // so many small router-injected script chunks stay O(1) per chunk. - const pendingWrites: Array = [] - let pendingWriteHead = 0 - let pendingWriteChars = 0 - - function clearPending() { - pendingWrites.length = 0 - pendingWriteHead = 0 - pendingWriteChars = 0 + insertionBoundary = true + if (appOffset === appBytes!.length) { + finishAppChunk() + } + return prefix ? enqueueAppBytes(prefix) : false } - // Backpressure: pull() resolves drainResolve to let the read loop advance. - let drainResolve: (() => void) | null = null - const waitForDrain = () => - new Promise((r) => { - drainResolve = r - }) - const signalDrain = () => { - if (drainResolve) { - const r = drainResolve - drainResolve = null - r() - } - } - - const isDone = () => state === MergeState.Done - - function drainPending() { - if (!controller || isDone()) return - while (pendingWriteHead < pendingWrites.length) { - const ds = controller.desiredSize - if (ds !== null && ds <= 0) return - const next = pendingWrites[pendingWriteHead]! - // Release reference for GC; compact when fully drained. - pendingWrites[pendingWriteHead] = '' - pendingWriteHead++ - pendingWriteChars -= next.length - try { - controller.enqueue(textEncoder.encode(next)) - } catch (error) { - safeError(error) - cleanup(error) - return - } - } - // Fully drained: reset array so it doesn't grow unbounded across SSR. - if (pendingWriteHead >= pendingWrites.length) { - pendingWrites.length = 0 - pendingWriteHead = 0 - } - // If we've flushed everything and tryFinish requested close, close now. - if (closeWhenDrained && pendingWriteHead >= pendingWrites.length) { - closeWhenDrained = false - safeClose() - cleanup(undefined, false) - } - } - - /** - * Enqueue a string chunk through the backpressure queue. Stored as a - * string and encoded only when the downstream actually accepts the chunk - * — keeps native-memory pressure inside the controller's queue (which - * honors desiredSize) rather than ours. - */ - function writeChunk(chunk: string) { - if (cleanedUp || isDone()) return - if (!chunk.length) return - if (pendingWriteChars + chunk.length > MAX_PENDING_WRITE_CHARS) { - const err = new Error('SSR stream pending output exceeded maximum buffer') - safeError(err) - cleanup(err) - return - } - pendingWrites.push(chunk) - pendingWriteChars += chunk.length - drainPending() - } - - function safeClose() { - if (isDone()) return - state = MergeState.Done - try { - controller?.close() - } catch { - // ignore - } - } - - function safeError(error: unknown) { - if (isDone()) return - state = MergeState.Done - try { - controller?.error(error) - } catch { - // ignore - } - } - - /** - * Cleanup with guards; must be idempotent. - */ - function cleanup(reason?: unknown, cancelReader = true) { - if (cleanedUp) return resolvedPromise - cleanedUp = true - - try { - stopListeningToInjectedHtml?.() - stopListeningToSerializationFinished?.() - } catch { - // ignore - } - stopListeningToInjectedHtml = undefined - stopListeningToSerializationFinished = undefined - stopListeningToAbort?.() - stopListeningToAbort = undefined - - if (serializationTimeoutHandle !== undefined) { - clearTimeout(serializationTimeoutHandle) - serializationTimeoutHandle = undefined - } - if (lifetimeTimeoutHandle !== undefined) { - clearTimeout(lifetimeTimeoutHandle) - lifetimeTimeoutHandle = undefined - } - - clearPendingRouterHtml() - leftover = '' - pendingTail = '' - clearPending() - - if (cancelReader) { - // Notify the producer immediately. Reader cancellation may take time to - // settle, and upstream renderers must tolerate abort + cancel overlap. - notifyAbort(reason) - } - const readerDone = cancelReader - ? readerState.cancel(reason) - : (readerState.release(), resolvedPromise) - signalDrain() - try { - serverSsr.cleanup() - } catch (error) { - console.error('Error in SSR cleanup:', error) - } - return readerDone - } - - const textDecoder = new TextDecoder() - - // Router-injected scripts/HTML waiting for the next safe body boundary. - // Keep chunks separate so flushing does not flatten a large rope string. - const pendingRouterHtml: Array = [] - let pendingRouterHtmlChars = 0 - - // between-chunk text buffer; keep bounded to avoid unbounded memory - let leftover = '' - - // captured bytes from onward; must stay behind router scripts. - let pendingTail = '' - - let streamBarrierLifted = false - let streamBarrierMarkerSeen = false - let serializationFinished = false - - function noteBarrierMarker(chunk: string) { - if (streamBarrierMarkerSeen) return - if (chunk.includes(TSR_SCRIPT_BARRIER_ID)) { - streamBarrierMarkerSeen = true - } - } - - function liftBarrierAfterBoundary() { - if (streamBarrierLifted) return - if (!streamBarrierMarkerSeen) return - streamBarrierLifted = true - serverSsr.liftScriptBarrier() - } - - const stream = new ReadableStream({ - start(c) { - controller = c - // If anything queued before start (shouldn't happen but be safe), drain. - drainPending() - }, - pull() { - // Consumer has capacity; flush queue then unblock read loop. - drainPending() - signalDrain() - }, - cancel(reason) { - state = MergeState.Done - return cleanup(reason) - }, - }) - - function drainRouterHtml() { - if (cleanedUp || isDone()) return - let html: string | undefined - try { - html = serverSsr.takeBufferedHtml() - } catch (error) { - safeError(error) - cleanup(error) - return - } - if (!html) return - if (state >= MergeState.Draining) { - // At this point final tail/close has already been queued. Emitting late - // router HTML would put scripts after or drop them silently. - const err = new Error( - 'SSR router HTML injected after stream finalization', - ) - safeError(err) - cleanup(err) - return - } - if (state === MergeState.HoldingTail) { - flushPendingRouterHtml() - writeChunk(html) - } else { - if (pendingRouterHtmlChars + html.length > MAX_ROUTER_HTML_CHARS) { - const err = new Error('SSR router HTML exceeded maximum buffer') - safeError(err) - cleanup(err) - return - } - pendingRouterHtml.push(html) - pendingRouterHtmlChars += html.length - } - } - - function flushPendingRouterHtml() { - if (!pendingRouterHtml.length) return - for (const html of pendingRouterHtml) { - writeChunk(html) - } - clearPendingRouterHtml() - } - - function clearPendingRouterHtml() { - pendingRouterHtml.length = 0 - pendingRouterHtmlChars = 0 - } - - function appendTail(chunk: string) { - pendingTail += chunk - if (pendingTail.length > MAX_TAIL_CHARS) { - throw new Error('SSR stream tail exceeded maximum buffer') - } - } - - function waitForBackpressure() { - return !!( - controller && - controller.desiredSize !== null && - controller.desiredSize <= 0 + function holdDocumentClose(matchStart: number) { + const value = appBytes! + return enterHeldClose( + matchStart + DOCUMENT_CLOSE_BYTES.length, + matchStart === appOffset + ? undefined + : value.subarray(appOffset, matchStart), ) } - function startSerializationTimeout() { - if (cleanedUp || isDone()) return - if (serializationTimeoutHandle !== undefined) return - const timeoutMs = opts?.timeoutMs ?? DEFAULT_SERIALIZATION_TIMEOUT_MS - serializationTimeoutHandle = setTimeout(() => { - if (!cleanedUp && !isDone()) { - const err = new Error('Serialization timeout after app render finished') - console.error('Serialization timeout after app render finished') - safeError(err) - cleanup(err) - } - }, timeoutMs) - } - - /** - * Finish only when app done and serialization complete. Queues final - * output and requests close-when-drained so we don't close ahead of - * pending writes still waiting on downstream capacity. - */ - function tryFinish() { - if (state !== MergeState.AppDone || !serializationFinished) return - if (cleanedUp || isDone()) return - - if (serializationTimeoutHandle !== undefined) { - clearTimeout(serializationTimeoutHandle) - serializationTimeoutHandle = undefined + function processUntilSafePoint(endIndex: number) { + const value = appBytes! + const matchEnd = findSafePointEnd(value, appOffset, endIndex) + if (matchEnd === undefined) { + return false } - drainRouterHtml() - if (cleanedUp || isDone()) return - - // Flush any remaining bytes in the TextDecoder - const decoderRemainder = textDecoder.decode() - - if (leftover) writeChunk(leftover) - if (cleanedUp || isDone()) return - if (decoderRemainder) writeChunk(decoderRemainder) - if (cleanedUp || isDone()) return - flushPendingRouterHtml() - if (cleanedUp || isDone()) return - if (pendingTail) writeChunk(pendingTail) - if (cleanedUp || isDone()) return - - leftover = '' - pendingTail = '' - - state = MergeState.Draining - closeWhenDrained = true - // Try immediately; if queue not drained yet, pull() will retry. - drainPending() + return emitAppRange(matchEnd, true) } - function finishAppRendering() { - if (state >= MergeState.AppDone) return - state = MergeState.AppDone - try { - serverSsr.setRenderFinished() - } catch (error) { - safeError(error) - cleanup(error) + function findSafePointEnd( + value: Uint8Array, + startIndex: number, + endIndex: number, + ) { + // Merge-only: pass-through never scans for safe points. + const hydrationState = hydrationOutput!.state + if ( + endIndex === startIndex || + hydrationState === HydrationScriptOutputState.Done + ) { + return undefined + } + + const scanValue = + endIndex === value.length ? value : value.subarray(0, endIndex) + const matcher = (safePointMatcher ??= { + pattern: SCRIPT_CLOSE_BYTES, + anchorIndex: SCRIPT_CLOSE_ANCHOR_INDEX, + matched: 0, + }) + // Active drains before app bytes, Done is excluded above, and Failed + // terminates through the subscriber; only Ready and Waiting reach here. + const waiting = hydrationState === HydrationScriptOutputState.Waiting + const matchEnd = advanceByteMatcher(matcher, scanValue, startIndex, waiting) + if (matchEnd === undefined) { + return undefined + } + if (waiting) { + // Bytes after the last match are processed again on the next pull. + matcher.matched = 0 + } + return matchEnd + } + + function processCloseCarry() { + const value = appBytes! + const carry = closeCarry! + const headLength = Math.min( + value.length - appOffset, + DOCUMENT_CLOSE_BYTES.length, + ) + const combined = new Uint8Array(carry.length + headLength) + combined.set(carry) + combined.set( + value.subarray(appOffset, appOffset + headLength), + carry.length, + ) + + const matchStart = findExactBytes( + combined, + DOCUMENT_CLOSE_BYTES, + 0, + DOCUMENT_CLOSE_ANCHOR_INDEX, + ) + const partial = + matchStart < 0 + ? getExactBytesPrefixAtEnd(combined, DOCUMENT_CLOSE_BYTES) + : undefined + const safeEnd = matchStart >= 0 ? matchStart : (partial ?? combined.length) + + if (useScriptCloseSafePoints) { + const safePointEnd = findSafePointEnd(combined, 0, safeEnd) + if (safePointEnd !== undefined) { + appOffset += safePointEnd - carry.length + closeCarry = undefined + insertionBoundary = true + if (appOffset === value.length) { + finishAppChunk() + } + return enqueueAppBytes(combined.subarray(0, safePointEnd)) + } + } + + if (matchStart >= 0) { + closeCarry = undefined + return enterHeldClose( + appOffset + matchStart + DOCUMENT_CLOSE_BYTES.length - carry.length, + matchStart === 0 ? undefined : combined.subarray(0, matchStart), + ) + } + + closeCarry = partial === undefined ? undefined : combined.slice(partial) + appOffset += headLength + return enqueueAppBytes( + safeEnd === combined.length ? combined : combined.subarray(0, safeEnd), + ) + } + + function processUntilDocumentClose() { + const value = appBytes! + + if (closeCarry) { + if (processCloseCarry()) { + return true + } + if (applicationPhase === ApplicationPhase.HeldClose) { + return false + } + if (appOffset >= value.length) { + finishAppChunk() + return false + } + } + + // Safe points only advance within this chunk, so keep its close or miss. + const matchStart = (documentCloseIndex ??= findExactBytes( + value, + DOCUMENT_CLOSE_BYTES, + appOffset, + DOCUMENT_CLOSE_ANCHOR_INDEX, + )) + if (matchStart >= 0) { + if (useScriptCloseSafePoints && processUntilSafePoint(matchStart)) { + return true + } + return holdDocumentClose(matchStart) + } + + const partial = getExactBytesPrefixAtEnd( + value, + DOCUMENT_CLOSE_BYTES, + appOffset, + ) + const safeEnd = partial ?? value.length + if (useScriptCloseSafePoints && processUntilSafePoint(safeEnd)) { + return true + } + closeCarry = partial === undefined ? undefined : value.slice(partial) + return emitAppRange(safeEnd, false, true) + } + + function processAppChunk() { + if (appOffset >= appBytes!.length) { + finishAppChunk() + return false + } + insertionBoundary = false + if (applicationPhase === ApplicationPhase.BeforeBoundary) { + return processUntilBarrier() + } + if (applicationPhase === ApplicationPhase.Merge) { + return processUntilDocumentClose() + } + const value = appBytes! + if (useScriptCloseSafePoints && processUntilSafePoint(value.length)) { + return true + } + + return emitAppRange(value.length, false) + } + + function terminate(kind: Termination, reason?: unknown) { + if (terminal) { return } - drainRouterHtml() - if (cleanedUp || isDone()) return - serializationFinished = - serializationFinished || serverSsr.isSerializationFinished() - if (serializationFinished) { - tryFinish() - } else { - startSerializationTimeout() - } + terminal = true + + stopHydrationOutputListener?.() + stopHydrationOutputListener = undefined + disarmLifecycle() + + settledAppRead = undefined + appBytes = undefined + documentCloseIndex = undefined + appString = undefined + closeCarry = undefined + wakePump() + + return finalizeSsrStream( + kind, + reason, + controller, + reader, + serverSsr, + opts?.onAbort, + ) } - // Safety net: cleanup even if consumer never reads - const timeoutMs = opts?.timeoutMs ?? DEFAULT_SERIALIZATION_TIMEOUT_MS - const lifetimeMs = opts?.lifetimeMs ?? timeoutMs * 2 - lifetimeTimeoutHandle = setTimeout(() => { - if (!cleanedUp && !isDone()) { - const err = new Error('Stream lifetime exceeded') - console.warn( - `SSR stream transform exceeded maximum lifetime (${lifetimeMs}ms), forcing cleanup`, - ) - safeError(err) - cleanup(err) + function startAppRead() { + if (appReadPending || settledAppRead || terminal) { + return } - }, lifetimeMs) - - stopListeningToInjectedHtml = serverSsr.onInjectedHtml(() => { - drainRouterHtml() - }) - - stopListeningToSerializationFinished = serverSsr.onSerializationFinished( - () => { - serializationFinished = true - drainRouterHtml() - tryFinish() - }, - ) - - // Subscriptions are installed before snapshots, so missed events are - // recovered by these synchronous drains/rechecks. - drainRouterHtml() - if (cleanedUp || isDone()) return stream - serializationFinished = - serializationFinished || serverSsr.isSerializationFinished() - if (serializationFinished) { - drainRouterHtml() - if (cleanedUp || isDone()) return stream - } - - stopListeningToAbort = listenToAbort(opts?.signal, (reason) => { - safeError(reason) - cleanup(reason) - }) - if (cleanedUp || isDone()) - return stream - - // Transform the appStream - ;(async () => { - try { - while (true) { - // Backpressure: pause upstream reads while downstream is full. - if (waitForBackpressure()) { - await waitForDrain() - if (cleanedUp || isDone()) return - } - - const { done, value } = await readerState.reader.read() - if (done) break - - if (cleanedUp || isDone()) return - - const text = - typeof value === 'string' - ? value - : textDecoder.decode(value as ArrayBufferView, { stream: true }) - - const chunkString = leftover ? leftover + text : text - - // If we already saw , everything else is tail. Keep it bounded - // and held until router scripts are ready so injection remains before . - if (state >= MergeState.HoldingTail) { - appendTail(chunkString) - leftover = '' - continue - } - - const boundary = findHtmlBoundary(chunkString) - if (boundary < -1) { - const bodyEndIndex = -boundary - 2 - state = MergeState.HoldingTail - appendTail(chunkString.slice(bodyEndIndex)) - const bodyChunk = chunkString.slice(0, bodyEndIndex) - writeChunk(bodyChunk) - if (cleanedUp || isDone()) return - noteBarrierMarker(bodyChunk) - liftBarrierAfterBoundary() - if (cleanedUp || isDone()) return - flushPendingRouterHtml() - leftover = '' - continue - } - - const lastClosingTagEnd = boundary - - if (lastClosingTagEnd > 0) { - const safeChunk = chunkString.slice(0, lastClosingTagEnd) - writeChunk(safeChunk) - if (cleanedUp || isDone()) return - noteBarrierMarker(safeChunk) - liftBarrierAfterBoundary() - if (cleanedUp || isDone()) return - flushPendingRouterHtml() - - leftover = chunkString.slice(lastClosingTagEnd) - if (leftover.length > MAX_LEFTOVER_CHARS) { - // Ensure bounded memory even if a consumer streams long text sequences - // without any closing tags. This may reduce injection granularity but is correct. - noteBarrierMarker(leftover) - const flushed = leftover.slice( - 0, - leftover.length - MAX_LEFTOVER_CHARS, - ) - writeChunk(flushed) - leftover = leftover.slice(-MAX_LEFTOVER_CHARS) - } - } else { - // No closing tag found; keep small tail to handle split closing tags, - // but stream older bytes to prevent unbounded buffering. - const combined = chunkString - if (combined.length > MAX_LEFTOVER_CHARS) { - noteBarrierMarker(combined) - const flushUpto = combined.length - MAX_LEFTOVER_CHARS - const flushed = combined.slice(0, flushUpto) - writeChunk(flushed) - leftover = combined.slice(flushUpto) + appReadPending = true + void reader.read().then( + (result) => { + appReadPending = false + if (!terminal) { + if (result.done) { + acceptAppRead(result) } else { - leftover = combined + settledAppRead = result + } + wakePump() + } + }, + (error) => { + appReadPending = false + if (!terminal) { + handlePumpError(error) + } + }, + ) + } + + function acceptAppRead(result: ReadableStreamReadResult) { + if (result.done) { + appDone = true + insertionBoundary = closeCarry === undefined + // The serialization deadline is a transport concern of this merge + // path; the lifecycle signal below stays a plain notification. + hydrationScripts.startSerializationTimeout( + opts?.timeoutMs ?? DEFAULT_SERIALIZATION_TIMEOUT_MS, + ) + serverSsr.setRenderFinished() + return + } + const value = result.value + if (typeof value === 'string') { + if (value.length === 0) { + return + } + appString = value + appStringOffset = 0 + insertionBoundary = false + loadNextAppStringChunk() + return + } + if (value.byteLength === 0) { + return + } + appBytes = value + appOffset = 0 + insertionBoundary = false + } + + async function loadNextAppChunk() { + if (appString !== undefined) { + loadNextAppStringChunk() + return + } + if (settledAppRead) { + const settled = settledAppRead + settledAppRead = undefined + acceptAppRead(settled) + return + } + + const scriptsCanInterruptRead = + applicationPhase !== ApplicationPhase.BeforeBoundary && + insertionBoundary && + hydrationOutput!.state !== HydrationScriptOutputState.Done + if (!scriptsCanInterruptRead && !appReadPending) { + const result = await reader.read() + if (terminal) { + return + } + acceptAppRead(result) + return + } + + const wake = waitForWake() + startAppRead() + await wake + } + + // Pass-through forwards application records unchanged and only encodes + // string records; it skips the merge bookkeeping entirely. + async function pumpPassThrough() { + try { + for (;;) { + if (appBytes) { + const remainder = + appOffset === 0 ? appBytes : appBytes.subarray(appOffset) + appBytes = undefined + if (enqueueAppBytes(remainder)) { + return + } + continue + } + if (appString !== undefined) { + loadNextAppStringChunk() + continue + } + if (appDone) { + terminate('complete') + return + } + if (appReadPending) { + // A merge-phase prefetch is still in flight; it wakes the pump. + await waitForWake() + continue + } + let result: ReadableStreamReadResult | undefined = + settledAppRead + if (result) { + settledAppRead = undefined + } else { + result = await reader.read() + if (terminal) { + return } } - } - - if (cleanedUp || isDone()) return - - finishAppRendering() - } catch (error) { - if (cleanedUp) return - console.error('Error reading appStream:', error) - if (state < MergeState.AppDone) { - try { - serverSsr.setRenderFinished() - } catch { - // ignore + if (result.done || typeof result.value === 'string') { + acceptAppRead(result) + continue + } + if (result.value.byteLength > 0) { + controller.enqueue(result.value) + return } } - safeError(error) - cleanup(error) - } finally { - readerState.release() + } catch (error) { + handlePumpError(error) } - })().catch((error) => { - if (cleanedUp) return - console.error('Error in stream transform:', error) - safeError(error) - cleanup(error) + } + + async function pump() { + const output = hydrationOutput! + while (!terminal) { + const hydrationState = output.state + if (hydrationState === HydrationScriptOutputState.Active) { + controller.enqueue(output.pullChunk()) + return + } + if ( + applicationPhase !== ApplicationPhase.BeforeBoundary && + insertionBoundary && + hydrationState === HydrationScriptOutputState.Ready + ) { + if (!appDone && !appBytes && appString === undefined) { + startAppRead() + } + controller.enqueue(output.pullChunk()) + return + } + if ( + applicationPhase === ApplicationPhase.Merge && + hydrationState === HydrationScriptOutputState.Done && + closeCarry === undefined && + hydrationScripts.reserveFastPath(output) + ) { + applicationPhase = ApplicationPhase.PassThrough + stopHydrationOutputListener?.() + stopHydrationOutputListener = undefined + return pumpPassThrough() + } + if (appBytes) { + if (processAppChunk()) { + return + } + continue + } + + if (appDone) { + if (applicationPhase === ApplicationPhase.BeforeBoundary) { + // No boundary was rendered. The document is already + // delivered, so emit the hydration sources after it instead of + // failing the response. + hydrationScripts.skipInitialTake() + applicationPhase = ApplicationPhase.Merge + insertionBoundary = true + continue + } + if (closeCarry) { + // A close prefix that never completed is ordinary content, exactly + // like a document without a canonical close. + const carry = closeCarry + closeCarry = undefined + insertionBoundary = true + if (enqueueAppBytes(carry)) { + return + } + continue + } + if (hydrationState === HydrationScriptOutputState.Waiting) { + await waitForWake() + continue + } + if (applicationPhase === ApplicationPhase.HeldClose) { + controller.enqueue(DOCUMENT_CLOSE_BYTES.slice()) + terminate('complete') + return + } + terminate('complete') + return + } + + await loadNextAppChunk() + } + } + + function handlePumpError(error: unknown) { + if (terminal) { + return + } + console.error('Error processing appStream:', error) + terminate('failure', error) + } + + const stream = new ReadableStream({ + start(c) { + controller = c + }, + pull() { + // One async frame per pull: pass-through must stay as cheap as a plain + // read-and-forward loop. + return applicationPhase === ApplicationPhase.PassThrough + ? pumpPassThrough() + : pump().catch(handlePumpError) + }, + cancel(reason) { + return terminate('cancel', reason) + }, }) + if (hydrationOutput) { + stopHydrationOutputListener = hydrationOutput.subscribe(() => { + if (hydrationOutput.state === HydrationScriptOutputState.Failed) { + terminate('failure', hydrationOutput.error) + return + } + wakePump() + }) + } + disarmLifecycle = armStreamLifecycle( + serverSsr, + opts, + () => terminal, + terminate, + ) + return stream } diff --git a/packages/router-core/tests/RawStream.test.ts b/packages/router-core/tests/RawStream.test.ts index 106f0a7c21..aa3a2aca48 100644 --- a/packages/router-core/tests/RawStream.test.ts +++ b/packages/router-core/tests/RawStream.test.ts @@ -1,10 +1,100 @@ -import { describe, expect, it } from 'vitest' -import { toCrossJSONAsync, fromCrossJSON } from 'seroval' +import { describe, expect, it, vi } from 'vitest' +import { + createStream, + crossSerializeStream, + toCrossJSONAsync, + toCrossJSONStream, + fromCrossJSON, +} from 'seroval' +import type { SerovalNode } from 'seroval' +import { RawStream } from '../src/ssr/serializer/RawStream' +import { + RawStreamJSONDeserializePlugin, + RawStreamJSONPlugin, + createRawStreamJSONPlugin, +} from '../src/ssr/serializer/RawStreamJSONPlugin' import { - RawStream, - createRawStreamRPCPlugin, createRawStreamDeserializePlugin, -} from '../src/ssr/serializer/RawStream' + createRawStreamRPCPlugin, +} from '../src/ssr/serializer/RawStreamRPCPlugin' +import { RawStreamSSRPlugin } from '../src/ssr/serializer/RawStreamSSRPlugin' +import { + defaultSerovalDeserializerPlugins, + defaultSerovalPlugins, +} from '../src/ssr/serializer/seroval-plugins' + +type EncodedStream = ReturnType> +type EncodedStreamListener = Parameters[0] +type RawStreamFactory = (stream: EncodedStream) => ReadableStream + +function getRawStreamFactory( + pluginIndex: number, + emitted: boolean, +): RawStreamFactory { + if (emitted) { + const plugin = RawStreamSSRPlugin.extends![pluginIndex]! + const source = (plugin.serialize as () => string)() + return new Function(`return ${source}`)() as RawStreamFactory + } + + return (stream) => { + const textNode = {} as SerovalNode + const streamNode = {} as SerovalNode + return (RawStreamJSONDeserializePlugin.deserialize as any)( + { text: textNode, stream: streamNode }, + { + deserialize(node: SerovalNode) { + return node === textNode ? pluginIndex === 1 : stream + }, + }, + ) + } +} + +function createTrackedEncodedStream() { + const listeners = new Set() + let unsubscribeCalls = 0 + const stream: EncodedStream = { + __SEROVAL_STREAM__: true, + on(listener) { + listeners.add(listener) + let subscribed = true + return () => { + if (subscribed) { + subscribed = false + unsubscribeCalls++ + listeners.delete(listener) + } + } + }, + next(value) { + for (const listener of listeners) { + listener.next(value) + } + }, + throw(value) { + for (const listener of listeners) { + listener.throw(value) + } + listeners.clear() + }, + return(value) { + for (const listener of listeners) { + listener.return(value) + } + listeners.clear() + }, + } + return { + stream, + get listenerCount() { + return listeners.size + }, + get unsubscribeCalls() { + return unsubscribeCalls + }, + } +} describe('RawStream', () => { describe('RawStream class', () => { @@ -45,7 +135,7 @@ describe('RawStream', () => { }) describe('createRawStreamRPCPlugin', () => { - it('should call onRawStream callback with stream id and stream', async () => { + it('should call onRawStream callback with stream id and stream', () => { const collectedStreams = new Map>() const plugin = createRawStreamRPCPlugin((id, stream) => { @@ -61,9 +151,10 @@ describe('RawStream', () => { const rawStream = new RawStream(testStream) - await toCrossJSONAsync(rawStream, { + toCrossJSONStream(rawStream, { refs: new Map(), plugins: [plugin], + onParse() {}, }) expect(collectedStreams.size).toBe(1) @@ -73,15 +164,19 @@ describe('RawStream', () => { expect(streamEntry![1]).toBe(testStream) }) - it('should serialize with tss/RawStream tag', async () => { + it('should serialize with tss/RawStream tag', () => { const plugin = createRawStreamRPCPlugin(() => {}) const testStream = new ReadableStream() const rawStream = new RawStream(testStream) - const serialized = await toCrossJSONAsync(rawStream, { + const serialized = new Array() + toCrossJSONStream(rawStream, { refs: new Map(), plugins: [plugin], + onParse(value) { + serialized.push(value) + }, }) // The serialized output should have the plugin tag and contain streamId @@ -90,7 +185,7 @@ describe('RawStream', () => { expect(jsonStr).toContain('streamId') }) - it('should collect multiple streams with unique ids', async () => { + it('should collect multiple streams with unique ids', () => { const collectedStreams = new Map>() const plugin = createRawStreamRPCPlugin((id, stream) => { @@ -105,9 +200,10 @@ describe('RawStream', () => { second: new RawStream(stream2), } - await toCrossJSONAsync(data, { + toCrossJSONStream(data, { refs: new Map(), plugins: [plugin], + onParse() {}, }) expect(collectedStreams.size).toBe(2) @@ -116,62 +212,190 @@ describe('RawStream', () => { }) }) - describe('createRawStreamDeserializePlugin', () => { - it('should reconstruct stream from getOrCreateStream function', () => { - const mockStream = new ReadableStream({ + describe('round-trip serialization', () => { + it('does not acquire the source reader when hint parsing fails', async () => { + const getReader = vi.fn() + const stream = { getReader } as unknown as ReadableStream + const failure = new Error('hint parse failed') + const parse = RawStreamJSONPlugin.parse.async! as any + + await expect( + parse(new RawStream(stream), { + parse: () => Promise.reject(failure), + }), + ).rejects.toBe(failure) + expect(getReader).not.toHaveBeenCalled() + }) + + it('does not acquire the source reader when request serialization is already aborted', async () => { + const getReader = vi.fn() + const stream = { getReader } as unknown as ReadableStream + const controller = new AbortController() + const reason = new Error('request aborted') + controller.abort(reason) + + await expect( + toCrossJSONAsync(new RawStream(stream), { + refs: new Map(), + plugins: [createRawStreamJSONPlugin(controller.signal)], + }), + ).rejects.toMatchObject({ cause: reason }) + expect(getReader).not.toHaveBeenCalled() + }) + + it('preserves malformed UTF-8 and BOM bytes in text chunks', async () => { + const cancel = vi.fn() + const stream = new ReadableStream({ start(controller) { - controller.enqueue(new Uint8Array([42])) + controller.enqueue(Uint8Array.of(0x41, 0xe2)) + controller.enqueue(Uint8Array.of(0x28)) + controller.enqueue(Uint8Array.of(0xef, 0xbb, 0xbf, 0x42)) + controller.close() + }, + cancel, + }) + + const serialized = await new Promise>((resolve, reject) => { + const sources = new Array() + crossSerializeStream(new RawStream(stream, { hint: 'text' }), { + refs: new Map(), + plugins: [RawStreamSSRPlugin], + scopeId: 'raw-stream-test', + onSerialize(source) { + sources.push(source) + }, + onError: reject, + onDone() { + expect(stream.locked).toBe(false) + resolve(sources) + }, + }) + }) + + const output = serialized.join(';') + expect(output).toContain('QeI=') + expect(output).toContain('\ufeffB') + expect(cancel).not.toHaveBeenCalled() + expect(stream.locked).toBe(false) + }) + + it('preserves a UTF-8 character split across text chunks', async () => { + // Each half is invalid UTF-8 by itself. Text mode must encode both as + // binary instead of retaining decoder state across chunk boundaries. + const expected = [Uint8Array.of(0xf0, 0x9f), Uint8Array.of(0x98, 0x80)] + const input = new ReadableStream({ + start(controller) { + for (const chunk of expected) { + controller.enqueue(chunk) + } controller.close() }, }) - const streams = new Map>() - streams.set(5, mockStream) + const serialized = await toCrossJSONAsync( + new RawStream(input, { hint: 'text' }), + { + refs: new Map(), + plugins: [RawStreamJSONPlugin], + }, + ) + const output = fromCrossJSON(serialized, { + refs: new Map(), + plugins: [RawStreamJSONDeserializePlugin], + }) as ReadableStream + const reader = output.getReader() - // getOrCreateStream function that returns from map - const getOrCreateStream = (id: number) => { - let stream = streams.get(id) - if (!stream) { - stream = new ReadableStream() - streams.set(id, stream) - } - return stream - } - - const plugin = createRawStreamDeserializePlugin(getOrCreateStream) - - // Simulate seroval calling deserialize with a node - const node = { streamId: 5 } - - // Access the deserialize function directly - const deserializedStream = (plugin as any).deserialize(node, {}) - - expect(deserializedStream).toBe(mockStream) + await expect(reader.read()).resolves.toEqual({ + done: false, + value: expected[0], + }) + await expect(reader.read()).resolves.toEqual({ + done: false, + value: expected[1], + }) + await expect(reader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) }) - it('should create stream if not found', () => { - const streams = new Map>() + it.each([ + ['default', 'binary', defaultSerovalDeserializerPlugins], + ['default', 'text', defaultSerovalDeserializerPlugins], + ['deserialize-only', 'binary', [RawStreamJSONDeserializePlugin]], + ['deserialize-only', 'text', [RawStreamJSONDeserializePlugin]], + ] as const)( + 'preserves every %s-plugin decoded %s-hinted chunk through async JSON', + async (_, hint, deserializePlugins) => { + const expected = [ + new Uint8Array(), + Uint8Array.of(0x41, 0x42), + Uint8Array.of(0x41, 0xe2), + Uint8Array.of(0xef, 0xbb, 0xbf, 0x42), + ] + const input = new ReadableStream({ + start(controller) { + for (const chunk of expected) { + controller.enqueue(chunk) + } + controller.close() + }, + }) - const getOrCreateStream = (id: number) => { - let stream = streams.get(id) - if (!stream) { - stream = new ReadableStream() - streams.set(id, stream) + const serialized = await toCrossJSONAsync( + new RawStream(input, { hint }), + { + refs: new Map(), + plugins: [RawStreamJSONPlugin], + }, + ) + const output = fromCrossJSON(serialized, { + refs: new Map(), + plugins: [...deserializePlugins], + }) as ReadableStream + const reader = output.getReader() + const actual: Array = [] + + while (true) { + const next = await reader.read() + if (next.done) { + break + } + actual.push(next.value) } - return stream - } - const plugin = createRawStreamDeserializePlugin(getOrCreateStream) + expect(actual.map((chunk) => Array.from(chunk))).toEqual( + expected.map((chunk) => Array.from(chunk)), + ) + }, + ) - const node = { streamId: 999 } + it('round-trips: client default plugins write, deserializer plugins read', async () => { + const input = new ReadableStream({ + start(controller) { + controller.enqueue(Uint8Array.of(1, 2, 3)) + controller.close() + }, + }) + const serialized = await toCrossJSONAsync( + { stream: new RawStream(input), error: new Error('boom') }, + { refs: new Map(), plugins: defaultSerovalPlugins }, + ) + const output = fromCrossJSON(serialized, { + refs: new Map(), + plugins: defaultSerovalDeserializerPlugins, + }) as { stream: ReadableStream; error: Error } - const result = (plugin as any).deserialize(node, {}) - expect(result).toBeInstanceOf(ReadableStream) - expect(streams.get(999)).toBe(result) + expect(output.error).toBeInstanceOf(Error) + expect(output.error.message).toBe('boom') + const reader = output.stream.getReader() + await expect(reader.read()).resolves.toEqual({ + done: false, + value: Uint8Array.of(1, 2, 3), + }) + await expect(reader.read()).resolves.toMatchObject({ done: true }) }) - }) - describe('round-trip serialization', () => { it('should serialize and deserialize RawStream correctly', async () => { // Collect streams during serialization const collectedStreams = new Map>() @@ -193,9 +417,13 @@ describe('RawStream', () => { // Serialize using RPC plugin const refs = new Map() - const serialized = await toCrossJSONAsync(data, { + let serialized: SerovalNode | undefined + toCrossJSONStream(data, { refs, plugins: [rpcPlugin], + onParse(value) { + serialized = value + }, }) // Verify we collected the stream @@ -216,7 +444,7 @@ describe('RawStream', () => { createRawStreamDeserializePlugin(getOrCreateStream) // Deserialize - const deserialized = fromCrossJSON(serialized, { + const deserialized = fromCrossJSON(serialized!, { refs: new Map(), plugins: [deserializePlugin], }) as any @@ -225,4 +453,176 @@ describe('RawStream', () => { expect(deserialized.rawData).toBe(testStream) }) }) + + describe('SSR stream lifecycle', () => { + it.each(['chunk', 'eof', 'error'] as const)( + 'ignores a late %s read result after disposal', + async (settlement) => { + let resolveRead!: (result: ReadableStreamReadResult) => void + let rejectRead!: (error: unknown) => void + const readResult = new Promise>( + (resolve, reject) => { + resolveRead = resolve + rejectRead = reject + }, + ) + const reader = { + read: vi.fn(() => readResult), + cancel: vi.fn(() => Promise.resolve()), + releaseLock: vi.fn(), + } + const readable = { + getReader: () => reader, + } as unknown as ReadableStream + const sources = new Array() + const dispose = crossSerializeStream(new RawStream(readable), { + refs: new Map(), + plugins: [RawStreamSSRPlugin], + scopeId: 'raw-stream-disposal-test', + onSerialize(source) { + sources.push(source) + }, + }) + + expect(reader.read).toHaveBeenCalledTimes(1) + const sourceCount = sources.length + dispose() + dispose() + expect(reader.cancel).toHaveBeenCalledTimes(1) + expect(reader.releaseLock).toHaveBeenCalledTimes(1) + + if (settlement === 'error') { + rejectRead(new Error('late read failure')) + } else { + resolveRead( + settlement === 'eof' + ? { done: true, value: undefined } + : { done: false, value: Uint8Array.of(1) }, + ) + } + await Promise.resolve() + await Promise.resolve() + + expect(sources).toHaveLength(sourceCount) + expect(reader.read).toHaveBeenCalledTimes(1) + expect(reader.cancel).toHaveBeenCalledTimes(1) + expect(reader.releaseLock).toHaveBeenCalledTimes(1) + }, + ) + }) + + describe.each([ + { hint: 'binary', pluginIndex: 0, encoded: 'QQ==' }, + { hint: 'text', pluginIndex: 1, encoded: 'tA' }, + ] as const)('$hint browser factory', ({ pluginIndex, encoded }) => { + it.each([ + ['local', false], + ['emitted', true], + ] as const)( + 'unsubscribes the %s factory on cancellation', + async (_, emitted) => { + const factory = getRawStreamFactory(pluginIndex, emitted) + const encodedStream = createTrackedEncodedStream() + const output = factory(encodedStream.stream) + const reader = output.getReader() + + expect(encodedStream.listenerCount).toBe(1) + encodedStream.stream.next(encoded) + const chunk = await reader.read() + expect(chunk.done).toBe(false) + expect(Array.from(chunk.value!)).toEqual([65]) + + await reader.cancel() + await reader.cancel() + expect(encodedStream.unsubscribeCalls).toBe(1) + expect(encodedStream.listenerCount).toBe(0) + + encodedStream.stream.next(encoded) + expect(encodedStream.listenerCount).toBe(0) + }, + ) + + it.each([ + ['local', false], + ['emitted', true], + ] as const)( + 'does not retain a synchronous terminal disposer in the %s factory', + async (_, emitted) => { + const unsubscribe = vi.fn() + const stream = { + __SEROVAL_STREAM__: true, + on(listener: EncodedStreamListener) { + listener.next(encoded) + listener.return(undefined) + return unsubscribe + }, + next() {}, + throw() {}, + return() {}, + } as EncodedStream + const reader = getRawStreamFactory( + pluginIndex, + emitted, + )(stream).getReader() + + expect(unsubscribe).toHaveBeenCalledTimes(emitted ? 0 : 1) + await reader.cancel() + expect(unsubscribe).toHaveBeenCalledTimes(emitted ? 0 : 1) + }, + ) + + it.each([false, true])( + 'disposes a malformed buffered JSON stream (ended: %s)', + async (ended) => { + const stream = createStream() + stream.next(pluginIndex === 1 ? 'b%' : '%') + stream.next(encoded) + if (ended) { + stream.return(undefined) + } + const on = stream.on.bind(stream) + const unsubscribe = vi.fn() + vi.spyOn(stream, 'on').mockImplementation((listener) => { + unsubscribe.mockImplementation(on(listener)) + return unsubscribe + }) + + const reader = getRawStreamFactory( + pluginIndex, + false, + )(stream).getReader() + + expect(unsubscribe).toHaveBeenCalledOnce() + await expect(reader.read()).rejects.toMatchObject({ + name: 'InvalidCharacterError', + }) + stream.next(encoded) + await expect(reader.cancel()).rejects.toMatchObject({ + name: 'InvalidCharacterError', + }) + expect(unsubscribe).toHaveBeenCalledOnce() + reader.releaseLock() + }, + ) + + it.each([ + ['local', false], + ['emitted', true], + ] as const)( + 'does not retain a live terminal disposer in the %s factory', + async (_, emitted) => { + const encodedStream = createTrackedEncodedStream() + const reader = getRawStreamFactory( + pluginIndex, + emitted, + )(encodedStream.stream).getReader() + + encodedStream.stream.next(encoded) + encodedStream.stream.return(undefined) + await reader.cancel() + + expect(encodedStream.unsubscribeCalls).toBe(0) + }, + ) + }) }) diff --git a/packages/router-core/tests/client-lane-adversarial.test.ts b/packages/router-core/tests/client-lane-adversarial.test.ts index dbcc15fed8..4924576759 100644 --- a/packages/router-core/tests/client-lane-adversarial.test.ts +++ b/packages/router-core/tests/client-lane-adversarial.test.ts @@ -674,21 +674,27 @@ describe('adversarial client lane ownership', () => { expect(contextWorkAborted).toBe(true) }) - test.each( - ([false, true] as const).flatMap((isServer) => [ - { - isServer, - thrownType: 'AbortSignal', - createThrownValue: (signal: AbortSignal) => signal, - }, - { - isServer, - thrownType: 'AbortError', - createThrownValue: () => - new DOMException('The operation was aborted.', 'AbortError'), - }, - ]), - )( + test.each([ + { + isServer: false, + thrownType: 'AbortSignal', + createThrownValue: (signal: AbortSignal) => signal, + }, + { + isServer: false, + thrownType: 'AbortError', + createThrownValue: () => + new DOMException('The operation was aborted.', 'AbortError'), + }, + { + isServer: true, + thrownType: 'AbortError', + createThrownValue: () => + Object.assign(new Error('The operation was aborted.'), { + name: 'AbortError', + }), + }, + ])( 'treats a user-thrown $thrownType in beforeLoad as an ordinary route error (isServer=$isServer)', async ({ isServer, createThrownValue }) => { let matchSignal: AbortSignal | undefined @@ -718,7 +724,8 @@ describe('adversarial client lane ownership', () => { } const match = router.state.matches.at(-1) - expect(matchSignal?.aborted).toBe(isServer) + // The payload finished, so the controller is left alone on both sides. + expect(matchSignal?.aborted).toBe(false) expect(match).toMatchObject({ routeId: brokenRoute.id, status: 'error', diff --git a/packages/router-core/tests/htmlBoundaryScanner.test.ts b/packages/router-core/tests/htmlBoundaryScanner.test.ts new file mode 100644 index 0000000000..05dfa5543e --- /dev/null +++ b/packages/router-core/tests/htmlBoundaryScanner.test.ts @@ -0,0 +1,256 @@ +import { describe, expect, test } from 'vitest' +import { + HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, + HYDRATION_SCRIPT_BOUNDARY_BYTES, + createHydrationScripts, +} from '../src/ssr/hydrationScripts' +import { + DOCUMENT_CLOSE_ANCHOR_INDEX, + DOCUMENT_CLOSE_BYTES, + SCRIPT_CLOSE, + SCRIPT_CLOSE_ANCHOR_INDEX, + SCRIPT_CLOSE_BYTES, + advanceByteMatcher, + findExactBytes, + getExactBytesPrefixAtEnd, +} from '../src/ssr/htmlBoundaryScanner' +import type { ByteMatcherState } from '../src/ssr/htmlBoundaryScanner' + +const encoder = new TextEncoder() +const decoder = new TextDecoder() +const DOCUMENT_CLOSE = decoder.decode(DOCUMENT_CLOSE_BYTES) +const HYDRATION_SCRIPT_BOUNDARY_SUFFIX = decoder.decode( + HYDRATION_SCRIPT_BOUNDARY_BYTES, +) +const HYDRATION_SCRIPT_BOUNDARY_SOURCE = createHydrationScripts( + undefined, + [], +).takeInitialHydrationScriptTags()!.boundary.children! + +function chunksAtEverySplit(value: Uint8Array) { + return Array.from({ length: value.length + 1 }, (_, split) => [ + value.subarray(0, split), + value.subarray(split), + ]) +} + +function matcherFor(pattern: Uint8Array, anchorIndex = 0): ByteMatcherState { + return { pattern, anchorIndex, matched: 0 } +} + +describe('SSR exact byte matcher', () => { + test.each([ + [ + 'router boundary', + HYDRATION_SCRIPT_BOUNDARY_BYTES, + HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, + ], + ['script close', SCRIPT_CLOSE_BYTES, SCRIPT_CLOSE_ANCHOR_INDEX], + ])('matches %s at every two-chunk split', (_, pattern, anchorIndex) => { + for (const chunks of chunksAtEverySplit(pattern)) { + const matcher = matcherFor(pattern, anchorIndex) + let matches = 0 + for (const chunk of chunks) { + if (advanceByteMatcher(matcher, chunk) !== undefined) { + matches++ + } + } + expect(matches).toBe(1) + } + }) + + test.each([ + [ + 'router boundary', + HYDRATION_SCRIPT_BOUNDARY_BYTES, + HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, + ], + ['script close', SCRIPT_CLOSE_BYTES, SCRIPT_CLOSE_ANCHOR_INDEX], + ])('matches byte-at-a-time %s input', (_, pattern, anchorIndex) => { + const matcher = matcherFor(pattern, anchorIndex) + let matches = 0 + for (const byte of pattern) { + if (advanceByteMatcher(matcher, Uint8Array.of(byte)) !== undefined) { + matches++ + } + } + expect(matches).toBe(1) + }) + + test('returns the local end offset and keeps the unconsumed suffix', () => { + const matcher = matcherFor(SCRIPT_CLOSE_BYTES) + const prefix = encoder.encode('prefix') + const suffix = encoder.encode('') + const value = new Uint8Array( + prefix.length + SCRIPT_CLOSE_BYTES.length + suffix.length, + ) + value.set(prefix) + value.set(SCRIPT_CLOSE_BYTES, prefix.length) + value.set(suffix, prefix.length + SCRIPT_CLOSE_BYTES.length) + + const end = advanceByteMatcher(matcher, value) + expect(end).toBe(prefix.length + SCRIPT_CLOSE_BYTES.length) + expect(new TextDecoder().decode(value.subarray(end))).toBe('') + }) + + test('can find the last complete match without stopping at the first', () => { + const matcher = matcherFor(SCRIPT_CLOSE_BYTES, SCRIPT_CLOSE_ANCHOR_INDEX) + const value = encoder.encode('
') + + const end = advanceByteMatcher(matcher, value, 0, true) + expect(new TextDecoder().decode(value.subarray(0, end))).toBe( + '
', + ) + }) + + test.each([ + [ + 'router boundary', + HYDRATION_SCRIPT_BOUNDARY_BYTES, + HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, + ], + ['script close', SCRIPT_CLOSE_BYTES, SCRIPT_CLOSE_ANCHOR_INDEX], + ])('%s satisfies the matcher invariants', (_, pattern, anchorIndex) => { + expect(pattern.length).toBeGreaterThan(0) + expect(pattern.indexOf(pattern[0]!, 1)).toBe(-1) + expect(anchorIndex).toBeGreaterThanOrEqual(0) + expect(anchorIndex).toBeLessThan(pattern.length) + }) + + test.each(['one chunk', 'split after the old overlapping prefix'])( + 'ignores marker text without the fixed semicolon in %s', + (shape) => { + const markerAndClose = HYDRATION_SCRIPT_BOUNDARY_BYTES.subarray(1) + const value = new Uint8Array(24 + markerAndClose.length - 1) + value.set(markerAndClose.subarray(0, 24)) + value.set(markerAndClose.subarray(1), 24) + const chunks = + shape === 'one chunk' + ? [value] + : [value.subarray(0, 24), value.subarray(24)] + const matcher = matcherFor( + HYDRATION_SCRIPT_BOUNDARY_BYTES, + HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, + ) + + let consumed = 0 + let matchEnd: number | undefined + for (const chunk of chunks) { + const localEnd = advanceByteMatcher(matcher, chunk) + if (localEnd !== undefined) { + matchEnd = consumed + localEnd + } + consumed += chunk.length + } + + expect(matchEnd).toBeUndefined() + }, + ) + + test.each(['one chunk', 'split before the valid boundary'])( + 'restarts at a valid boundary after a near match in %s', + (shape) => { + const nearMatch = HYDRATION_SCRIPT_BOUNDARY_BYTES.subarray(0, 12) + const value = new Uint8Array( + nearMatch.length + HYDRATION_SCRIPT_BOUNDARY_BYTES.length, + ) + value.set(nearMatch) + value.set(HYDRATION_SCRIPT_BOUNDARY_BYTES, nearMatch.length) + const chunks = + shape === 'one chunk' + ? [value] + : [ + value.subarray(0, nearMatch.length), + value.subarray(nearMatch.length), + ] + const matcher = matcherFor( + HYDRATION_SCRIPT_BOUNDARY_BYTES, + HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, + ) + + let consumed = 0 + let matchEnd: number | undefined + for (const chunk of chunks) { + const localEnd = advanceByteMatcher(matcher, chunk) + if (localEnd !== undefined) { + matchEnd = consumed + localEnd + } + consumed += chunk.length + } + + expect(matchEnd).toBe(value.length) + }, + ) + + test('reset drops an incomplete match', () => { + const matcher = matcherFor(SCRIPT_CLOSE_BYTES) + expect( + advanceByteMatcher(matcher, SCRIPT_CLOSE_BYTES.subarray(0, 5)), + ).toBeUndefined() + matcher.matched = 0 + expect( + advanceByteMatcher(matcher, SCRIPT_CLOSE_BYTES.subarray(5)), + ).toBeUndefined() + }) +}) + +describe('SSR exact byte helpers', () => { + test('scanner boundary is the exact end of the emitted script', () => { + expect(HYDRATION_SCRIPT_BOUNDARY_SUFFIX.endsWith(SCRIPT_CLOSE)).toBe(true) + expect( + HYDRATION_SCRIPT_BOUNDARY_SOURCE.endsWith( + HYDRATION_SCRIPT_BOUNDARY_SUFFIX.slice(0, -SCRIPT_CLOSE.length), + ), + ).toBe(true) + expect(HYDRATION_SCRIPT_BOUNDARY_BYTES).toEqual( + encoder.encode(HYDRATION_SCRIPT_BOUNDARY_SUFFIX), + ) + }) + + test('anchors document-close scans on the uncommon y byte', () => { + expect(DOCUMENT_CLOSE_ANCHOR_INDEX).toBe(DOCUMENT_CLOSE.indexOf('y')) + }) + + test('finds a complete sequence without decoding or copying', () => { + const prefix = encoder.encode('abc') + const value = new Uint8Array( + prefix.length + DOCUMENT_CLOSE_BYTES.length + 1, + ) + value.set(prefix) + value.set(DOCUMENT_CLOSE_BYTES, prefix.length) + value[value.length - 1] = 120 + + expect(findExactBytes(value, DOCUMENT_CLOSE_BYTES)).toBe(prefix.length) + expect(findExactBytes(value, DOCUMENT_CLOSE_BYTES, prefix.length + 1)).toBe( + -1, + ) + }) + + test('reports every incomplete document-close suffix', () => { + for (let length = 1; length < DOCUMENT_CLOSE_BYTES.length; length++) { + const prefix = encoder.encode('application') + const value = new Uint8Array(prefix.length + length) + value.set(prefix) + value.set(DOCUMENT_CLOSE_BYTES.subarray(0, length), prefix.length) + + expect(getExactBytesPrefixAtEnd(value, DOCUMENT_CLOSE_BYTES)).toBe( + prefix.length, + ) + } + }) + + test('uses the longest suffix when the pattern prefix overlaps', () => { + const pattern = encoder.encode('abab') + const value = encoder.encode('xxaba') + expect(getExactBytesPrefixAtEnd(value, pattern)).toBe(2) + }) + + test('returns no suffix for a final mismatch', () => { + expect( + getExactBytesPrefixAtEnd( + encoder.encode('application'), + SCRIPT_CLOSE_BYTES, + ), + ).toBeUndefined() + }) +}) diff --git a/packages/router-core/tests/hydrate.test.ts b/packages/router-core/tests/hydrate.test.ts index 7ecec4a4e5..4f03568963 100644 --- a/packages/router-core/tests/hydrate.test.ts +++ b/packages/router-core/tests/hydrate.test.ts @@ -1,4 +1,3 @@ -import { runInNewContext } from 'node:vm' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { @@ -10,9 +9,8 @@ import { notFound, } from '../src' import { hydrate } from '../src/ssr/client' -import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' import { dehydrateSsrMatchId } from '../src/ssr/ssr-match-id' -import { createTestRouter } from './routerTestUtils' +import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' import type { AnyRouteMatch, AnyRouter, LocationRewrite } from '../src' import type { ServerManifest } from '../src/manifest' import type { TsrSsrGlobal } from '../src/ssr/types' @@ -35,35 +33,6 @@ function createMockBootstrap( } } -async function dehydrateToBootstrap( - router: AnyRouter, - manifest: ServerManifest = testManifest, -): Promise { - attachRouterServerSsrUtils({ router, manifest }) - try { - await router.load() - await router.serverSsr!.dehydrate() - - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - - const context: Record = { - document: { - currentScript: { - remove() {}, - }, - }, - } - context.self = context - runInNewContext(script!.children!, context) - - expect(context.$_TSR).toBeDefined() - return context.$_TSR - } finally { - router.serverSsr?.cleanup() - } -} - describe('hydrate', () => { let mockWindow: { $_TSR?: TsrSsrGlobal } let mockRouter: any @@ -232,7 +201,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) expect(mockWindow.$_TSR.router?.matches[1]).not.toHaveProperty('l') const clientLoader = vi.fn(() => undefined) @@ -278,7 +247,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) expect(mockWindow.$_TSR.router?.matches[1]).not.toHaveProperty('l') const parentError = new Error('parent reload failed') @@ -342,7 +311,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) mockWindow.$_TSR.router!.matches[1]!.i = identity as string const clientLoader = vi.fn(() => 'client data') @@ -400,7 +369,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) mockWindow.$_TSR.router!.matches[2]!.i = dehydrateSsrMatchId( '/different-child-match', ) @@ -478,7 +447,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) expect(mockWindow.$_TSR.router?.matches).toHaveLength(3) const clientLoader = vi.fn(() => 'client data') @@ -536,7 +505,7 @@ describe('hydrate', () => { }) serverRouter.options.serializationAdapters = [adapter] - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) const clientLoader = vi.fn(() => new AdaptedValue('client loader data')) const clientRootRoute = new BaseRootRoute({}) @@ -577,7 +546,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) expect(serverRouter.state.matches).toHaveLength(2) expect(serverRouter.state.matches[0]).toMatchObject({ @@ -635,7 +604,7 @@ describe('hydrate', () => { isServer: true, isShell: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) const clientRootRoute = new BaseRootRoute({ notFoundComponent: () => 'Not Found', @@ -690,7 +659,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) const clientLoader = vi.fn(() => 'client internal data') const clientRootRoute = new BaseRootRoute({}) @@ -699,13 +668,12 @@ describe('hydrate', () => { path: '/internal', loader: clientLoader, }) - let clientRouter: AnyRouter const customHydrate = vi.fn((dehydrated: { rewrite?: boolean }) => { if (dehydrated.rewrite) { clientRouter.update({ rewrite }) } }) - clientRouter = createTestRouter({ + const clientRouter: AnyRouter = createTestRouter({ routeTree: clientRootRoute.addChildren([clientInternalRoute]), history: createMemoryHistory({ initialEntries: ['/public'] }), hydrate: customHydrate, @@ -774,3 +742,60 @@ describe('hydrate', () => { ) }) }) + +describe('createSerializationAdapter key validation', () => { + function createAdapter(key: string) { + return createSerializationAdapter({ + key, + test: (value): value is string => typeof value === 'string', + toSerializable: (value) => value, + fromSerializable: (value) => value, + }) + } + + it('throws in development for empty or unsupported keys', () => { + for (const key of [ + '', + 'nul\0key', + 'bad"key', + 'back\\slash', + 'lt createAdapter(key)).toThrowError( + /createSerializationAdapter: key .* is invalid/s, + ) + } + }) + + it('accepts a key that Seroval preserves verbatim', () => { + expect(() => createAdapter('safe-key/v1.0_$-')).not.toThrow() + }) + + it('does not inspect the key in production', () => { + vi.stubEnv('NODE_ENV', 'production') + try { + const options = { + get key(): string { + throw new Error('production key was inspected') + }, + test: (value: unknown): value is string => typeof value === 'string', + toSerializable: (value: string) => value, + fromSerializable: (value: string) => value, + } + + expect(createSerializationAdapter(options)).toBe(options) + } finally { + vi.unstubAllEnvs() + } + }) +}) diff --git a/packages/router-core/tests/hydrated-stay-match-data.test.ts b/packages/router-core/tests/hydrated-stay-match-data.test.ts index 5f8333310a..6e269e86c3 100644 --- a/packages/router-core/tests/hydrated-stay-match-data.test.ts +++ b/packages/router-core/tests/hydrated-stay-match-data.test.ts @@ -1,38 +1,13 @@ -import { runInNewContext } from 'node:vm' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { hydrate } from '../src/ssr/client' -import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' -import { createTestRouter } from './routerTestUtils' -import type { AnyRouter } from '../src' +import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' import type { TsrSsrGlobal } from '../src/ssr/types' import type { ServerManifest } from '../src/manifest' const testManifest: ServerManifest = { routes: {} } -async function dehydrateToBootstrap(router: AnyRouter): Promise { - attachRouterServerSsrUtils({ router, manifest: testManifest }) - try { - await router.load() - await router.serverSsr!.dehydrate() - - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - - const context: Record = { - document: { currentScript: { remove() {} } }, - } - context.self = context - runInNewContext(script!.children!, context) - - expect(context.$_TSR).toBeDefined() - return context.$_TSR - } finally { - router.serverSsr?.cleanup() - } -} - describe('hydrated stay match data preservation', () => { let mockWindow: { $_TSR?: TsrSsrGlobal } @@ -70,7 +45,7 @@ describe('hydrated stay match data preservation', () => { isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter) + const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) expect(serverRootBeforeLoad).toHaveBeenCalledTimes(1) expect(serverRootLoader).toHaveBeenCalledTimes(1) diff --git a/packages/router-core/tests/hydration-asset-context-order.test.ts b/packages/router-core/tests/hydration-asset-context-order.test.ts index 64ea28971e..014e338b32 100644 --- a/packages/router-core/tests/hydration-asset-context-order.test.ts +++ b/packages/router-core/tests/hydration-asset-context-order.test.ts @@ -1,38 +1,14 @@ -import { runInNewContext } from 'node:vm' import { afterEach, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { hydrate } from '../src/ssr/client' -import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' -import { createTestRouter } from './routerTestUtils' -import type { AnyRouteMatch, AnyRouter } from '../src' +import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' +import type { AnyRouteMatch } from '../src' import type { ServerManifest } from '../src/manifest' import type { TsrSsrGlobal } from '../src/ssr/types' const testManifest: ServerManifest = { routes: {} } -async function dehydrateToBootstrap(router: AnyRouter): Promise { - attachRouterServerSsrUtils({ router, manifest: testManifest }) - try { - await router.load() - await router.serverSsr!.dehydrate() - - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - - const context: Record = { - document: { currentScript: { remove() {} } }, - } - context.self = context - runInNewContext(script!.children!, context) - - expect(context.$_TSR).toBeDefined() - return context.$_TSR - } finally { - router.serverSsr?.cleanup() - } -} - afterEach(() => { vi.restoreAllMocks() vi.unstubAllGlobals() @@ -54,7 +30,7 @@ test('hydration reconstructs every match context before ancestor head reads the isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter) + const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) expect(serverBeforeLoad).toHaveBeenCalledTimes(1) expect(serverRouter.state.matches.at(-1)?.context).toMatchObject({ diff --git a/packages/router-core/tests/hydration-boundary-chunks.test.ts b/packages/router-core/tests/hydration-boundary-chunks.test.ts index fe760e074a..0d5c9a0af6 100644 --- a/packages/router-core/tests/hydration-boundary-chunks.test.ts +++ b/packages/router-core/tests/hydration-boundary-chunks.test.ts @@ -1,38 +1,13 @@ -import { runInNewContext } from 'node:vm' import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute, isNotFound, notFound } from '../src' import { hydrate } from '../src/ssr/client' -import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' -import { createTestRouter } from './routerTestUtils' -import type { AnyRouter } from '../src' +import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' import type { TsrSsrGlobal } from '../src/ssr/types' import type { ServerManifest } from '../src/manifest' const testManifest: ServerManifest = { routes: {} } -async function dehydrateToBootstrap(router: AnyRouter): Promise { - attachRouterServerSsrUtils({ router, manifest: testManifest }) - try { - await router.load() - await router.serverSsr!.dehydrate() - - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - - const context: Record = { - document: { currentScript: { remove() {} } }, - } - context.self = context - runInNewContext(script!.children!, context) - - expect(context.$_TSR).toBeDefined() - return context.$_TSR - } finally { - router.serverSsr?.cleanup() - } -} - describe('hydration route chunks below a server boundary', () => { let mockWindow: { $_TSR?: TsrSsrGlobal } @@ -64,7 +39,7 @@ describe('hydration route chunks below a server boundary', () => { isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter) + const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) expect(serverBeforeLoad).toHaveBeenCalledTimes(1) expect(serverRouter.state.location.pathname).toBe('/app') @@ -163,7 +138,7 @@ describe('hydration route chunks below a server boundary', () => { isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter) + const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) expect(serverChildLoader).toHaveBeenCalledTimes(1) expect(serverRouter.state.matches.map((match) => match.routeId)).toEqual([ diff --git a/packages/router-core/tests/hydration-currentness.test.ts b/packages/router-core/tests/hydration-currentness.test.ts index a9d52f0c97..03ad11998b 100644 --- a/packages/router-core/tests/hydration-currentness.test.ts +++ b/packages/router-core/tests/hydration-currentness.test.ts @@ -1,4 +1,3 @@ -import { runInNewContext } from 'node:vm' import { afterEach, beforeEach, @@ -16,37 +15,14 @@ import { createControlledPromise, } from '../src' import { hydrate } from '../src/ssr/client' -import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' import { dehydrateSsrMatchId } from '../src/ssr/ssr-match-id' -import { createTestRouter } from './routerTestUtils' +import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' import type { AnyRouteMatch, AnyRouter, NavigateFn } from '../src' import type { DehydratedRouter, TsrSsrGlobal } from '../src/ssr/types' import type { ServerManifest } from '../src/manifest' const testManifest: ServerManifest = { routes: {} } -async function dehydrateToBootstrap(router: AnyRouter): Promise { - attachRouterServerSsrUtils({ router, manifest: testManifest }) - try { - await router.load() - await router.serverSsr!.dehydrate() - - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - - const context: Record = { - document: { currentScript: { remove() {} } }, - } - context.self = context - runInNewContext(script!.children!, context) - - expect(context.$_TSR).toBeDefined() - return context.$_TSR - } finally { - router.serverSsr?.cleanup() - } -} - // These tests install the hydration protocol directly so client-only hooks can // be paused at deterministic ownership boundaries. function installHydrationPayload( @@ -155,7 +131,7 @@ describe('hydration asset currentness', () => { }), isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) expect(serverChildLoader).not.toHaveBeenCalled() const childContext = vi.fn(() => ({ assetSource: 'child context' })) @@ -227,7 +203,7 @@ describe('hydration asset currentness', () => { history: createMemoryHistory({ initialEntries: ['/parent/child'] }), isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) const childLoaderResult = createControlledPromise() let continuationAssetEnd: number | undefined @@ -597,7 +573,7 @@ describe('hydration asset currentness', () => { isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter) + const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) expect(serverBeforeLoad).toHaveBeenCalledTimes(1) expect(serverChildLoader).not.toHaveBeenCalled() diff --git a/packages/router-core/tests/hydration-terminal-error-child-head.test.ts b/packages/router-core/tests/hydration-terminal-error-child-head.test.ts index 1deb533475..e0acbd9780 100644 --- a/packages/router-core/tests/hydration-terminal-error-child-head.test.ts +++ b/packages/router-core/tests/hydration-terminal-error-child-head.test.ts @@ -1,38 +1,13 @@ -import { runInNewContext } from 'node:vm' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute, notFound } from '../src' import { hydrate } from '../src/ssr/client' -import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' -import { createTestRouter } from './routerTestUtils' -import type { AnyRouter } from '../src' +import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' import type { TsrSsrGlobal } from '../src/ssr/types' import type { ServerManifest } from '../src/manifest' const testManifest: ServerManifest = { routes: {} } -async function dehydrateToBootstrap(router: AnyRouter): Promise { - attachRouterServerSsrUtils({ router, manifest: testManifest }) - try { - await router.load() - await router.serverSsr!.dehydrate() - - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - - const context: Record = { - document: { currentScript: { remove() {} } }, - } - context.self = context - runInNewContext(script!.children!, context) - - expect(context.$_TSR).toBeDefined() - return context.$_TSR - } finally { - router.serverSsr?.cleanup() - } -} - // This terminal-prefix case is an internal hydration protocol invariant, not // an issue #7635 reproduction. The user-visible same-route navigation // regression is covered in react-router, where the rendered boundary and @@ -76,7 +51,7 @@ describe('hydrated terminal error prefix', () => { isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter) + const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) expect(serverBeforeLoad).toHaveBeenCalledTimes(1) expect(serverChildLoader).not.toHaveBeenCalled() @@ -210,7 +185,7 @@ describe('hydrated terminal error prefix', () => { const server = setup(true) const client = setup(false) try { - mockWindow.$_TSR = await dehydrateToBootstrap(server) + mockWindow.$_TSR = await dehydrateToBootstrap(server, testManifest) await hydrate(client) expect(client.state.matches).toHaveLength(3) await client.invalidate() diff --git a/packages/router-core/tests/hydrationQueue.bench.ts b/packages/router-core/tests/hydrationQueue.bench.ts new file mode 100644 index 0000000000..821cbeb5ad --- /dev/null +++ b/packages/router-core/tests/hydrationQueue.bench.ts @@ -0,0 +1,103 @@ +import { bench, describe } from 'vitest' + +const MAX_DYNAMIC_RECORD_CODE_UNITS = 64 * 1024 +const SOURCE_SEPARATOR = ';' +const SCRIPT_OPENING_CODE_UNITS = '' + .length + +function getBatchLength( + values: ReadonlyArray, + head: number, +) { + let codeUnits = SCRIPT_OPENING_CODE_UNITS + DYNAMIC_CLOSE_CODE_UNITS + let batchLength = 0 + for (let index = head; index < values.length; index++) { + const nextCodeUnits = + codeUnits + SOURCE_SEPARATOR.length + values[index]!.length + if (batchLength > 0 && nextCodeUnits > MAX_DYNAMIC_RECORD_CODE_UNITS) { + break + } + codeUnits = nextCodeUnits + batchLength++ + if (codeUnits > MAX_DYNAMIC_RECORD_CODE_UNITS) { + break + } + } + return batchLength +} + +function drainWithSplice(values: Array) { + let drained = 0 + let consumedCodeUnits = 0 + while (values.length > 0) { + const batchLength = getBatchLength(values, 0) + const batch = values.splice(0, batchLength) + drained += batchLength + for (const part of batch) { + consumedCodeUnits += part.length + } + } + return { drained, consumedCodeUnits } +} + +function drainWithHead(values: Array) { + let head = 0 + let drained = 0 + let consumedCodeUnits = 0 + while (head < values.length) { + const batchLength = getBatchLength(values, head) + if (head === 0 && batchLength === values.length) { + const batch = values + drained += values.length + for (const part of batch) { + consumedCodeUnits += part!.length + } + values = [] + head = 0 + continue + } + const end = head + batchLength + const batch = values.slice(head, end) + for (let index = head; index < end; index++) { + values[index] = undefined + } + drained += batch.length + for (const part of batch) { + consumedCodeUnits += part!.length + } + head = end + if (head === values.length) { + values = [] + head = 0 + } else if (head >= 1024 && head >= values.length - head) { + values = values.slice(head) + head = 0 + } + } + return { drained, consumedCodeUnits } +} + +const source = 'x'.repeat(4 * 1024) +const sources = Array.from({ length: 4_095 }, () => source) +let benchmarkSink: { drained: number; consumedCodeUnits: number } | undefined + +const expected = drainWithSplice(sources.slice()) +const actual = drainWithHead(sources.slice()) +if ( + expected.drained !== sources.length || + actual.drained !== sources.length || + actual.consumedCodeUnits !== expected.consumedCodeUnits +) { + throw new Error('Hydration queue benchmark discarded a source') +} + +describe('maximum hydration source queue with 4 KiB sources', () => { + bench('front splice', () => { + return void (benchmarkSink = drainWithSplice(sources.slice())) + }) + + bench('head index with compaction', () => { + return void (benchmarkSink = drainWithHead(sources.slice())) + }) +}) diff --git a/packages/router-core/tests/hydrationScripts.test.ts b/packages/router-core/tests/hydrationScripts.test.ts new file mode 100644 index 0000000000..911e7cd78d --- /dev/null +++ b/packages/router-core/tests/hydrationScripts.test.ts @@ -0,0 +1,808 @@ +import { createHash } from 'node:crypto' +import { describe, expect, test, vi } from 'vitest' +import { + HydrationScriptOutputState, + MAX_HYDRATION_OUTPUT_CHUNK_BYTES, + createHydrationScripts, +} from '../src/ssr/hydrationScripts' +import type { HydrationScriptOutput } from '../src/ssr/hydrationScripts' + +const decoder = new TextDecoder() +const encoder = new TextEncoder() + +function getBoundarySource() { + const scripts = createHydrationScripts(undefined, []) + const source = scripts.takeInitialHydrationScriptTags()!.boundary.children! + scripts.cleanup() + return source +} + +const HYDRATION_SCRIPT_BOUNDARY_SOURCE = getBoundarySource() + +function createReadyOutput(nonce?: string) { + const scripts = createHydrationScripts(nonce, ['boot()']) + const initial = scripts.takeInitialHydrationScriptTags()! + const output = scripts.claimOutput() + scripts.liftBarrier() + return { scripts, initial, output } +} + +function drainChunks(output: HydrationScriptOutput) { + const chunks: Array = [] + while ( + output.state === HydrationScriptOutputState.Ready || + output.state === HydrationScriptOutputState.Active + ) { + chunks.push(output.pullChunk()) + } + return chunks +} + +function decodeChunks(chunks: ReadonlyArray) { + let text = '' + for (const chunk of chunks) { + text += decoder.decode(chunk, { stream: true }) + } + return text + decoder.decode() +} + +async function flushMicrotasks() { + await Promise.resolve() +} + +describe('hydration script ownership', () => { + test('takes initial sources before the output is claimed', () => { + const scripts = createHydrationScripts(undefined, ['first()', 'second()']) + const initial = scripts.takeInitialHydrationScriptTags()! + + expect(initial.before[0]).toMatchObject({ + attrs: { 'data-tsr-stream-part': '' }, + }) + expect(initial.before[0]!.children).toMatch(/^first\(\);second\(\);/) + expect(initial.boundary.children).toBe(HYDRATION_SCRIPT_BOUNDARY_SOURCE) + expect(initial.boundary.attrs).not.toHaveProperty('id') + + const output = scripts.claimOutput() + expect(output.state).toBe(HydrationScriptOutputState.Waiting) + scripts.cleanup() + }) + + test('supports taking initial tags through the ServerSsr callback', () => { + const scripts = createHydrationScripts(undefined, ['boot()']) + const takeInitialHydrationScriptTags = + scripts.takeInitialHydrationScriptTags + + expect(takeInitialHydrationScriptTags()?.before[0]?.children).toMatch( + /^boot\(\);/, + ) + scripts.cleanup() + }) + + test('notifies the subscriber and pulls late records', () => { + const scripts = createHydrationScripts(undefined, []) + scripts.takeInitialHydrationScriptTags() + const output = scripts.claimOutput() + const onChange = vi.fn() + const unsubscribe = output.subscribe(onChange) + + scripts.liftBarrier() + scripts.pushSource('late()') + + expect(onChange).toHaveBeenCalledOnce() + expect(decoder.decode(output.pullChunk())).toContain('late()') + unsubscribe() + scripts.cleanup() + }) + + test('skipInitialTake releases initial sources as late records', () => { + const scripts = createHydrationScripts(undefined, ['boot()']) + const output = scripts.claimOutput() + scripts.pushSource('late()') + scripts.liftBarrier() + expect(output.state).toBe(HydrationScriptOutputState.Waiting) + + scripts.skipInitialTake() + + expect(output.state).toBe(HydrationScriptOutputState.Ready) + expect(decoder.decode(output.pullChunk())).toBe( + '', + ) + expect(scripts.takeInitialHydrationScriptTags()).toBeUndefined() + scripts.cleanup() + }) + + test('empty initial output keeps only the stream boundary', () => { + const scripts = createHydrationScripts(undefined, []) + const initial = scripts.takeInitialHydrationScriptTags()! + + expect(initial.before).toEqual([]) + expect(initial.boundary).toEqual({ + tag: 'script', + attrs: { nonce: undefined }, + children: HYDRATION_SCRIPT_BOUNDARY_SOURCE, + }) + scripts.cleanup() + }) + + test('does not append cleanup to a large initial source', () => { + const source = 'x'.repeat(20 * 1024) + const scripts = createHydrationScripts(undefined, [source]) + const initial = scripts.takeInitialHydrationScriptTags()! + + expect(initial.before).toHaveLength(2) + expect(initial.before[0]).toEqual({ + tag: 'script', + attrs: { nonce: undefined, 'data-tsr-stream-part': '' }, + children: source, + }) + expect(initial.before[1]).toMatchObject({ + tag: 'script', + attrs: { nonce: undefined, 'data-tsr-stream-part': '' }, + children: expect.stringContaining('document.currentScript'), + }) + scripts.cleanup() + }) + + test('does not move pending initial sources into an early claimant', () => { + const scripts = createHydrationScripts(undefined, ['boot()']) + const output = scripts.claimOutput() + + scripts.pushSource('beforeScripts()') + scripts.liftBarrier() + expect(output.state).toBe(HydrationScriptOutputState.Waiting) + + const initial = scripts.takeInitialHydrationScriptTags()! + expect( + initial.before.some((tag) => tag.children?.includes('beforeScripts()')), + ).toBe(true) + expect(output.state).toBe(HydrationScriptOutputState.Waiting) + scripts.cleanup() + }) + + test('releases initial source accounting when tags take ownership', () => { + const sources = Array.from({ length: 4_096 }, (_, index) => `${index}`) + const scripts = createHydrationScripts(undefined, sources) + expect(scripts.takeInitialHydrationScriptTags()).toBeDefined() + const output = scripts.claimOutput() + scripts.liftBarrier() + + for (const source of sources) { + scripts.pushSource(source) + } + + expect(output.state).toBe(HydrationScriptOutputState.Ready) + expect(output.error).toBeUndefined() + scripts.cleanup() + }) + + test('transfers buffered sources in order only after the barrier lifts', async () => { + const scripts = createHydrationScripts(undefined, ['boot()']) + scripts.takeInitialHydrationScriptTags() + const output = scripts.claimOutput() + + scripts.pushSource('first()') + scripts.pushSource('second()') + await flushMicrotasks() + expect(output.state).toBe(HydrationScriptOutputState.Waiting) + + scripts.liftBarrier() + expect(output.state).toBe(HydrationScriptOutputState.Ready) + expect(decodeChunks(drainChunks(output))).toBe( + '', + ) + scripts.cleanup() + }) + + test('emits exact nonce, separators, cleanup, boundary, and closing protocol', async () => { + const nonce = `a&"'<>` + const { scripts, initial, output } = createReadyOutput(nonce) + + expect(initial.before).toEqual([ + { + tag: 'script', + attrs: { nonce, 'data-tsr-stream-part': '' }, + children: + "boot();{let s=document.currentScript,p;while((p=s.previousElementSibling)&&p.hasAttribute('data-tsr-stream-part'))p.remove();s.remove()}", + }, + ]) + expect(initial.boundary).toEqual({ + tag: 'script', + attrs: { nonce }, + children: HYDRATION_SCRIPT_BOUNDARY_SOURCE, + }) + + scripts.pushSource('first()') + scripts.pushSource('second()') + await flushMicrotasks() + expect(decodeChunks(drainChunks(output))).toBe( + '', + ) + scripts.cleanup() + }) + + test.each([ + { + name: 'plain continuation', + initial: false, + wrap: false, + expected: 'value()', + }, + { + name: 'initial router value', + initial: true, + wrap: false, + expected: '$_TSR.router=value()', + }, + { + name: 'wrapped continuation', + initial: false, + wrap: true, + expected: '$_TSR.p(()=>value())', + }, + { + name: 'wrapped initial router value', + initial: true, + wrap: true, + expected: '$_TSR.p(()=>$_TSR.router=value())', + }, + ])('frames $name serialization exactly', ({ initial, wrap, expected }) => { + const { scripts, output } = createReadyOutput() + + scripts.pushSerializedSource('value()', initial, wrap) + + expect(decodeChunks(drainChunks(output))).toBe( + ``, + ) + scripts.cleanup() + }) +}) + +describe('hydration script encoding', () => { + test('uses one direct chunk for a small record', async () => { + const { scripts, output } = createReadyOutput() + scripts.pushSource('small()') + await flushMicrotasks() + + const chunks = drainChunks(output) + expect(chunks).toHaveLength(1) + expect(decodeChunks(chunks)).toBe( + '', + ) + scripts.cleanup() + }) + + test('can produce a record that is exactly one maximum-sized chunk', async () => { + const prefix = '' + const source = 'x'.repeat( + MAX_HYDRATION_OUTPUT_CHUNK_BYTES - prefix.length - suffix.length, + ) + const { scripts, output } = createReadyOutput() + scripts.pushSource(source) + await flushMicrotasks() + + const chunks = drainChunks(output) + expect(chunks).toHaveLength(1) + expect(chunks[0]).toHaveLength(MAX_HYDRATION_OUTPUT_CHUNK_BYTES) + expect(decodeChunks(chunks)).toBe(prefix + source + suffix) + scripts.cleanup() + }) + + test.each([ + ['CJK', '漢字語'.repeat(30_000)], + ['emoji', '🦄🚀'.repeat(30_000)], + ])( + 'encodes a large %s record without corrupting UTF-8', + async (_, source) => { + const { scripts, output } = createReadyOutput() + scripts.pushSource(source) + scripts.pushSource('tail()') + await flushMicrotasks() + + const chunks = drainChunks(output) + expect( + Math.max(...chunks.map((chunk) => chunk.byteLength)), + ).toBeLessThanOrEqual(MAX_HYDRATION_OUTPUT_CHUNK_BYTES) + expect(decodeChunks(chunks)).toBe( + `` + + '', + ) + scripts.cleanup() + }, + ) + + test('drains one 17 MiB record incrementally without retaining the response', async () => { + const source = 'x'.repeat(17 * 1024 * 1024) + const expectedHash = createHash('sha256') + .update('') + .digest('hex') + const { scripts, output } = createReadyOutput() + scripts.pushSource(source) + await flushMicrotasks() + + const actualHash = createHash('sha256') + let outputBytes = 0 + let maximumChunkBytes = 0 + while ( + output.state === HydrationScriptOutputState.Ready || + output.state === HydrationScriptOutputState.Active + ) { + const chunk = output.pullChunk() + actualHash.update(chunk) + outputBytes += chunk.byteLength + maximumChunkBytes = Math.max(maximumChunkBytes, chunk.byteLength) + } + + expect(outputBytes).toBe( + encoder.encode('').byteLength, + ) + expect(actualHash.digest('hex')).toBe(expectedHash) + expect(maximumChunkBytes).toBeLessThanOrEqual( + MAX_HYDRATION_OUTPUT_CHUNK_BYTES, + ) + expect(output.state).toBe(HydrationScriptOutputState.Waiting) + scripts.cleanup() + }) + + test('keeps a large record Active until its closing tag drains', async () => { + const { scripts, output } = createReadyOutput() + scripts.pushSource('x'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2)) + await flushMicrotasks() + + expect(output.state).toBe(HydrationScriptOutputState.Ready) + const first = output.pullChunk() + expect(first.byteLength).toBeLessThanOrEqual( + MAX_HYDRATION_OUTPUT_CHUNK_BYTES, + ) + expect(output.state).toBe(HydrationScriptOutputState.Active) + + drainChunks(output) + expect(output.state).toBe(HydrationScriptOutputState.Waiting) + scripts.cleanup() + }) + + test('closes one multi-chunk source before draining the next independent source', async () => { + const { scripts, output } = createReadyOutput() + const first = `first("${'a'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2)}")` + const second = `second("${'b'.repeat( + MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2, + )}")` + + try { + scripts.pushSource(first) + scripts.pushSource(second) + await flushMicrotasks() + + const recordDecoder = new TextDecoder() + let firstRecord = '' + while ( + (output.state === HydrationScriptOutputState.Ready || + output.state === HydrationScriptOutputState.Active) && + !firstRecord.includes('') + ) { + firstRecord += recordDecoder.decode(output.pullChunk(), { + stream: true, + }) + } + firstRecord += recordDecoder.decode() + + expect(firstRecord).toContain('first("') + expect(firstRecord).not.toContain('second("') + expect(output.state).toBe(HydrationScriptOutputState.Ready) + + const secondRecord = decodeChunks(drainChunks(output)) + expect(secondRecord).toContain('second("') + expect(secondRecord).not.toContain('first("') + expect(output.state).toBe(HydrationScriptOutputState.Waiting) + } finally { + scripts.cleanup() + } + }) + + test('splits sources whose combined framed record exceeds the record budget', async () => { + const { scripts, output } = createReadyOutput() + const first = `first("${'a'.repeat(40 * 1024)}")` + const second = `second("${'b'.repeat(40 * 1024)}")` + + try { + scripts.pushSource(first) + scripts.pushSource(second) + await flushMicrotasks() + + const firstRecord = decodeChunks([output.pullChunk()]) + expect(firstRecord).toContain(first) + expect(firstRecord).not.toContain(second) + expect(output.state).toBe(HydrationScriptOutputState.Ready) + + const secondRecord = decodeChunks([output.pullChunk()]) + expect(secondRecord).toContain(second) + expect(secondRecord).not.toContain(first) + expect(output.state).toBe(HydrationScriptOutputState.Waiting) + } finally { + scripts.cleanup() + } + }) + + test('preserves FIFO when sources append after queue compaction', () => { + const { scripts, output } = createReadyOutput() + const initialSources = Array.from({ length: 1_200 }, (_, index) => { + const prefix = `r${index.toString().padStart(4, '0')}:` + return prefix + 'x'.repeat(1024 - prefix.length) + }) + const appendedSources = Array.from({ length: 16 }, (_, offset) => { + const index = initialSources.length + offset + const prefix = `r${index.toString().padStart(4, '0')}:` + return prefix + 'x'.repeat(1024 - prefix.length) + }) + + try { + for (const source of initialSources) { + scripts.pushSource(source) + } + + const chunks = Array.from({ length: 17 }, () => output.pullChunk()) + expect(output.state).toBe(HydrationScriptOutputState.Ready) + + for (const source of appendedSources) { + scripts.pushSource(source) + } + scripts.finish() + chunks.push(...drainChunks(output)) + + const text = decodeChunks(chunks) + const markers = Array.from(text.matchAll(/r(\d{4}):/g), (match) => + Number(match[1]), + ) + expect(markers).toEqual( + [...initialSources, ...appendedSources].map((_, index) => index), + ) + expect(output.state).toBe(HydrationScriptOutputState.Done) + } finally { + scripts.cleanup() + } + }) + + test('reuses source-part capacity after queue compaction', () => { + const { scripts, output } = createReadyOutput() + const source = 'x'.repeat(1024) + + try { + for (let index = 0; index < 4_096; index++) { + scripts.pushSource(source) + } + + for (let record = 0; record < 33; record++) { + output.pullChunk() + } + expect(output.state).toBe(HydrationScriptOutputState.Ready) + + for (let index = 0; index < 2_079; index++) { + scripts.pushSource(source) + } + expect(output.state).toBe(HydrationScriptOutputState.Ready) + expect(output.error).toBeUndefined() + + scripts.pushSource(source) + expect(output.state).toBe(HydrationScriptOutputState.Failed) + expect((output.error as Error).message).toContain('source-part count') + } finally { + scripts.cleanup() + } + }) + + test('a mostly-empty final chunk does not pin the full output buffer', () => { + const { scripts, output } = createReadyOutput() + scripts.pushSource(`big("${'x'.repeat(80 * 1024)}")`) + scripts.finish() + + const chunks = drainChunks(output) + expect(chunks.length).toBeGreaterThan(1) + for (const chunk of chunks) { + // No chunk may retain more than twice its own bytes through its + // backing ArrayBuffer; small tails must be copied out of the 64 KiB + // output buffer. + expect(chunk.buffer.byteLength).toBeLessThanOrEqual(chunk.byteLength * 2) + } + }) +}) + +describe('disabled hydration', () => { + test('makes the fast path reservable without a take or a boundary', () => { + vi.useFakeTimers() + try { + const scripts = createHydrationScripts(undefined) + scripts.disableHydration() + + expect(scripts.isInitialTaken()).toBe(true) + expect(scripts.takeInitialHydrationScriptTags()).toBeUndefined() + expect(scripts.reserveFastPath()).toBe(true) + + // Late producer activity is inert: no sources, no timers. + scripts.pushSource('late()') + scripts.startSerializationTimeout(10) + scripts.finish() + expect(vi.getTimerCount()).toBe(0) + + scripts.cleanup() + } finally { + vi.useRealTimers() + } + }) + + test('is safe after cleanup', () => { + const scripts = createHydrationScripts(undefined) + scripts.disableHydration() + scripts.cleanup() + expect(() => scripts.disableHydration()).not.toThrow() + }) + + test('rejects disabling after the initial take', () => { + const scripts = createHydrationScripts(undefined, ['boot()']) + scripts.takeInitialHydrationScriptTags() + expect(() => scripts.disableHydration()).toThrow( + 'hydration output is already committed', + ) + scripts.cleanup() + }) + + test('rejects disabling after the output channel was claimed', () => { + const scripts = createHydrationScripts(undefined, ['boot()']) + scripts.claimOutput() + expect(() => scripts.disableHydration()).toThrow( + 'hydration output is already committed', + ) + scripts.cleanup() + }) +}) + +describe('hydration script completion and failure', () => { + test('enqueues $_TSR.e() before it reports Done', () => { + const { scripts, output } = createReadyOutput() + const observedStates: Array = [] + output.subscribe(() => observedStates.push(output.state)) + + scripts.pushSource('value()') + scripts.finish() + expect(output.state).toBe(HydrationScriptOutputState.Ready) + + const text = decodeChunks(drainChunks(output)) + expect(text).toBe( + '', + ) + expect(output.state).toBe(HydrationScriptOutputState.Done) + expect(observedStates).toContain(HydrationScriptOutputState.Ready) + scripts.cleanup() + }) + + test('reports the source-part guard synchronously', () => { + const { scripts, output } = createReadyOutput() + const notifications: Array = [] + output.subscribe(() => { + notifications.push(output.state) + }) + + let pushed = 0 + while ( + output.state !== HydrationScriptOutputState.Failed && + pushed < 10_000 + ) { + scripts.pushSource(`${pushed++}`) + } + + expect(pushed).toBeLessThan(10_000) + expect(output.state).toBe(HydrationScriptOutputState.Failed) + expect((output.error as Error).message).toContain('source-part count') + expect( + notifications.filter( + (value) => value === HydrationScriptOutputState.Failed, + ), + ).toHaveLength(1) + scripts.cleanup() + }) + + test('applies the source-part guard before the initial take', () => { + const scripts = createHydrationScripts(undefined, []) + + try { + for (let index = 0; index <= 4_096; index++) { + scripts.pushSource(`${index}`) + } + + const output = scripts.claimOutput() + expect(output.state).toBe(HydrationScriptOutputState.Failed) + expect((output.error as Error).message).toContain('source-part count') + expect(scripts.takeInitialHydrationScriptTags()).toBeUndefined() + } finally { + scripts.cleanup() + } + }) + + test('applies the source-part guard to constructor sources', () => { + const sources = Array.from({ length: 4_097 }, (_, index) => `${index}`) + const scripts = createHydrationScripts(undefined, sources) + + try { + const output = scripts.claimOutput() + expect(output.state).toBe(HydrationScriptOutputState.Failed) + expect((output.error as Error).message).toContain('source-part count') + expect(scripts.takeInitialHydrationScriptTags()).toBeUndefined() + } finally { + scripts.cleanup() + } + }) + + test('reports the regular backlog guard synchronously', () => { + const { scripts, output } = createReadyOutput() + const source = 'x'.repeat(1024 * 1024) + + let pushed = 0 + while (output.state !== HydrationScriptOutputState.Failed && pushed < 100) { + scripts.pushSource(source + pushed++) + } + + expect(pushed).toBeLessThan(100) + expect(output.state).toBe(HydrationScriptOutputState.Failed) + expect((output.error as Error).message).toContain('code-unit count') + scripts.cleanup() + }) + + test('applies the regular backlog guard before the initial take', () => { + const scripts = createHydrationScripts(undefined, []) + const source = 'x'.repeat(1024 * 1024) + + try { + for (let index = 0; index < 17; index++) { + scripts.pushSource(source + index) + } + + const output = scripts.claimOutput() + expect(output.state).toBe(HydrationScriptOutputState.Failed) + expect((output.error as Error).message).toContain('code-unit count') + } finally { + scripts.cleanup() + } + }) + + test('allows one oversized source but rejects a second one', () => { + const { scripts, output } = createReadyOutput() + const first = 'a'.repeat(17 * 1024 * 1024) + const second = 'b'.repeat(17 * 1024 * 1024) + + scripts.pushSource(first) + expect(output.state).not.toBe(HydrationScriptOutputState.Failed) + scripts.pushSource(second) + + expect(output.state).toBe(HydrationScriptOutputState.Failed) + expect((output.error as Error).message).toContain('code-unit count') + scripts.cleanup() + }) + + test('releases oversized-source accounting as soon as its source drains', () => { + const openingBytes = encoder.encode('', + ) + expect(output.state).toBe(HydrationScriptOutputState.Ready) + drainChunks(output) + expect(output.state).toBe(HydrationScriptOutputState.Waiting) + scripts.cleanup() + }) + + test('rejects a second consumer', () => { + const scripts = createHydrationScripts(undefined, ['boot()']) + scripts.claimOutput() + expect(() => scripts.claimOutput()).toThrow( + 'SSR hydration script output already has a consumer', + ) + scripts.cleanup() + }) + + test('rejects an output claim after the fast path owns the consumer', () => { + const scripts = createHydrationScripts(undefined) + scripts.disableHydration() + expect(scripts.reserveFastPath()).toBe(true) + expect(() => scripts.claimOutput()).toThrow( + 'SSR hydration script output already has a consumer', + ) + scripts.cleanup() + }) + + test('cleanup clears active state and does not retain a new subscriber', async () => { + const { scripts, output } = createReadyOutput() + scripts.pushSource('x'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2)) + await flushMicrotasks() + output.pullChunk() + expect(output.state).toBe(HydrationScriptOutputState.Active) + + scripts.cleanup() + + expect(output.state).toBe(HydrationScriptOutputState.Done) + expect(output.error).toBeUndefined() + expect(() => output.pullChunk()).toThrow('not ready') + const onChange = vi.fn() + const unsubscribe = output.subscribe(onChange) + scripts.pushSource('ignored()') + scripts.finish() + unsubscribe() + expect(onChange).not.toHaveBeenCalled() + }) + + test('a render timeout fails immediately while a record is Active', async () => { + vi.useFakeTimers() + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + const { scripts, output } = createReadyOutput() + const onChange = vi.fn() + output.subscribe(onChange) + + try { + scripts.pushSource('x'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2)) + await flushMicrotasks() + output.pullChunk() + expect(output.state).toBe(HydrationScriptOutputState.Active) + + scripts.startSerializationTimeout(10) + await vi.advanceTimersByTimeAsync(10) + + expect(output.state).toBe(HydrationScriptOutputState.Failed) + expect((output.error as Error).message).toContain('Serialization timeout') + expect(onChange).toHaveBeenCalled() + } finally { + scripts.cleanup() + errorSpy.mockRestore() + vi.useRealTimers() + } + }) + + test('serialization completion clears the timeout during a slow active drain', async () => { + vi.useFakeTimers() + const { scripts, output } = createReadyOutput() + + try { + scripts.pushSource('x'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2)) + await flushMicrotasks() + output.pullChunk() + expect(output.state).toBe(HydrationScriptOutputState.Active) + + scripts.startSerializationTimeout(10) + scripts.finish() + await vi.advanceTimersByTimeAsync(100) + + expect(output.state).toBe(HydrationScriptOutputState.Active) + expect(decodeChunks(drainChunks(output))).toContain('$_TSR.e()') + expect(output.state).toBe(HydrationScriptOutputState.Done) + } finally { + scripts.cleanup() + vi.useRealTimers() + } + }) +}) diff --git a/packages/router-core/tests/issue-7942-repro.test.ts b/packages/router-core/tests/issue-7942-repro.test.ts new file mode 100644 index 0000000000..116a527191 --- /dev/null +++ b/packages/router-core/tests/issue-7942-repro.test.ts @@ -0,0 +1,271 @@ +import { describe, expect, test, vi } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute, BaseRoute } from '../src' +import { MAX_HYDRATION_OUTPUT_CHUNK_BYTES } from '../src/ssr/hydrationScripts' +import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' +import { transformReadableStreamWithRouter } from '../src/ssr/transformStreamWithRouter' +import { createTestRouter } from './routerTestUtils' +import type { RouterManagedTag } from '../src/manifest' +import type { InitialHydrationScriptTags } from '../src/ssr/hydrationScripts' + +function createDeferred() { + let resolve!: (value: T) => void + const promise = new Promise((res) => { + resolve = res + }) + return { promise, resolve } +} + +function createLoaderSsrRouter(loader: () => unknown) { + const rootRoute = new BaseRootRoute({}) + const indexRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => null, + loader, + }) + + return createTestRouter({ + routeTree: rootRoute.addChildren([indexRoute]), + history: createMemoryHistory({ initialEntries: ['/'] }), + isServer: true, + }) +} + +function createManualUpstream() { + let controllerRef: ReadableStreamDefaultController | undefined + const cancelled = { value: false } + const encoder = new TextEncoder() + const stream = new ReadableStream({ + start(controller) { + controllerRef = controller + }, + cancel() { + cancelled.value = true + }, + }) + + return { + stream, + cancelled, + push(value: string) { + controllerRef!.enqueue(encoder.encode(value)) + }, + close() { + controllerRef!.close() + }, + } +} + +function renderManagedScript(tag: RouterManagedTag) { + const id = tag.attrs?.id ? ` id="${tag.attrs.id}"` : '' + return `${tag.children ?? ''}` +} + +function renderManagedScripts(tags: Array) { + return tags.map(renderManagedScript).join('') +} + +function expectInitialScripts( + scripts: InitialHydrationScriptTags | undefined, +): InitialHydrationScriptTags { + expect(scripts?.boundary.children).toContain('$tsr-stream-boundary') + expect(scripts?.boundary.attrs).not.toHaveProperty('id') + expect(scripts?.before.length).toBeGreaterThan(0) + for (const script of scripts!.before) { + expect(script.attrs?.['data-tsr-stream-part']).toBe('') + } + return scripts! +} + +async function readAll(stream: ReadableStream) { + const reader = stream.getReader() + const decoder = new TextDecoder() + const chunks: Array = [] + const chunkSizes: Array = [] + for (;;) { + const { done, value } = await reader.read() + if (done) { + chunks.push(decoder.decode()) + return { + text: chunks.join(''), + chunkSizes, + } + } + chunkSizes.push(value.byteLength) + chunks.push(decoder.decode(value, { stream: true })) + } +} + +async function waitFor(check: () => boolean) { + for (let index = 0; index < 20; index++) { + if (check()) { + return + } + await Promise.resolve() + } + throw new Error('condition was not reached') +} + +describe('issue #7942', () => { + test('eager loader data stays in the segmented initial scripts', async () => { + const router = createLoaderSsrRouter(() => ({ value: 'eager-loader-data' })) + attachRouterServerSsrUtils({ router, manifest: undefined }) + + await router.load() + await router.serverSsr!.dehydrate() + + const initialScripts = expectInitialScripts( + router.serverSsr!.takeInitialHydrationScriptTags(), + ) + expect( + initialScripts.before.some((script) => + script.children?.includes('eager-loader-data'), + ), + ).toBe(true) + expect(router.serverSsr!.takeInitialHydrationScriptTags()).toBeUndefined() + + router.serverSsr!.cleanup() + }) + + test('keeps a large eager serialization part isolated from small initial scripts', async () => { + const payload = 'initial-large-value-'.repeat(2_000) + const router = createLoaderSsrRouter(() => ({ value: payload })) + attachRouterServerSsrUtils({ router, manifest: undefined }) + + await router.load() + await router.serverSsr!.dehydrate() + + const initialScripts = expectInitialScripts( + router.serverSsr!.takeInitialHydrationScriptTags(), + ) + const streamParts = initialScripts.before + const payloadScripts = streamParts.filter((script) => + script.children?.includes(payload), + ) + + expect(payloadScripts).toHaveLength(1) + expect(streamParts.indexOf(payloadScripts[0]!)).toBeGreaterThan(0) + expect( + streamParts + .filter((script) => script !== payloadScripts[0]) + .every((script) => !script.children?.includes(payload)), + ).toBe(true) + + router.serverSsr!.cleanup() + }) + + test('streams a large deferred loader result in bounded chunks after the next safe boundary', async () => { + const deferred = createDeferred() + const router = createLoaderSsrRouter(() => ({ value: deferred.promise })) + attachRouterServerSsrUtils({ router, manifest: undefined }) + + await router.load() + await router.serverSsr!.dehydrate() + + const initialScripts = expectInitialScripts( + router.serverSsr!.takeInitialHydrationScriptTags(), + ) + const liftBarrier = vi.spyOn( + router.serverSsr!.hydrationScripts, + 'liftBarrier', + ) + const upstream = createManualUpstream() + const output = transformReadableStreamWithRouter(router, upstream.stream) + const outputPromise = readAll(output) + + const appShell = + `${renderManagedScripts([ + ...initialScripts.before, + initialScripts.boundary, + ])}` + `
app
` + expect(appShell.length).toBeLessThan(MAX_HYDRATION_OUTPUT_CHUNK_BYTES) + upstream.push(appShell) + await waitFor(() => liftBarrier.mock.calls.length === 1) + + const payload = 'x'.repeat(17 * 1024 * 1024) + deferred.resolve(payload) + + const tail = '' + upstream.push(tail) + upstream.close() + + const result = await outputPromise + const renderedInitialScripts = renderManagedScripts([ + ...initialScripts.before, + initialScripts.boundary, + ]) + const earliestInjectionOffset = + ''.length + renderedInitialScripts.length + const payloadOffset = result.text.indexOf(payload) + const injectedStart = result.text.lastIndexOf('' + const injectedEnd = + result.text.lastIndexOf(dynamicClose) + dynamicClose.length + expect(payloadOffset).toBeGreaterThan(injectedStart) + expect(injectedStart).toBeGreaterThanOrEqual(earliestInjectionOffset) + expect(injectedStart).toBeLessThanOrEqual(appShell.length) + expect(injectedEnd).toBeGreaterThan(payloadOffset) + expect( + result.text.slice(0, injectedStart) + result.text.slice(injectedEnd), + ).toBe(appShell + tail) + expect(result.text.endsWith(tail)).toBe(true) + expect(Math.max(...result.chunkSizes)).toBeLessThanOrEqual( + MAX_HYDRATION_OUTPUT_CHUNK_BYTES, + ) + expect(upstream.cancelled.value).toBe(false) + expect(router.serverSsr).toBeUndefined() + }) + + test('rejects multiple router fragments that genuinely accumulate past the guard', async () => { + const payloadCharsPerValue = 1024 * 1024 + const deferredValues = Array.from({ length: 17 }, () => + createDeferred(), + ) + const router = createLoaderSsrRouter(() => ({ + values: deferredValues.map((deferred) => deferred.promise), + })) + attachRouterServerSsrUtils({ router, manifest: undefined }) + + await router.load() + await router.serverSsr!.dehydrate() + + const initialScripts = expectInitialScripts( + router.serverSsr!.takeInitialHydrationScriptTags(), + ) + + const liftBarrier = vi.spyOn( + router.serverSsr!.hydrationScripts, + 'liftBarrier', + ) + const upstream = createManualUpstream() + const output = transformReadableStreamWithRouter(router, upstream.stream) + const outputResult = readAll(output).then( + (value) => ({ value, error: undefined }), + (error: unknown) => ({ value: undefined, error }), + ) + + upstream.push( + `${renderManagedScripts([ + ...initialScripts.before, + initialScripts.boundary, + ])}
app
`, + ) + await waitFor(() => liftBarrier.mock.calls.length === 1) + + for (let index = 0; index < deferredValues.length; index++) { + deferredValues[index]!.resolve( + `${index}:` + 'y'.repeat(payloadCharsPerValue), + ) + } + + const result = await outputResult + expect(result.value).toBeUndefined() + expect(result.error).toBeInstanceOf(Error) + expect((result.error as Error).message).toContain( + 'SSR hydration backlog exceeded maximum code-unit count', + ) + expect(upstream.cancelled.value).toBe(true) + expect(router.serverSsr).toBeUndefined() + }) +}) diff --git a/packages/router-core/tests/load-client-wait-for.test.ts b/packages/router-core/tests/load-client-wait-for.test.ts index 9ae49b89bd..fdf5397a16 100644 --- a/packages/router-core/tests/load-client-wait-for.test.ts +++ b/packages/router-core/tests/load-client-wait-for.test.ts @@ -1,7 +1,11 @@ import { describe, expect, test, vi } from 'vitest' import { waitForReason } from '../src/await-signal' import { waitFor } from '../src/load-client' -import { waitForRequest } from '../src/ssr/createRequestHandler' +import { waitForRequest } from '../src/ssr/server' + +test('waitForRequest aliases waitForReason through the server barrel', () => { + expect(waitForRequest).toBe(waitForReason) +}) describe('waitFor', () => { test.each(['resolve', 'reject'] as const)( @@ -99,40 +103,49 @@ describe('waitFor', () => { }) }) -describe('waitForRequest', () => { - test('shares one abort listener across concurrent and sequential waits', async () => { +describe('waitForReason', () => { + test('handles nested abort dispatch before its listener runs', async () => { + const source = new AbortController() + const nested = new AbortController() + const signal = AbortSignal.any([source.signal]) + signal.addEventListener('abort', () => nested.abort()) + + const reason = new Error('request canceled') + const result = waitForReason(Promise.resolve('late'), signal) + source.abort(reason) + + await expect(result).rejects.toBe(reason) + }) + + test('removes its abort listener once the wait settles', async () => { const controller = new AbortController() const addEventListener = vi.spyOn(controller.signal, 'addEventListener') + const removeEventListener = vi.spyOn( + controller.signal, + 'removeEventListener', + ) let resolveFirst!: (value: string) => void - let resolveSecond!: (value: string) => void - let resolveThird!: (value: string) => void + let rejectSecond!: (error: unknown) => void const first = new Promise((resolve) => { resolveFirst = resolve }) - const second = new Promise((resolve) => { - resolveSecond = resolve - }) - const third = new Promise((resolve) => { - resolveThird = resolve + const second = new Promise((_resolve, reject) => { + rejectSecond = reject }) - const firstResult = waitForRequest(first, controller.signal) - const secondResult = waitForRequest(second, controller.signal) + const firstResult = waitForReason(first, controller.signal) + const secondResult = waitForReason(second, controller.signal) + expect(addEventListener).toHaveBeenCalledTimes(2) - expect(addEventListener).toHaveBeenCalledTimes(1) resolveFirst('first') - resolveSecond('second') await expect(firstResult).resolves.toBe('first') - await expect(secondResult).resolves.toBe('second') + const failure = new Error('wait failed') + rejectSecond(failure) + await expect(secondResult).rejects.toBe(failure) - const thirdResult = waitForRequest(third, controller.signal) - expect(addEventListener).toHaveBeenCalledTimes(1) - - const reason = new Error('request canceled') - controller.abort(reason) - await expect(thirdResult).rejects.toBe(reason) - resolveThird('third') - await Promise.resolve() + for (const [, listener] of addEventListener.mock.calls) { + expect(removeEventListener).toHaveBeenCalledWith('abort', listener) + } }) test('rejects all active waits and observes their late values', async () => { @@ -148,8 +161,8 @@ describe('waitForRequest', () => { const second = new Promise((resolve) => { resolveSecond = resolve }) - const firstResult = waitForRequest(first, controller.signal, onFirstLate) - const secondResult = waitForRequest(second, controller.signal, onSecondLate) + const firstResult = waitForReason(first, controller.signal, onFirstLate) + const secondResult = waitForReason(second, controller.signal, onSecondLate) controller.abort(reason) await expect(firstResult).rejects.toBe(reason) @@ -167,7 +180,9 @@ describe('waitForRequest', () => { const controller = new AbortController() const reason = new Error('request canceled') const failure = new Error('wait failed') + const lateFailure = new Error('late failure') const onLate = vi.fn() + const onLateError = vi.fn() let resolveFirst!: (value: string) => void let rejectSecond!: (error: Error) => void let rejectThird!: (error: Error) => void @@ -180,9 +195,14 @@ describe('waitForRequest', () => { const third = new Promise((_, reject) => { rejectThird = reject }) - const firstResult = waitForRequest(first, controller.signal, onLate) - const secondResult = waitForRequest(second, controller.signal) - const thirdResult = waitForRequest(third, controller.signal) + const firstResult = waitForReason(first, controller.signal, onLate) + const secondResult = waitForReason(second, controller.signal) + const thirdResult = waitForReason( + third, + controller.signal, + undefined, + onLateError, + ) rejectSecond(failure) await expect(secondResult).rejects.toBe(failure) @@ -192,11 +212,14 @@ describe('waitForRequest', () => { await expect(thirdResult).rejects.toBe(reason) resolveFirst('late') - rejectThird(new Error('late failure')) - await vi.waitFor(() => expect(onLate).toHaveBeenCalledWith('late')) + rejectThird(lateFailure) + await vi.waitFor(() => { + expect(onLate).toHaveBeenCalledWith('late') + expect(onLateError).toHaveBeenCalledWith(lateFailure) + }) }) - test('isolates waits for different request signals', async () => { + test('isolates waits for different signals', async () => { const firstController = new AbortController() const secondController = new AbortController() const firstReason = new Error('first request canceled') @@ -216,8 +239,8 @@ describe('waitForRequest', () => { const second = new Promise((resolve) => { resolveSecond = resolve }) - const firstResult = waitForRequest(first, firstController.signal) - const secondResult = waitForRequest(second, secondController.signal) + const firstResult = waitForReason(first, firstController.signal) + const secondResult = waitForReason(second, secondController.signal) expect(firstAddEventListener).toHaveBeenCalledOnce() expect(secondAddEventListener).toHaveBeenCalledOnce() @@ -236,16 +259,25 @@ describe('waitForRequest', () => { const reason = new Error('request canceled') const lateError = new Error('late failure') const onLate = vi.fn() + const onLateError = vi.fn() controller.abort(reason) await expect( - waitForRequest(Promise.resolve('late'), controller.signal, onLate), + waitForReason(Promise.resolve('late'), controller.signal, onLate), ).rejects.toBe(reason) await expect( - waitForRequest(Promise.reject(lateError), controller.signal), + waitForReason( + Promise.reject(lateError), + controller.signal, + undefined, + onLateError, + ), ).rejects.toBe(reason) - await vi.waitFor(() => expect(onLate).toHaveBeenCalledWith('late')) + await vi.waitFor(() => { + expect(onLate).toHaveBeenCalledWith('late') + expect(onLateError).toHaveBeenCalledWith(lateError) + }) }) test('handles an abort during listener registration', async () => { @@ -266,10 +298,80 @@ describe('waitForRequest', () => { resolve = resolveValue }) - const result = waitForRequest(value, controller.signal, onLate) + const result = waitForReason(value, controller.signal, onLate) await expect(result).rejects.toBe(reason) resolve('late') await vi.waitFor(() => expect(onLate).toHaveBeenCalledWith('late')) }) + + test('observes errors from late callbacks', async () => { + const unhandled: Array = [] + const onUnhandled = (error: unknown) => { + unhandled.push(error) + } + process.on('unhandledRejection', onUnhandled) + + try { + const reason = new Error('request canceled') + const thrownError = new Error('late callback threw') + const rejectedError = new Error('late callback rejected') + const throwLate = vi.fn(() => { + throw thrownError + }) + const rejectLate = vi.fn(() => { + return Promise.reject(rejectedError) + }) + const expectCanceled = (promise: Promise) => { + return expect(promise).rejects.toBe(reason) + } + const alreadyAborted = new AbortController() + alreadyAborted.abort(reason) + + await Promise.all([ + expectCanceled( + waitForReason( + Promise.resolve('late'), + alreadyAborted.signal, + throwLate, + ), + ), + expectCanceled( + waitForReason( + Promise.reject(new Error('late failure')), + alreadyAborted.signal, + undefined, + rejectLate, + ), + ), + ]) + + const controller = new AbortController() + const fulfilledWait = waitForReason( + Promise.resolve('late'), + controller.signal, + rejectLate, + ) + const rejectedWait = waitForReason( + Promise.reject(new Error('late failure')), + controller.signal, + undefined, + throwLate, + ) + controller.abort(reason) + + await Promise.all([ + expectCanceled(fulfilledWait), + expectCanceled(rejectedWait), + ]) + await new Promise((resolve) => setTimeout(resolve, 0)) + + expect(throwLate).toHaveBeenCalledTimes(2) + expect(rejectLate).toHaveBeenCalledTimes(2) + expect(unhandled).not.toContain(thrownError) + expect(unhandled).not.toContain(rejectedError) + } finally { + process.off('unhandledRejection', onUnhandled) + } + }) }) diff --git a/packages/router-core/tests/public-hydration-contract.test.ts b/packages/router-core/tests/public-hydration-contract.test.ts index c593bdf020..aea458b3f5 100644 --- a/packages/router-core/tests/public-hydration-contract.test.ts +++ b/packages/router-core/tests/public-hydration-contract.test.ts @@ -1,4 +1,3 @@ -import { runInNewContext } from 'node:vm' import { afterEach, beforeEach, @@ -16,37 +15,15 @@ import { redirect, } from '../src' import { hydrate } from '../src/ssr/client' -import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' import { dehydrateSsrMatchId } from '../src/ssr/ssr-match-id' -import { createTestRouter } from './routerTestUtils' -import type { AnyRouteMatch, AnyRouter, LocationRewrite } from '../src' +import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' +import type { AnyRouteMatch, LocationRewrite } from '../src' import type { DehydratedRouter, TsrSsrGlobal } from '../src/ssr/types' import type { ServerManifest } from '../src/manifest' const testManifest: ServerManifest = { routes: {} } const browserWindow = window -async function dehydrateToBootstrap(router: AnyRouter): Promise { - attachRouterServerSsrUtils({ router, manifest: testManifest }) - try { - await router.load() - await router.serverSsr!.dehydrate() - - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - - const context: Record = { - document: { currentScript: { remove() {} } }, - } - context.self = context - runInNewContext(script!.children!, context) - - return context.$_TSR - } finally { - router.serverSsr?.cleanup() - } -} - function installHydrationPayload( mockWindow: { $_TSR?: TsrSsrGlobal }, matches: DehydratedRouter['matches'], @@ -155,7 +132,7 @@ describe('public hydration contracts', () => { }), isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter) + const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) expect(bootstrap.router?.matches).toHaveLength(2) expect(bootstrap.router?.matches.at(-1)).toMatchObject({ s: 'pending', @@ -241,7 +218,7 @@ describe('public hydration contracts', () => { history: createMemoryHistory({ initialEntries: ['/client-only/child'] }), isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter) + const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) const contextLanes: Array> = [] const headLanes: Array> = [] @@ -567,7 +544,7 @@ describe('public hydration contracts', () => { history: createMemoryHistory({ initialEntries: ['/page'] }), isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter) + const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) const head = vi.fn(({ loaderData }) => ({ meta: [{ title: String(loaderData) }], @@ -646,7 +623,7 @@ describe('public hydration contracts', () => { history: createMemoryHistory({ initialEntries: ['/parent/child'] }), isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter) + const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) expect(serverParentBeforeLoad).toHaveBeenCalledTimes(1) expect(serverChildBeforeLoad).toHaveBeenCalledTimes(1) @@ -729,7 +706,7 @@ describe('public hydration contracts', () => { history: createMemoryHistory({ initialEntries: ['/page'] }), isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter) + const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) const transportedError = bootstrap.router?.matches.at(-1)?.e expect(transportedError).toMatchObject({ @@ -1408,7 +1385,7 @@ describe('public hydration contracts', () => { history: createMemoryHistory({ initialEntries: ['/page'] }), isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter) + const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) const transportedError = bootstrap.router?.matches.at(-1)?.e const clientContextError = new Error('client context failed') diff --git a/packages/router-core/tests/routerTestUtils.ts b/packages/router-core/tests/routerTestUtils.ts index 490eacdb33..79a4122c74 100644 --- a/packages/router-core/tests/routerTestUtils.ts +++ b/packages/router-core/tests/routerTestUtils.ts @@ -1,9 +1,11 @@ +import { runInNewContext } from 'node:vm' +import { expect } from 'vitest' import { batch, createAtom } from '@tanstack/store' import { createMemoryHistory } from '@tanstack/history' import { isServer } from '@tanstack/router-core/isServer' import { - RouterCore, BaseRootRoute, + RouterCore, createNonReactiveMutableStore, createNonReactiveReadonlyStore, } from '../src' @@ -14,12 +16,15 @@ import { parseSegment, processRouteTree, } from '../src/new-process-route-tree' +import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' import type { interpolatePath } from '../src/path' import type { SegmentKind } from '../src/new-process-route-tree' +import type { ServerManifest } from '../src/manifest' +import type { TsrSsrGlobal } from '../src/ssr/types' import type { RouterHistory } from '@tanstack/history' import type { - AnyRouter, AnyRoute, + AnyRouter, GetStoreConfig, RouterConstructorOptions, RouterOptions, @@ -179,3 +184,38 @@ export function loadServerResponse( }) }) } + +export async function dehydrateToBootstrap( + router: AnyRouter, + manifest: ServerManifest, +): Promise { + attachRouterServerSsrUtils({ router, manifest }) + try { + await router.load() + await router.serverSsr!.dehydrate() + + const scripts = router.serverSsr!.takeInitialHydrationScriptTags() + expect(scripts?.before.length).toBeGreaterThan(0) + expect(scripts?.boundary.children).toContain('$tsr-stream-boundary') + expect(scripts?.boundary.attrs).not.toHaveProperty('id') + + const context: Record = { + document: { + currentScript: { + remove() {}, + }, + }, + } + context.self = context + for (const script of scripts!.before) { + expect(script.attrs?.['data-tsr-stream-part']).toBe('') + expect(script.children).toBeTruthy() + runInNewContext(script.children!, context) + } + + expect(context.$_TSR).toBeDefined() + return context.$_TSR + } finally { + router.serverSsr?.cleanup() + } +} diff --git a/packages/router-core/tests/server-loader-abort-error.test.ts b/packages/router-core/tests/server-loader-abort-error.test.ts index bc079ce239..e3b5d3c3ef 100644 --- a/packages/router-core/tests/server-loader-abort-error.test.ts +++ b/packages/router-core/tests/server-loader-abort-error.test.ts @@ -1,25 +1,36 @@ import { describe, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, BaseRoute, createControlledPromise } from '../src' +import { + BaseRootRoute, + BaseRoute, + createControlledPromise, + redirect, +} from '../src' import { createRequestHandler } from '../src/ssr/server' import { createTestRouter, loadServerResponse } from './routerTestUtils' describe('loader user-thrown abort values', () => { - test.each( - ([false, true] as const).flatMap((isServer) => [ - { - isServer, - thrownType: 'AbortSignal', - createThrownValue: (signal: AbortSignal) => signal, - }, - { - isServer, - thrownType: 'AbortError', - createThrownValue: () => - new DOMException('The operation was aborted.', 'AbortError'), - }, - ]), - )( + test.each([ + { + isServer: false, + thrownType: 'AbortSignal', + createThrownValue: (signal: AbortSignal) => signal, + }, + { + isServer: false, + thrownType: 'AbortError', + createThrownValue: () => + new DOMException('The operation was aborted.', 'AbortError'), + }, + { + isServer: true, + thrownType: 'AbortError', + createThrownValue: () => + Object.assign(new Error('The operation was aborted.'), { + name: 'AbortError', + }), + }, + ])( 'treats a user-thrown $thrownType as an ordinary route error (isServer=$isServer)', async ({ isServer, createThrownValue }) => { let matchSignal: AbortSignal | undefined @@ -50,9 +61,9 @@ describe('loader user-thrown abort values', () => { const match = router.state.matches.find( (item) => item.routeId === abortingRoute.id, ) - // A server match remains ordinary route failure during reduction, then - // its controller is retired when the request response is cleaned up. - expect(matchSignal?.aborted).toBe(isServer) + // A server match remains ordinary route failure during reduction. Its + // controller is left alone: the payload finished, so nothing is pending. + expect(matchSignal?.aborted).toBe(false) expect(match?.status).toBe('error') expect(match?.error).toBe(thrownValue) }, @@ -115,7 +126,7 @@ describe('loader user-thrown abort values', () => { expect(render).not.toHaveBeenCalled() }) - test('response cleanup aborts the controller retained by deferred loader data', async () => { + test('response cleanup aborts deferred loader data with a shared AbortError reason', async () => { const deferred = createControlledPromise() let loaderSignal: AbortSignal | undefined const rootRoute = new BaseRootRoute({}) @@ -137,7 +148,66 @@ describe('loader user-thrown abort values', () => { expect(response.status).toBe(200) expect(loaderSignal?.aborted).toBe(true) + const firstReason = loaderSignal?.reason + expect(firstReason).toMatchObject({ + name: 'AbortError', + message: expect.stringContaining('settled'), + }) + expect(firstReason).not.toBeInstanceOf(DOMException) + + const nextDeferred = createControlledPromise() + const nextRootRoute = new BaseRootRoute({}) + const nextRouter = createTestRouter({ + routeTree: nextRootRoute.addChildren([ + new BaseRoute({ + getParentRoute: () => nextRootRoute, + path: '/next', + loader: ({ abortController }) => { + loaderSignal = abortController.signal + return { deferred: nextDeferred } + }, + }), + ]), + history: createMemoryHistory({ initialEntries: ['/next'] }), + isServer: true, + }) + + const nextResponse = await loadServerResponse(nextRouter, '/next') + + expect(nextResponse.status).toBe(200) + expect(loaderSignal?.reason).toBe(firstReason) deferred.resolve('late data') + nextDeferred.resolve('late data') + }) + + test('redirect aborts match controllers with an AbortError-shaped reason', async () => { + let loaderSignal: AbortSignal | undefined + const rootRoute = new BaseRootRoute() + const sourceRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/source', + loader: ({ abortController }) => { + loaderSignal = abortController.signal + return redirect({ + href: 'https://other.example/ignored', + headers: { Location: '/target' }, + }) + }, + }) + const router = createTestRouter({ + routeTree: rootRoute.addChildren([sourceRoute]), + isServer: true, + }) + + const response = await loadServerResponse(router, '/source') + + expect(response.status).toBe(307) + expect(loaderSignal?.aborted).toBe(true) + expect(loaderSignal?.reason).toMatchObject({ + name: 'AbortError', + message: expect.stringContaining('redirect'), + }) + expect(loaderSignal?.reason).not.toHaveProperty('matches') }) test('request cancellation thrown from route context does not call onError', async () => { @@ -228,15 +298,17 @@ describe('loader user-thrown abort values', () => { path: '/work', loader, }) - const router = createTestRouter({ - routeTree: rootRoute.addChildren([route]), - history: createMemoryHistory({ initialEntries: ['/work'] }), - isServer: true, - }) + const createRouter = vi.fn(() => + createTestRouter({ + routeTree: rootRoute.addChildren([route]), + history: createMemoryHistory({ initialEntries: ['/work'] }), + isServer: true, + }), + ) const requestController = new AbortController() const render = vi.fn(() => new Response('must not render')) const handler = createRequestHandler({ - createRouter: () => router, + createRouter, request: new Request('http://localhost/work', { signal: requestController.signal, }), @@ -252,10 +324,39 @@ describe('loader user-thrown abort values', () => { requestController.abort(cancellation) await expect(response).rejects.toBe(cancellation) + expect(createRouter).not.toHaveBeenCalled() expect(loader).not.toHaveBeenCalled() expect(render).not.toHaveBeenCalled() }) + test('request cancellation wins after manifest lookup resolves', async () => { + const rootRoute = new BaseRootRoute({}) + const createRouter = vi.fn(() => + createTestRouter({ + routeTree: rootRoute, + history: createMemoryHistory({ initialEntries: ['/'] }), + isServer: true, + }), + ) + const requestController = new AbortController() + const render = vi.fn(() => new Response('must not render')) + const handler = createRequestHandler({ + createRouter, + request: new Request('http://localhost/', { + signal: requestController.signal, + }), + getRouterManifest: () => Promise.resolve({ routes: {} }), + }) + + const response = handler(render) + const cancellation = new Error('request disconnected') + queueMicrotask(() => requestController.abort(cancellation)) + + await expect(response).rejects.toBe(cancellation) + expect(createRouter).not.toHaveBeenCalled() + expect(render).not.toHaveBeenCalled() + }) + test('request cancellation does not wait for custom dehydration', async () => { const dehydrateStarted = createControlledPromise() const dehydrate = createControlledPromise() diff --git a/packages/router-core/tests/ssr-server-cleanup.test.ts b/packages/router-core/tests/ssr-server-cleanup.test.ts index a4d0b96588..84e718812c 100644 --- a/packages/router-core/tests/ssr-server-cleanup.test.ts +++ b/packages/router-core/tests/ssr-server-cleanup.test.ts @@ -1,14 +1,36 @@ +import { runInNewContext } from 'node:vm' import { createMemoryHistory } from '@tanstack/history' -import { afterEach, describe, expect, onTestFinished, test, vi } from 'vitest' -import { BaseRootRoute, BaseRoute } from '../src' +import { createStream } from 'seroval' +import { afterEach, describe, expect, test, vi } from 'vitest' +import { BaseRootRoute, BaseRoute, RawStream } from '../src' import { createRequestHandler } from '../src/ssr/createRequestHandler' import { bindSsrResponseToRequest, createSsrStreamResponse, } from '../src/ssr/handlerCallback' +import { + HYDRATION_SCRIPT_BOUNDARY_BYTES, + HydrationScriptOutputState, + createHydrationScripts, +} from '../src/ssr/hydrationScripts' import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' -import { transformStreamWithRouter } from '../src/ssr/transformStreamWithRouter' +import { + transformHtmlStringWithRouter, + transformReadableStreamWithRouter, +} from '../src/ssr/transformStreamWithRouter' import { createTestRouter } from './routerTestUtils' +import type { + HydrationScriptOutput, + InitialHydrationScriptTags, +} from '../src/ssr/hydrationScripts' + +type HydrationScripts = ReturnType +const HYDRATION_SCRIPT_BOUNDARY_SUFFIX = new TextDecoder().decode( + HYDRATION_SCRIPT_BOUNDARY_BYTES, +) +const HYDRATION_SCRIPT_BOUNDARY_SOURCE = + `document.currentScript.remove()` + + HYDRATION_SCRIPT_BOUNDARY_SUFFIX.slice(0, -''.length) /** * CI-stable tests for the SSR cleanup contract. These do not rely on GC @@ -45,20 +67,53 @@ afterEach(() => { vi.restoreAllMocks() }) +function renderInitialScripts(scripts: InitialHydrationScriptTags) { + return [...scripts.before, scripts.boundary] + .map((script) => { + const id = script.attrs?.id ? ` id="${script.attrs.id}"` : '' + return `${script.children ?? ''}` + }) + .join('') +} + +async function waitFor(check: () => boolean) { + for (let index = 0; index < 20; index++) { + if (check()) { + return + } + await Promise.resolve() + } + throw new Error('condition was not reached') +} + +function drainHydrationOutput(output: HydrationScriptOutput) { + const decoder = new TextDecoder() + let text = '' + while ( + output.state === HydrationScriptOutputState.Ready || + output.state === HydrationScriptOutputState.Active + ) { + text += decoder.decode(output.pullChunk(), { stream: true }) + } + return text + decoder.decode() +} + describe('serverSsr.cleanup', () => { test('onCleanup listeners run exactly once', () => { const router = buildRouter() attachRouterServerSsrUtils({ router, manifest: undefined }) + const serverSsr = router.serverSsr! let calls = 0 - router.serverSsr!.onCleanup(() => { + serverSsr.onCleanup(() => { calls++ }) - router.serverSsr!.cleanup() - // Second call: serverSsr is undefined now, must short-circuit safely. - router.serverSsr?.cleanup() + serverSsr.cleanup() + serverSsr.cleanup() expect(calls).toBe(1) + expect(router.ssr).toBeUndefined() + expect(router.serverSsr).toBeUndefined() }) test('listener that re-enters cleanup() does not re-fire siblings', () => { @@ -113,6 +168,148 @@ describe('serverSsr.cleanup', () => { expect(router.serverSsr).toBeUndefined() }) + test('cleanup cancels and unlocks a pending RawStream reader', async () => { + const pullStarted = deferred() + let cancelCalls = 0 + const stream = new ReadableStream( + { + pull() { + pullStarted.resolve() + return new Promise(() => {}) + }, + cancel() { + cancelCalls++ + return new Promise(() => {}) + }, + }, + { highWaterMark: 0 }, + ) + const router = buildRouter({ value: new RawStream(stream) }) + attachRouterServerSsrUtils({ router, manifest: undefined }) + + await router.load() + const serverSsr = router.serverSsr! + await serverSsr.dehydrate() + await pullStarted.promise + expect(stream.locked).toBe(true) + + serverSsr.cleanup() + expect(cancelCalls).toBe(1) + expect(stream.locked).toBe(false) + + serverSsr.cleanup() + expect(cancelCalls).toBe(1) + expect(router.ssr).toBeUndefined() + expect(router.serverSsr).toBeUndefined() + }) + + test('hydration output notifies once before cleanup', async () => { + const value = deferred() + const router = buildRouter({ value: value.promise }) + attachRouterServerSsrUtils({ router, manifest: undefined }) + await router.load() + const serverSsr = router.serverSsr! + await serverSsr.dehydrate() + serverSsr.takeInitialHydrationScriptTags() + const output = serverSsr.hydrationScripts.claimOutput() + let calls = 0 + output.subscribe(() => { + calls++ + }) + + serverSsr.hydrationScripts.liftBarrier() + value.resolve('done') + await waitFor(() => output.state === HydrationScriptOutputState.Ready) + expect(calls).toBe(1) + serverSsr.cleanup() + await Promise.resolve() + + expect(calls).toBe(1) + expect(output.state).toBe(HydrationScriptOutputState.Done) + expect(router.serverSsr).toBeUndefined() + }) + + test('cleanup stops work from late serialization values', async () => { + const value = deferred() + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + const router = buildRouter({ value: value.promise }) + + try { + attachRouterServerSsrUtils({ router, manifest: undefined }) + await router.load() + await router.serverSsr!.dehydrate() + router.serverSsr!.cleanup() + + value.resolve(() => {}) + await Promise.resolve() + await Promise.resolve() + + expect(errorSpy).not.toHaveBeenCalled() + } finally { + router.serverSsr?.cleanup() + errorSpy.mockRestore() + } + }) + + test('cleanup while custom dehydration waits does not start serialization', async () => { + const dehydratedData = deferred>() + const router = buildRouter() + router.options.dehydrate = () => dehydratedData.promise + attachRouterServerSsrUtils({ router, manifest: undefined }) + + await router.load() + const serverSsr = router.serverSsr! + const dehydration = serverSsr.dehydrate() + + serverSsr.cleanup() + dehydratedData.resolve({ late: 'ignored' }) + await dehydration + + expect(router.serverSsr).toBeUndefined() + }) + + test('request abort unwinds an argument-free custom dehydration hook', async () => { + const abortController = new AbortController() + const reason = new Error('request-aborted') + const dehydratedData = deferred>() + const router = buildRouter() + const dehydrate = vi.fn(() => dehydratedData.promise) + router.options.dehydrate = dehydrate + attachRouterServerSsrUtils({ router, manifest: undefined }) + + await router.load() + const dehydration = router.serverSsr!.dehydrate({ + signal: abortController.signal, + }) + expect(dehydrate).toHaveBeenCalledWith() + abortController.abort(reason) + + await expect(dehydration).rejects.toBe(reason) + router.serverSsr?.cleanup() + dehydratedData.resolve({ late: 'ignored' }) + }) + + test('request abort stops dehydration after an already-settled custom hook', async () => { + const abortController = new AbortController() + const reason = new Error('request-aborted') + const router = buildRouter() + router.options.dehydrate = () => Promise.resolve({ ready: true }) + attachRouterServerSsrUtils({ router, manifest: undefined }) + + await router.load() + const serverSsr = router.serverSsr! + const scripts = serverSsr.hydrationScripts as HydrationScripts + const pushSerializedSource = vi.spyOn(scripts, 'pushSerializedSource') + const dehydration = serverSsr.dehydrate({ + signal: abortController.signal, + }) + queueMicrotask(() => abortController.abort(reason)) + + await expect(dehydration).rejects.toBe(reason) + expect(pushSerializedSource).not.toHaveBeenCalled() + serverSsr.cleanup() + }) + test('serialization completion does not clear render-finished listeners', async () => { const value = deferred() const router = buildRouter({ value: value.promise }) @@ -126,12 +323,14 @@ describe('serverSsr.cleanup', () => { renderFinishedCalls++ }) - const serializationDone = new Promise((resolve) => { - router.serverSsr!.onSerializationFinished(resolve) - }) + router.serverSsr!.takeInitialHydrationScriptTags() + const output = router.serverSsr!.hydrationScripts.claimOutput() + router.serverSsr!.hydrationScripts.liftBarrier() value.resolve('done') - await serializationDone + await waitFor(() => output.state === HydrationScriptOutputState.Ready) + drainHydrationOutput(output) + expect(output.state).toBe(HydrationScriptOutputState.Done) expect(renderFinishedCalls).toBe(0) router.serverSsr!.setRenderFinished() @@ -140,6 +339,39 @@ describe('serverSsr.cleanup', () => { router.serverSsr?.cleanup() }) + test('waits for the initial record after a completed Seroval stream', async () => { + const completedStream = createStream() + completedStream.next('stream value') + completedStream.return('stream done') + const lateValue = deferred() + const router = buildRouter({ + completedStream, + lateValue: lateValue.promise, + }) + attachRouterServerSsrUtils({ router, manifest: undefined }) + + await router.load() + const serverSsr = router.serverSsr! + await serverSsr.dehydrate() + const initialHydration = renderInitialScripts( + serverSsr.takeInitialHydrationScriptTags()!, + ) + expect(initialHydration).toContain('stream value') + + const output = serverSsr.hydrationScripts.claimOutput() + serverSsr.setRenderFinished() + expect(output.state).toBe(HydrationScriptOutputState.Waiting) + + lateValue.resolve('late value') + await waitFor(() => output.state === HydrationScriptOutputState.Ready) + const hydration = drainHydrationOutput(output) + expect(hydration).toContain('late value') + expect(hydration).toContain('$_TSR.e()') + expect(output.state).toBe(HydrationScriptOutputState.Done) + + serverSsr.cleanup() + }) + test('render-finished listeners can synchronously finish serialization', async () => { const value = deferred() const router = buildRouter({ value: value.promise }) @@ -147,57 +379,190 @@ describe('serverSsr.cleanup', () => { await router.load() await router.serverSsr!.dehydrate() - router.serverSsr!.takeBufferedScripts() + router.serverSsr!.takeInitialHydrationScriptTags() + const output = router.serverSsr!.hydrationScripts.claimOutput() router.serverSsr!.onRenderFinished(() => { value.resolve('done') }) - const serializationDone = new Promise((resolve) => { - router.serverSsr!.onSerializationFinished(resolve) - }) router.serverSsr!.setRenderFinished() - await serializationDone + await waitFor(() => output.state === HydrationScriptOutputState.Ready) - expect(router.serverSsr!.takeBufferedHtml()).toContain('$_TSR.e()') + expect(drainHydrationOutput(output)).toContain('$_TSR.e()') + expect(output.state).toBe(HydrationScriptOutputState.Done) router.serverSsr?.cleanup() }) - test('late serialization listener runs safely and returns unsubscribe', async () => { + test('render-finished is one-shot and invokes late listeners immediately', () => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + const serverSsr = router.serverSsr! + const earlyListener = vi.fn() + const lateListener = vi.fn() + + serverSsr.onRenderFinished(earlyListener) + serverSsr.setRenderFinished() + serverSsr.setRenderFinished() + serverSsr.onRenderFinished(lateListener) + serverSsr.setRenderFinished() + + expect(earlyListener).toHaveBeenCalledOnce() + expect(lateListener).toHaveBeenCalledOnce() + serverSsr.cleanup() + }) + + test('a late output claim exposes completed serialization', async () => { const router = buildRouter() attachRouterServerSsrUtils({ router, manifest: undefined }) await router.load() await router.serverSsr!.dehydrate() + router.serverSsr!.takeInitialHydrationScriptTags() + const output = router.serverSsr!.hydrationScripts.claimOutput() let calls = 0 - const unsubscribe = router.serverSsr!.onSerializationFinished(() => { + const unsubscribe = output.subscribe(() => { calls++ }) - expect(calls).toBe(1) + expect(output.state).toBe(HydrationScriptOutputState.Done) + expect(calls).toBe(0) expect(() => unsubscribe()).not.toThrow() router.serverSsr?.cleanup() }) - test('stream fast path only reserves when no SSR work is pending', async () => { + test('stream pass-through only reserves when no SSR work is pending', async () => { const router = buildRouter() attachRouterServerSsrUtils({ router, manifest: undefined }) await router.load() await router.serverSsr!.dehydrate() - const barrierScript = router.serverSsr!.takeBufferedScripts() - expect(barrierScript).toBeDefined() + const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags() + expect(initialScripts?.boundary.children).toBe( + HYDRATION_SCRIPT_BOUNDARY_SOURCE, + ) + expect(initialScripts?.boundary.attrs).not.toHaveProperty('id') + expect(router.serverSsr!.hydrationScripts.reserveFastPath()).toBe(true) + let renderFinishedCalls = 0 + router.serverSsr!.onRenderFinished(() => { + renderFinishedCalls++ + }) router.serverSsr!.setRenderFinished() - expect(router.serverSsr!.reserveStreamFastPath()).toBe(true) - expect(router.serverSsr!.reserveStreamFastPath()).toBe(false) + expect(renderFinishedCalls).toBe(1) + expect(router.serverSsr!.hydrationScripts.reserveFastPath()).toBe(false) router.serverSsr?.cleanup() }) - test('stream fast path rejects while SSR work is pending', async () => { + test('initial boundary ends with the exact scanner suffix', async () => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + + await router.load() + await router.serverSsr!.dehydrate() + const scripts = router.serverSsr!.takeInitialHydrationScriptTags()! + const boundaryHtml = renderInitialScripts({ + before: [], + boundary: scripts.boundary, + }) + + expect(boundaryHtml).toBe( + ``, + ) + expect(boundaryHtml.endsWith(HYDRATION_SCRIPT_BOUNDARY_SUFFIX)).toBe(true) + + router.serverSsr?.cleanup() + }) + + test('the final hydration tag cleans adjacent parts before adapter scripts', () => { + const hydrationScripts = createHydrationScripts(undefined, ['void 0']) + const scripts = hydrationScripts.takeInitialHydrationScriptTags()! + const cleanupTag = scripts.before.at(-1)! + const nodes: Array = [] + const createNode = (marked: boolean) => { + const node = { + hasAttribute(name: string) { + return marked && name === 'data-tsr-stream-part' + }, + remove() { + nodes.splice(nodes.indexOf(this), 1) + }, + } + Object.defineProperty(node, 'previousElementSibling', { + get() { + return nodes[nodes.indexOf(node) - 1] ?? null + }, + }) + return node + } + const olderPart = createNode(true) + const unrelated = createNode(false) + const firstPart = createNode(true) + const cleanup = createNode(true) + nodes.push(olderPart, unrelated, firstPart, cleanup) + + runInNewContext(cleanupTag.children!, { + document: { currentScript: cleanup }, + }) + + const routeScript = createNode(false) + const assetScript = createNode(false) + nodes.push(routeScript, assetScript) + + expect(nodes).toEqual([olderPart, unrelated, routeScript, assetScript]) + hydrationScripts.cleanup() + }) + + test('a failed hydration tag leaves its transport node', () => { + for (const brokenSource of [ + 'throw new Error("runtime failure")', + 'const = "syntax failure"', + ]) { + const hydrationScripts = createHydrationScripts(undefined, [brokenSource]) + const scripts = hydrationScripts.takeInitialHydrationScriptTags()! + const nodes: Array<{ remove: () => void }> = [] + const part = { + previousElementSibling: null, + hasAttribute: () => true, + remove() { + nodes.splice(nodes.indexOf(this), 1) + }, + } + nodes.push(part) + + expect(() => + runInNewContext(scripts.before[0]!.children!, { + document: { currentScript: part }, + }), + ).toThrow() + expect(nodes).toEqual([part]) + hydrationScripts.cleanup() + } + }) + + test('the boundary removes only itself when there are no initial parts', () => { + const hydrationScripts = createHydrationScripts(undefined, []) + const scripts = hydrationScripts.takeInitialHydrationScriptTags()! + const nodes: Array<{ remove: () => void }> = [] + const boundary = { + remove() { + nodes.splice(nodes.indexOf(this), 1) + }, + } + nodes.push(boundary) + + runInNewContext(scripts.boundary.children!, { + document: { currentScript: boundary }, + }) + + expect(nodes).toEqual([]) + hydrationScripts.cleanup() + }) + + test('stream pass-through rejects while SSR work is pending', async () => { const value = deferred() const router = buildRouter({ value: value.promise }) attachRouterServerSsrUtils({ router, manifest: undefined }) @@ -205,49 +570,228 @@ describe('serverSsr.cleanup', () => { await router.load() await router.serverSsr!.dehydrate() - expect(router.serverSsr!.reserveStreamFastPath()).toBe(false) - const barrierScript = router.serverSsr!.takeBufferedScripts() - expect(barrierScript).toBeDefined() - expect(router.serverSsr!.reserveStreamFastPath()).toBe(false) + expect(router.serverSsr!.hydrationScripts.reserveFastPath()).toBe(false) + const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags() + expect(initialScripts?.boundary.children).toBe( + HYDRATION_SCRIPT_BOUNDARY_SOURCE, + ) + expect(initialScripts?.boundary.attrs).not.toHaveProperty('id') + expect(router.serverSsr!.hydrationScripts.reserveFastPath()).toBe(false) - const serializationDone = new Promise((resolve) => { - router.serverSsr!.onSerializationFinished(resolve) - }) value.resolve('done') - await serializationDone + await Promise.resolve() + await Promise.resolve() - expect(router.serverSsr!.reserveStreamFastPath()).toBe(false) + expect(router.serverSsr!.hydrationScripts.reserveFastPath()).toBe(false) + const output = router.serverSsr!.hydrationScripts.claimOutput() router.serverSsr!.setRenderFinished() - expect(router.serverSsr!.reserveStreamFastPath()).toBe(false) - expect(router.serverSsr!.takeBufferedHtml()).toContain(' output.state === HydrationScriptOutputState.Ready) + const hydration = drainHydrationOutput(output) + expect(hydration).toContain('done') + expect(output.state).toBe(HydrationScriptOutputState.Done) + expect(router.serverSsr!.hydrationScripts.reserveFastPath(output)).toBe( + true, + ) + expect(router.serverSsr!.hydrationScripts.reserveFastPath(output)).toBe( + false, + ) router.serverSsr?.cleanup() }) - test('throwing injected listener does not skip later listeners', () => { + test('an initial serialization error fails hydration output', async () => { const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - const router = buildRouter() + const router = buildRouter({ unsupported: () => {} }) + try { attachRouterServerSsrUtils({ router, manifest: undefined }) + await router.load() + await expect(router.serverSsr!.dehydrate()).rejects.toBeInstanceOf(Error) - const calls: Array = [] - router.serverSsr!.onInjectedHtml(() => { - calls.push('a') - throw new Error('boom') - }) - router.serverSsr!.onInjectedHtml(() => { - calls.push('b') - }) - - router.serverSsr!.injectHtml('') - - expect(calls).toEqual(['a', 'b']) + expect(errorSpy).toHaveBeenCalledWith( + 'Serialization error:', + expect.any(Error), + ) } finally { router.serverSsr?.cleanup() errorSpy.mockRestore() } }) + test('an invalid deferred value fails instead of leaving hydration pending', async () => { + const invalidValue = deferred() + const validValue = deferred() + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + const router = buildRouter({ + invalidValue: invalidValue.promise, + validValue: validValue.promise, + }) + + try { + attachRouterServerSsrUtils({ router, manifest: undefined }) + await router.load() + await router.serverSsr!.dehydrate() + router.serverSsr!.takeInitialHydrationScriptTags() + const output = router.serverSsr!.hydrationScripts.claimOutput() + router.serverSsr!.hydrationScripts.liftBarrier() + invalidValue.resolve(() => {}) + await waitFor(() => output.state === HydrationScriptOutputState.Failed) + + expect(output.error).toBeInstanceOf(Error) + expect(errorSpy).toHaveBeenCalledWith( + 'Serialization error:', + output.error, + ) + + validValue.resolve('ignored') + await Promise.resolve() + await Promise.resolve() + expect(output.state).toBe(HydrationScriptOutputState.Failed) + expect(router.serverSsr!.hydrationScripts.reserveFastPath(output)).toBe( + false, + ) + } finally { + router.serverSsr?.cleanup() + errorSpy.mockRestore() + } + }) + + test('a rejected hydration source stops serialization before stream creation', async () => { + const lateValue = deferred() + const router = buildRouter({ lateValue: lateValue.promise }) + const onCleanup = vi.fn() + + try { + attachRouterServerSsrUtils({ router, manifest: undefined }) + router.serverSsr!.onCleanup(onCleanup) + await router.load() + const scripts = router.serverSsr!.hydrationScripts as HydrationScripts + const backlogError = new Error('hydration backlog full') + const pushSerializedSource = vi + .spyOn(scripts, 'pushSerializedSource') + .mockImplementation(() => { + scripts.fail(backlogError) + return false + }) + + await router.serverSsr!.dehydrate() + + const output = scripts.claimOutput() + expect(output.state).toBe(HydrationScriptOutputState.Failed) + expect(output.error).toBe(backlogError) + expect(pushSerializedSource).toHaveBeenCalledOnce() + + lateValue.resolve('ignored') + await Promise.resolve() + await Promise.resolve() + expect(pushSerializedSource).toHaveBeenCalledOnce() + router.serverSsr!.cleanup() + expect(onCleanup).toHaveBeenCalledExactlyOnceWith(false) + } finally { + router.serverSsr?.cleanup() + } + }) + + test('a hydration backlog failure aborts pending loader work during cleanup', async () => { + const pending = deferred() + const onCleanup = vi.fn() + const cancelSource = vi.fn() + let loaderSignal: AbortSignal | undefined + let chunks = 0 + const source = new ReadableStream( + { + pull(controller) { + // Bound the producer even if backlog protection regresses. + if (chunks++ < 5_000) { + controller.enqueue(Uint8Array.of(1)) + } + }, + cancel: cancelSource, + }, + { highWaterMark: 0 }, + ) + const rootRoute = new BaseRootRoute({}) + const indexRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/', + loader: ({ abortController }) => { + loaderSignal = abortController.signal + return { pending: pending.promise, stream: new RawStream(source) } + }, + }) + const router = createTestRouter({ + routeTree: rootRoute.addChildren([indexRoute]), + history: createMemoryHistory({ initialEntries: ['/'] }), + isServer: true, + }) + attachRouterServerSsrUtils({ router, manifest: undefined }) + const serverSsr = router.serverSsr! + serverSsr.onCleanup(onCleanup) + + try { + await router.load() + await serverSsr.dehydrate() + // The renderer has not returned its stream, so nothing drains the backlog. + const output = serverSsr.hydrationScripts.claimOutput() + await vi.waitFor(() => { + expect(output.state).toBe(HydrationScriptOutputState.Failed) + expect(cancelSource).toHaveBeenCalledOnce() + }) + expect(String(output.error)).toContain( + 'backlog exceeded maximum source-part count', + ) + expect(loaderSignal?.aborted).toBe(false) + + serverSsr.cleanup() + + expect(onCleanup).toHaveBeenCalledExactlyOnceWith(false) + expect(loaderSignal?.aborted).toBe(true) + expect(source.locked).toBe(false) + expect(router.serverSsr).toBeUndefined() + expect(router.ssr).toBeUndefined() + } finally { + serverSsr.cleanup() + pending.resolve('done') + if (!source.locked) { + await source.cancel() + } + } + }) + + test('the hydration channel permits only one subscriber', () => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + const output = router.serverSsr!.hydrationScripts.claimOutput() + const unsubscribe = output.subscribe(() => {}) + + expect(() => output.subscribe(() => {})).toThrow('already has a subscriber') + unsubscribe() + expect(() => output.subscribe(() => {})).not.toThrow() + router.serverSsr!.cleanup() + }) + + test('the claimed output receives scripts buffered before the claim', async () => { + const value = deferred() + const router = buildRouter({ value: value.promise }) + attachRouterServerSsrUtils({ router, manifest: undefined }) + await router.load() + await router.serverSsr!.dehydrate() + router.serverSsr!.takeInitialHydrationScriptTags() + + router.serverSsr!.hydrationScripts.liftBarrier() + value.resolve('buffered') + await Promise.resolve() + await Promise.resolve() + + const output = router.serverSsr!.hydrationScripts.claimOutput() + + expect(output.state).toBe(HydrationScriptOutputState.Ready) + const hydration = drainHydrationOutput(output) + expect(hydration).toContain('buffered') + expect(hydration).toContain('$_TSR.e()') + router.serverSsr!.cleanup() + }) + test('server SSR attach lifecycle runs listeners at attach time', () => { const router = buildRouter() const calls: Array = [] @@ -267,9 +811,9 @@ describe('serverSsr.cleanup', () => { expect(calls).toEqual(['attach', 'cleanup']) }) - test('request handler cleans plain response body after drain', async () => { + test('request handler cleans SSR state before returning a plain body', async () => { const router = buildRouter() - let cleanupCalls = 0 + let cleanupEffects = 0 const handler = createRequestHandler({ createRouter: () => router, request: new Request('http://localhost/'), @@ -277,21 +821,19 @@ describe('serverSsr.cleanup', () => { const response = await handler(({ router: requestRouter }) => { const serverSsr = requestRouter.serverSsr! - const cleanup = serverSsr.cleanup - serverSsr.cleanup = () => { - cleanupCalls++ - cleanup() - } + serverSsr.onCleanup(() => { + cleanupEffects++ + }) return Promise.resolve(new Response('plain')) }) - expect(cleanupCalls).toBe(1) + expect(cleanupEffects).toBe(1) await response.text() - expect(cleanupCalls).toBe(1) + expect(cleanupEffects).toBe(1) expect(router.serverSsr).toBeUndefined() }) - test('request handler cleans plain response body on cancel', async () => { + test('request handler cleans SSR state before returning a plain stream', async () => { const router = buildRouter() let cleanupCalls = 0 const handler = createRequestHandler({ @@ -350,7 +892,7 @@ describe('serverSsr.cleanup', () => { const requestController = new AbortController() const renderStarted = deferred() const renderResult = deferred>() - let cleanupCalls = 0 + let cleanupEffects = 0 let cancelCalls = 0 let lateStreamResponse!: ReturnType const handler = createRequestHandler({ @@ -362,11 +904,9 @@ describe('serverSsr.cleanup', () => { const response = handler(({ router: requestRouter }) => { const serverSsr = requestRouter.serverSsr! - const cleanup = serverSsr.cleanup - serverSsr.cleanup = () => { - cleanupCalls++ - cleanup() - } + serverSsr.onCleanup(() => { + cleanupEffects++ + }) lateStreamResponse = createSsrStreamResponse( requestRouter, new Response( @@ -387,13 +927,13 @@ describe('serverSsr.cleanup', () => { requestController.abort(cancellation) await expect(response).rejects.toBe(cancellation) - expect(cleanupCalls).toBe(1) + expect(cleanupEffects).toBe(1) expect(router.serverSsr).toBeUndefined() renderResult.resolve(lateStreamResponse) await Promise.resolve() await Promise.resolve() - expect(cleanupCalls).toBe(1) + expect(cleanupEffects).toBe(1) expect(cancelCalls).toBe(1) expect(router.serverSsr).toBeUndefined() }) @@ -428,58 +968,6 @@ describe('serverSsr.cleanup', () => { }) }) - test.each(['throw', 'reject'] as const)( - 'reports a %s from disposal of a late render response', - async (failureMode) => { - const router = buildRouter() - const requestController = new AbortController() - const renderStarted = deferred() - const renderResult = deferred() - const cleanupError = new Error('late stream cleanup failed') - const dispose = vi.fn(() => { - if (failureMode === 'throw') { - throw cleanupError - } - return Promise.reject(cleanupError) - }) - const consoleError = vi - .spyOn(console, 'error') - .mockImplementation(() => undefined) - const handler = createRequestHandler({ - createRouter: () => router, - request: new Request('http://localhost/', { - signal: requestController.signal, - }), - }) - onTestFinished(() => { - consoleError.mockRestore() - }) - onTestFinished(() => { - router.serverSsr?.cleanup() - }) - - const response = handler(() => { - renderStarted.resolve() - return renderResult.promise - }) - - await renderStarted.promise - const cancellation = new Error('request disconnected') - requestController.abort(cancellation) - await expect(response).rejects.toBe(cancellation) - - renderResult.resolve({ - response: new Response('stream'), - serverSsrCleanup: 'stream', - dispose, - }) - await vi.waitFor(() => { - expect(consoleError).toHaveBeenCalledWith(cleanupError) - }) - expect(dispose).toHaveBeenCalledOnce() - }, - ) - test('request abort disposes a stream after response handoff', async () => { const router = buildRouter() const requestController = new AbortController() @@ -522,53 +1010,11 @@ describe('serverSsr.cleanup', () => { expect(router.serverSsr).toBeUndefined() }) - test.each(['throw', 'reject'] as const)( - 'reports a custom stream disposal %s after request abort', - async (failureMode) => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - let cleanupCalls = 0 - const cleanup = router.serverSsr!.cleanup - router.serverSsr!.cleanup = () => { - cleanupCalls++ - cleanup() - } - const cleanupError = new Error('custom stream cleanup failed') - const dispose = vi.fn(() => { - if (failureMode === 'throw') { - throw cleanupError - } - return Promise.reject(cleanupError) - }) - const consoleError = vi - .spyOn(console, 'error') - .mockImplementation(() => undefined) - const requestController = new AbortController() - - bindSsrResponseToRequest( - router, - { - response: new Response('stream'), - serverSsrCleanup: 'stream', - dispose, - }, - requestController.signal, - ) - requestController.abort(new Error('request disconnected')) - - await vi.waitFor(() => { - expect(consoleError).toHaveBeenCalledWith(cleanupError) - }) - expect(dispose).toHaveBeenCalledOnce() - expect(cleanupCalls).toBe(1) - expect(router.serverSsr).toBeUndefined() - }, - ) - test('request handler defers cleanup for stream response metadata', async () => { const router = buildRouter() let cleanupCalls = 0 let controller!: ReadableStreamDefaultController + let initialScriptHtml = '' const handler = createRequestHandler({ createRouter: () => router, request: new Request('http://localhost/'), @@ -581,12 +1027,18 @@ describe('serverSsr.cleanup', () => { cleanupCalls++ cleanup() } + const initialScripts = serverSsr.takeInitialHydrationScriptTags() + expect(initialScripts?.boundary.children).toBe( + HYDRATION_SCRIPT_BOUNDARY_SOURCE, + ) + expect(initialScripts?.boundary.attrs).not.toHaveProperty('id') + initialScriptHtml = renderInitialScripts(initialScripts!) const appStream = new ReadableStream({ start(c) { controller = c }, }) - const responseStream = transformStreamWithRouter( + const responseStream = transformReadableStreamWithRouter( requestRouter, appStream as any, ) @@ -598,10 +1050,334 @@ describe('serverSsr.cleanup', () => { }) expect(cleanupCalls).toBe(0) - controller.enqueue(new TextEncoder().encode('ok')) + controller.enqueue( + new TextEncoder().encode( + `${initialScriptHtml}ok`, + ), + ) controller.close() await response.text() expect(cleanupCalls).toBe(1) expect(router.serverSsr).toBeUndefined() }) + + test('external cleanup releases a discarded stream transform immediately', async () => { + // Mirrors a request handler that discards a stream response (for example a + // middleware throwing after the handler returned): the bare cleanup() in + // its finally block must tear the transform down at once instead of + // leaving the renderer pinned until the lifetime timer. + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + const serverSsr = router.serverSsr! + serverSsr.takeInitialHydrationScriptTags() + + const upstreamCancelled = { value: false, reason: undefined as unknown } + const appStream = new ReadableStream({ + start(c) { + c.enqueue(new TextEncoder().encode('')) + }, + cancel(reason) { + upstreamCancelled.value = true + upstreamCancelled.reason = reason + }, + }) + const aborts: Array = [] + const responseStream = transformReadableStreamWithRouter( + router, + appStream as any, + { + onAbort: (reason) => aborts.push(reason), + }, + ) + + // The response is never read and never cancelled. + serverSsr.cleanup() + + expect(upstreamCancelled.value).toBe(true) + expect((upstreamCancelled.reason as Error).name).toBe('AbortError') + expect(aborts).toHaveLength(1) + expect(router.serverSsr).toBeUndefined() + await expect(responseStream.getReader().read()).rejects.toMatchObject({ + name: 'AbortError', + }) + }) + + test('concurrent dehydrate calls throw instead of double-serializing', async () => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + const serverSsr = router.serverSsr! + + const first = serverSsr.dehydrate() + await expect(serverSsr.dehydrate()).rejects.toThrow( + 'router is already dehydrated', + ) + await first + await expect(serverSsr.dehydrate()).rejects.toThrow( + 'router is already dehydrated', + ) + serverSsr.cleanup() + }) + + test('onCleanup after cleanup invokes the listener immediately', () => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + const serverSsr = router.serverSsr! + serverSsr.cleanup() + + const listener = vi.fn() + serverSsr.onCleanup(listener) + expect(listener).toHaveBeenCalledTimes(1) + }) + + test('a late onCleanup listener that throws is contained', () => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + const serverSsr = router.serverSsr! + serverSsr.cleanup() + + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + expect(() => + serverSsr.onCleanup(() => { + throw new Error('late-listener-boom') + }), + ).not.toThrow() + expect(errorSpy).toHaveBeenCalledWith( + 'Error in SSR cleanup listener:', + expect.objectContaining({ message: 'late-listener-boom' }), + ) + } finally { + errorSpy.mockRestore() + } + }) + + test('binding a stream response after cleanup still observes request abort', async () => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + const cancel = vi.fn() + const streamResponse = createSsrStreamResponse( + router, + new Response(new ReadableStream({ cancel })), + ) + const dispose = vi.spyOn(streamResponse, 'dispose') + router.serverSsr!.cleanup() + + const controller = new AbortController() + const addSpy = vi.spyOn(controller.signal, 'addEventListener') + const result = bindSsrResponseToRequest( + router, + streamResponse, + controller.signal, + ) + + expect(result.serverSsrCleanup).toBe('stream') + expect(addSpy).toHaveBeenCalledOnce() + + const reason = new Error('request disconnected') + controller.abort(reason) + await Promise.resolve() + + expect(dispose).toHaveBeenCalledExactlyOnceWith(reason) + expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) + }) + + test.each(['pass-through', 'merge'])( + 'shares the %s transform abort listener with final response disposal', + async (mode) => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + const serverSsr = router.serverSsr! + if (mode === 'pass-through') { + serverSsr.disableHydration() + } + const cleanup = vi.fn() + serverSsr.onCleanup(cleanup) + const requestAbort = new AbortController() + const add = vi.spyOn(requestAbort.signal, 'addEventListener') + const remove = vi.spyOn(requestAbort.signal, 'removeEventListener') + const cancelSource = vi.fn(() => new Promise(() => {})) + const source = new ReadableStream({ cancel: cancelSource }) + const transformed = transformReadableStreamWithRouter(router, source, { + signal: requestAbort.signal, + }) + const original = createSsrStreamResponse( + router, + new Response(transformed), + ) + const cancelFinal = vi.fn(() => new Promise(() => {})) + const response = new Response(new ReadableStream({ cancel: cancelFinal })) + const dispose = vi.fn((reason?: unknown): undefined => { + original.dispose(reason) + void response.body!.cancel(reason).catch(() => {}) + }) + bindSsrResponseToRequest( + router, + { ...original, response, dispose }, + requestAbort.signal, + ) + + expect(add).toHaveBeenCalledOnce() + const reason = new Error('request disconnected') + const reader = transformed.getReader() + const rejected = expect(reader.read()).rejects.toBe(reason) + requestAbort.abort(reason) + await rejected + + expect(dispose).toHaveBeenCalledExactlyOnceWith(reason) + expect(cancelFinal).toHaveBeenCalledExactlyOnceWith(reason) + expect(cancelSource).toHaveBeenCalledExactlyOnceWith(reason) + expect(source.locked).toBe(false) + expect(cleanup).toHaveBeenCalledOnce() + expect(remove).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + reader.releaseLock() + }, + ) + + test('successful transform completion removes abort handling without disposing the response', async () => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + router.serverSsr!.disableHydration() + const requestAbort = new AbortController() + const add = vi.spyOn(requestAbort.signal, 'addEventListener') + const remove = vi.spyOn(requestAbort.signal, 'removeEventListener') + const cancel = vi.fn() + const source = new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode('done')) + controller.close() + }, + cancel, + }) + const transformed = transformReadableStreamWithRouter(router, source, { + signal: requestAbort.signal, + }) + const result = createSsrStreamResponse(router, new Response(transformed)) + const dispose = vi.spyOn(result, 'dispose') + bindSsrResponseToRequest(router, result, requestAbort.signal) + + expect(await result.response.text()).toBe('done') + requestAbort.abort(new Error('request ended after completion')) + expect(add).toHaveBeenCalledOnce() + expect(remove).toHaveBeenCalledOnce() + expect(dispose).not.toHaveBeenCalled() + expect(cancel).not.toHaveBeenCalled() + expect(source.locked).toBe(false) + expect(router.serverSsr).toBeUndefined() + }) + + test.each(['custom response', 'no signal', 'different signal'])( + 'keeps request binding for a %s', + async (mode) => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + router.serverSsr!.disableHydration() + const requestAbort = new AbortController() + const add = vi.spyOn(requestAbort.signal, 'addEventListener') + const cancel = vi.fn() + const source = new ReadableStream({ cancel }) + const body = + mode === 'custom response' + ? source + : transformReadableStreamWithRouter(router, source, { + signal: + mode === 'different signal' + ? new AbortController().signal + : undefined, + }) + const result = createSsrStreamResponse(router, new Response(body)) + const dispose = vi.spyOn(result, 'dispose') + bindSsrResponseToRequest(router, result, requestAbort.signal) + const reason = new Error('request disconnected') + requestAbort.abort(reason) + await Promise.resolve() + + expect(add).toHaveBeenCalledOnce() + expect(dispose).toHaveBeenCalledExactlyOnceWith(reason) + expect(cancel).toHaveBeenCalledOnce() + expect(source.locked).toBe(false) + expect(router.serverSsr).toBeUndefined() + }, + ) + + test('already-aborted response handoff disposes immediately without adding a listener', async () => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + const cancel = vi.fn() + const result = createSsrStreamResponse( + router, + new Response(new ReadableStream({ cancel })), + ) + const dispose = vi.spyOn(result, 'dispose') + const requestAbort = new AbortController() + const reason = new Error('request already disconnected') + requestAbort.abort(reason) + const add = vi.spyOn(requestAbort.signal, 'addEventListener') + bindSsrResponseToRequest(router, result, requestAbort.signal) + await Promise.resolve() + + expect(add).not.toHaveBeenCalled() + expect(dispose).toHaveBeenCalledExactlyOnceWith(reason) + expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) + expect(router.serverSsr).toBeUndefined() + }) + + test('disabled hydration streams through pass-through without a boundary', async () => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + const serverSsr = router.serverSsr! + serverSsr.disableHydration() + + // No boundary anywhere in the document. + const html = '
static page
' + const appStream = new ReadableStream({ + start(c) { + c.enqueue(new TextEncoder().encode(html)) + c.close() + }, + }) + + const responseStream = transformReadableStreamWithRouter( + router, + appStream as any, + ) + const text = await new Response(responseStream as any).text() + + expect(text).toBe(html) + expect(text).not.toContain('$tsr-stream-boundary') + expect(text).not.toContain('data-tsr-stream-part') + expect(router.serverSsr).toBeUndefined() + }) + + test('disabled hydration renders strings through the eager fast path', async () => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + router.serverSsr!.disableHydration() + + const html = 'no hydration' + const text = await transformHtmlStringWithRouter(router, html) + + expect(text).toBe('' + html) + expect(router.serverSsr).toBeUndefined() + }) + + test('disableHydration and dehydrate are mutually exclusive', async () => { + const disabledFirst = buildRouter() + attachRouterServerSsrUtils({ router: disabledFirst, manifest: undefined }) + disabledFirst.serverSsr!.disableHydration() + // Idempotent second call. + expect(() => disabledFirst.serverSsr!.disableHydration()).not.toThrow() + await expect(disabledFirst.serverSsr!.dehydrate()).rejects.toThrow( + 'hydration is disabled for this request', + ) + disabledFirst.serverSsr!.cleanup() + + const dehydratedFirst = buildRouter() + attachRouterServerSsrUtils({ router: dehydratedFirst, manifest: undefined }) + await dehydratedFirst.serverSsr!.dehydrate() + expect(() => dehydratedFirst.serverSsr!.disableHydration()).toThrow( + 'cannot disable hydration after dehydrate()', + ) + dehydratedFirst.serverSsr!.cleanup() + }) }) diff --git a/packages/router-core/tests/ssr-server-manifest.test.ts b/packages/router-core/tests/ssr-server-manifest.test.ts index 6cdc98a87b..95b7588e87 100644 --- a/packages/router-core/tests/ssr-server-manifest.test.ts +++ b/packages/router-core/tests/ssr-server-manifest.test.ts @@ -1,15 +1,18 @@ -import { createMemoryHistory } from '@tanstack/history' import { runInNewContext } from 'node:vm' -import { BaseRootRoute, BaseRoute } from '../src' -import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' -import { GLOBAL_TSR } from '../src/ssr/constants' -import { createTestRouter } from './routerTestUtils' import { describe, expect, test } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute, BaseRoute } from '../src' +import { GLOBAL_TSR } from '../src/ssr/constants' + +import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' +import { createTestRouter } from './routerTestUtils' +import type { AnyRouter } from '../src' import type { ManifestCssLink, ManifestRouteAssets, ServerManifest, } from '../src/manifest' +import type { InitialHydrationScriptTags } from '../src/ssr/hydrationScripts' import type { DehydratedRouter } from '../src/ssr/types' function buildRouter() { @@ -79,14 +82,16 @@ async function dehydrateManifest() { await router.load() await router.serverSsr!.dehydrate() - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.tag).toBe('script') - expect(script?.children).toBeTruthy() + const scripts = router.serverSsr!.takeInitialHydrationScriptTags() + expect(scripts?.boundary.children).toContain('$tsr-stream-boundary') + expect(scripts?.boundary.attrs).not.toHaveProperty('id') - return parseSerializedRouter(script!.children!).manifest! + return parseSerializedRouter(scripts!).manifest! } -function parseSerializedRouter(serialized: string): DehydratedRouter { +function parseSerializedRouter( + scripts: InitialHydrationScriptTags, +): DehydratedRouter { const context: Record = { document: { currentScript: { @@ -96,7 +101,17 @@ function parseSerializedRouter(serialized: string): DehydratedRouter { } context.self = context - runInNewContext(serialized, context) + expect(scripts.boundary.children).toContain('$tsr-stream-boundary') + expect(scripts.boundary.attrs).not.toHaveProperty('id') + + const streamParts = scripts.before + expect(streamParts.length).toBeGreaterThan(0) + for (const script of streamParts) { + expect(script.tag).toBe('script') + expect(script.attrs?.['data-tsr-stream-part']).toBe('') + expect(script.children).toBeTruthy() + runInNewContext(script.children!, context) + } const router = context[GLOBAL_TSR]?.router expect(router).toBeDefined() @@ -104,6 +119,40 @@ function parseSerializedRouter(serialized: string): DehydratedRouter { } describe('attachRouterServerSsrUtils manifest dehydration', () => { + test.each([ + { label: 'false', value: false, expectedProperty: true }, + { label: 'zero', value: 0, expectedProperty: true }, + { label: 'an empty string', value: '', expectedProperty: true }, + { label: 'null', value: null, expectedProperty: true }, + { label: 'undefined', value: undefined, expectedProperty: false }, + ])( + 'preserves $label custom dehydration values', + async ({ value, expectedProperty }) => { + const router: AnyRouter = buildRouter() + router.options.dehydrate = () => value + attachRouterServerSsrUtils({ router, manifest: undefined }) + + try { + await router.load() + await router.serverSsr!.dehydrate() + const scripts = router.serverSsr!.takeInitialHydrationScriptTags() + const dehydratedRouter = parseSerializedRouter(scripts!) + + expect( + Object.prototype.hasOwnProperty.call( + dehydratedRouter, + 'dehydratedData', + ), + ).toBe(expectedProperty) + if (expectedProperty) { + expect(dehydratedRouter.dehydratedData).toBe(value) + } + } finally { + router.serverSsr?.cleanup() + } + }, + ) + test('omits unmatched route assets by default', async () => { const manifest = await dehydrateManifest() @@ -126,11 +175,8 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { await router.load() await router.serverSsr!.dehydrate() - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - const dehydratedManifest = parseSerializedRouter( - script!.children!, - ).manifest! + const scripts = router.serverSsr!.takeInitialHydrationScriptTags() + const dehydratedManifest = parseSerializedRouter(scripts!).manifest! expect(dehydratedManifest.scriptFormat).toBe('iife') }) @@ -233,11 +279,8 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { }, }) - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - const dehydratedManifest = parseSerializedRouter( - script!.children!, - ).manifest! + const scripts = router.serverSsr!.takeInitialHydrationScriptTags() + const dehydratedManifest = parseSerializedRouter(scripts!).manifest! expect(dehydratedManifest.routes.__root__).toMatchObject({ preloads: [ @@ -280,11 +323,8 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { }, }) - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - const dehydratedManifest = parseSerializedRouter( - script!.children!, - ).manifest! + const scripts = router.serverSsr!.takeInitialHydrationScriptTags() + const dehydratedManifest = parseSerializedRouter(scripts!).manifest! expect(dehydratedManifest.routes.__root__?.preloads).toEqual([ { href: '/assets/rsc-client.js', crossOrigin: 'anonymous' }, @@ -310,9 +350,8 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { await router.serverSsr!.dehydrate() - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - const dehydratedRouter = parseSerializedRouter(script!.children!) + const scripts = router.serverSsr!.takeInitialHydrationScriptTags() + const dehydratedRouter = parseSerializedRouter(scripts!) const dehydratedManifest = dehydratedRouter.manifest! const rootInlineCss = dehydratedManifest.inlineStyle const allLinks = Object.values(dehydratedManifest.routes).flatMap( @@ -337,6 +376,73 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { ]) }) + test('memoizes prepared inline CSS while composing request assets freshly', async () => { + const router = buildRouter() + const manifest = buildInlineManifest() + const requestAssets: ManifestRouteAssets = { + preloads: ['/assets/request.js'], + } + + attachRouterServerSsrUtils({ + router, + manifest, + getRequestAssets: () => requestAssets, + }) + + await router.load() + + const first = router.ssr!.manifest + const second = router.ssr!.manifest + // The composed manifest is fresh because request assets are mutable, while + // the immutable inline CSS preparation is reused for this route set. + expect(second).not.toBe(first) + expect(second?.inlineStyle).toBe(first?.inlineStyle) + expect(first?.inlineStyle).toMatchObject({ + children: '.shared{color:red}', + }) + expect(first?.routes.__root__?.preloads).toEqual([ + '/assets/request.js', + '/assets/root.js', + ]) + }) + + test('refreshes the composed manifest when a stable request-assets object changes', async () => { + const router = buildRouter() + const manifest = buildManifest() + const requestAssets: ManifestRouteAssets = { + preloads: ['/assets/discovered-early.js'], + } + + attachRouterServerSsrUtils({ + router, + manifest, + getRequestAssets: () => requestAssets, + }) + + try { + await router.load() + + const beforeDiscovery = router.ssr!.manifest + expect(beforeDiscovery?.routes.__root__?.preloads).toEqual([ + '/assets/discovered-early.js', + '/assets/root.js', + ]) + + // React Start RSC retains this object and replaces these members as it + // discovers client references during the request. + requestAssets.preloads = ['/assets/discovered-late.js'] + + const afterDiscovery = router.ssr!.manifest + expect(afterDiscovery).not.toBe(beforeDiscovery) + expect(afterDiscovery?.routes.__root__?.preloads).toEqual([ + '/assets/discovered-late.js', + '/assets/root.js', + ]) + } finally { + router.serverSsr?.cleanup() + } + }) + test('strips only inlinable stylesheet links from dehydrated manifest data', async () => { const router = buildRouter() const manifest: ServerManifest = { @@ -382,11 +488,8 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { await router.serverSsr!.dehydrate() - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - const dehydratedManifest = parseSerializedRouter( - script!.children!, - ).manifest! + const scripts = router.serverSsr!.takeInitialHydrationScriptTags() + const dehydratedManifest = parseSerializedRouter(scripts!).manifest! expect(dehydratedManifest.routes.__root__?.css).toEqual([ { @@ -445,11 +548,9 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { expect(router.ssr!.manifest?.inlineStyle?.children).toBe('.root{}.parent{}') await router.serverSsr!.dehydrate() - const script = router.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - const dehydratedManifest = parseSerializedRouter( - script!.children!, - ).manifest! + const scripts = router.serverSsr!.takeInitialHydrationScriptTags() + expect(scripts).toBeDefined() + const dehydratedManifest = parseSerializedRouter(scripts!).manifest! expect(dehydratedManifest.routes[childRoute.id]).toBeUndefined() }) diff --git a/packages/router-core/tests/transformStreamBackpressure.perf.test.ts b/packages/router-core/tests/transformStreamBackpressure.perf.test.ts index 267241f416..12531988c0 100644 --- a/packages/router-core/tests/transformStreamBackpressure.perf.test.ts +++ b/packages/router-core/tests/transformStreamBackpressure.perf.test.ts @@ -1,19 +1,24 @@ -// On-demand backpressure test for transformStreamWithRouter. +// On-demand backpressure test for transformReadableStreamWithRouter. // // NOT run in CI by default. To execute: // RUN_BACKPRESSURE_PERF=1 pnpm --filter @tanstack/router-core test:unit -- transformStreamBackpressure // // Validates fix for TanStack/router#7402 // without a backpressure gate the read loop in -// transformStreamWithRouter calls controller.enqueue unconditionally, +// transformReadableStreamWithRouter calls controller.enqueue unconditionally, // allowing controller.[[queue]] to accumulate Uint8Array chunks (external // memory) when the consumer drains slower than the producer. -import { ReadableStream } from 'node:stream/web' import { describe, expect, it } from 'vitest' -import { transformStreamWithRouter } from '../src/ssr/transformStreamWithRouter' +import { + HYDRATION_SCRIPT_BOUNDARY_BYTES, + HydrationScriptOutputState, +} from '../src/ssr/hydrationScripts' +import { transformReadableStreamWithRouter } from '../src/ssr/transformStreamWithRouter' +import type { HydrationScriptOutput } from '../src/ssr/hydrationScripts' const enabled = process.env.RUN_BACKPRESSURE_PERF === '1' const requiresGc = typeof (globalThis as any).gc === 'function' +const SCRIPT_BARRIER_HTML = `'.length)}` function createFastProducer( chunkCount: number, @@ -49,242 +54,211 @@ function createFastProducer( } function makeRouter() { + const output: HydrationScriptOutput = { + state: HydrationScriptOutputState.Done, + error: undefined, + pullChunk() { + throw new Error('Finished hydration output cannot be pulled') + }, + subscribe() { + return () => {} + }, + } return { serverSsr: { - isSerializationFinished: () => true, - reserveStreamFastPath: () => true, - onInjectedHtml: () => () => {}, - onSerializationFinished: () => () => {}, - takeBufferedHtml: () => undefined, + hydrationScripts: { + reserveFastPath: () => true, + claimOutput: () => output, + liftBarrier: () => {}, + isInitialTaken: () => true, + startSerializationTimeout: () => {}, + }, setRenderFinished: () => {}, + onCleanup: () => {}, cleanup: () => {}, }, } as any } // Main-path router fake: serialization NOT finished synchronously, so the -// transform runs the full scanner + pending HTML/scripts path. Exposes -// hooks to inject HTML and signal serialization finished. +// transform runs the full scanner + script merger path. Exposes hooks to +// emit router script batches and signal serialization finished. function makeMainPathRouter(): { router: any - injectHtml: (html: string) => void finishSerialization: () => void } { - let buffered = '' - const injectedListeners: Array<() => void> = [] - const serializationListeners: Array<() => void> = [] + let state: HydrationScriptOutput['state'] = HydrationScriptOutputState.Waiting + let listener: (() => void) | undefined + const output: HydrationScriptOutput = { + get state() { + return state + }, + error: undefined, + pullChunk() { + throw new Error('No hydration output is ready') + }, + subscribe(onChange) { + listener = onChange + return () => { + if (listener === onChange) { + listener = undefined + } + } + }, + } const router: any = { serverSsr: { - isSerializationFinished: () => false, - reserveStreamFastPath: () => false, - onInjectedHtml: (cb: () => void) => { - injectedListeners.push(cb) - return () => { - const i = injectedListeners.indexOf(cb) - if (i >= 0) injectedListeners.splice(i, 1) - } - }, - onSerializationFinished: (cb: () => void) => { - serializationListeners.push(cb) - return () => { - const i = serializationListeners.indexOf(cb) - if (i >= 0) serializationListeners.splice(i, 1) - } - }, - takeBufferedHtml: () => { - const v = buffered - buffered = '' - return v || undefined + hydrationScripts: { + reserveFastPath: () => false, + claimOutput: () => output, + liftBarrier: () => {}, + isInitialTaken: () => true, + startSerializationTimeout: () => {}, }, setRenderFinished: () => {}, + onCleanup: () => {}, cleanup: () => {}, - liftScriptBarrier: () => {}, }, } return { router, - injectHtml: (html) => { - buffered += html - for (const l of injectedListeners) l() - }, finishSerialization: () => { - for (const l of serializationListeners) l() + state = HydrationScriptOutputState.Done + listener?.() }, } } -describe.runIf(enabled)('transformStreamWithRouter backpressure', () => { - it('does not run producer arbitrarily ahead of slow consumer', async () => { - const CHUNKS = 200 - const CHUNK_BYTES = 8 * 1024 // 8KB per chunk - const producer = createFastProducer(CHUNKS, CHUNK_BYTES) - const router = makeRouter() +describe.runIf(enabled)( + 'transformReadableStreamWithRouter backpressure', + () => { + it('does not run producer arbitrarily ahead of slow consumer', async () => { + const CHUNKS = 200 + const CHUNK_BYTES = 8 * 1024 // 8KB per chunk + const producer = createFastProducer(CHUNKS, CHUNK_BYTES) + const router = makeRouter() - const out = transformStreamWithRouter(router, producer.stream) + const out = transformReadableStreamWithRouter(router, producer.stream) - const reader = out.getReader() - let consumed = 0 - let maxLead = 0 - while (true) { - // Throttled consumer: ~5ms per chunk. - await new Promise((r) => setTimeout(r, 5)) - const { done } = await reader.read() - if (done) break - consumed++ - const lead = producer.getProduced() - consumed - if (lead > maxLead) maxLead = lead - } - - // Producer should never be more than a small constant number of chunks - // ahead of the consumer. ReadableStream default HWM is 1 for byte - // streams; allow generous slack for scheduling jitter. - expect(maxLead).toBeLessThanOrEqual(8) - expect(consumed).toBe(CHUNKS) - }) - - it('bounded external memory under sustained load', async () => { - expect(requiresGc, 'Run with node --expose-gc').toBe(true) - const CHUNKS = 1000 - const CHUNK_BYTES = 16 * 1024 - const producer = createFastProducer(CHUNKS, CHUNK_BYTES, { - freshChunks: true, - }) - const router = makeRouter() - - const out = transformStreamWithRouter(router, producer.stream) - const reader = out.getReader() - - let consumed = 0 - let peakExternal = 0 - const baseline = process.memoryUsage().external - while (true) { - await new Promise((r) => setTimeout(r, 2)) - const { done } = await reader.read() - if (done) break - consumed++ - if (consumed % 50 === 0) { - ;(globalThis as any).gc() - const ext = process.memoryUsage().external - baseline - if (ext > peakExternal) peakExternal = ext - } - } - - // Without backpressure, peak external memory scales w/ CHUNKS*CHUNK_BYTES - // (~16MB). With backpressure, only a few chunks worth. - expect(peakExternal).toBeLessThan(2 * 1024 * 1024) // 2MB ceiling - expect(consumed).toBe(CHUNKS) - }) - - it('main path: scanner+inject path also honors backpressure', async () => { - // Same shape as fast-path test but with a router that forces the - // scanner+inject code path. Producer emits valid HTML fragments - // (ending at closing tags) so the scanner can release them. - const CHUNKS = 200 - const CHUNK_BYTES = 8 * 1024 - const filler = 'a'.repeat(CHUNK_BYTES - '

'.length) - const chunkStr = `

${filler}

` - const encoded = new TextEncoder().encode(chunkStr) - - let produced = 0 - const stream = new ReadableStream({ - pull(controller) { - if (produced >= CHUNKS) { - controller.close() - return + const reader = out.getReader() + let consumed = 0 + let maxLead = 0 + for (;;) { + // Throttled consumer: ~5ms per chunk. + await new Promise((r) => setTimeout(r, 5)) + const { done } = await reader.read() + if (done) { + break } - produced++ - controller.enqueue(encoded) - }, - }) - - const { router, finishSerialization } = makeMainPathRouter() - const out = transformStreamWithRouter(router, stream) - // Mark serialization finished immediately so tryFinish() proceeds once - // upstream closes. - finishSerialization() - - const reader = out.getReader() - let consumed = 0 - let bytes = 0 - let maxLead = 0 - while (true) { - await new Promise((r) => setTimeout(r, 5)) - const { done, value } = await reader.read() - if (done) break - consumed++ - bytes += value.byteLength - const lead = produced - consumed - if (lead > maxLead) maxLead = lead - } - - expect(maxLead).toBeLessThanOrEqual(8) - expect(consumed).toBe(CHUNKS) - expect(bytes).toBe(CHUNKS * encoded.byteLength) - }) - - it('main path: injected scripts under slow consumer do not balloon memory', async () => { - expect(requiresGc, 'Run with node --expose-gc').toBe(true) - - // Producer emits a steady stream of app HTML. While that streams, the - // router injects many large '.length) - const scriptStr = `` - - const { router, injectHtml, finishSerialization } = makeMainPathRouter() - - let produced = 0 - const stream = new ReadableStream({ - pull(controller) { - if (produced >= APP_CHUNKS) { - controller.close() - return + consumed++ + const lead = producer.getProduced() - consumed + if (lead > maxLead) { + maxLead = lead } - produced++ - // Inject some scripts as part of producing this chunk to simulate - // a render that emits HTML AND injects head scripts concurrently. - for (let i = 0; i < INJECT_PER_APP_CHUNK; i++) injectHtml(scriptStr) - controller.enqueue(appBytes) - }, + } + + // Producer should never be more than a small constant number of chunks + // ahead of the consumer. ReadableStream default HWM is 1 for byte + // streams; allow generous slack for scheduling jitter. + expect(maxLead).toBeLessThanOrEqual(8) + expect(consumed).toBe(CHUNKS) }) - const out = transformStreamWithRouter(router, stream) - finishSerialization() - const reader = out.getReader() + it('bounded external memory under sustained load', async () => { + expect(requiresGc, 'Run with node --expose-gc').toBe(true) + const CHUNKS = 1000 + const CHUNK_BYTES = 16 * 1024 + const producer = createFastProducer(CHUNKS, CHUNK_BYTES, { + freshChunks: true, + }) + const router = makeRouter() - const baseline = process.memoryUsage().external - let peakExternal = 0 - let consumed = 0 - let totalText = '' - while (true) { - await new Promise((r) => setTimeout(r, 2)) - const { done, value } = await reader.read() - if (done) break - consumed++ - totalText += Buffer.from(value).toString('utf8') - if (consumed % 25 === 0) { - ;(globalThis as any).gc() - const ext = process.memoryUsage().external - baseline - if (ext > peakExternal) peakExternal = ext + const out = transformReadableStreamWithRouter(router, producer.stream) + const reader = out.getReader() + + ;(globalThis as any).gc() + ;(globalThis as any).gc() + let consumed = 0 + let peakExternal = 0 + const baseline = process.memoryUsage().external + for (;;) { + await new Promise((r) => setTimeout(r, 2)) + const { done } = await reader.read() + if (done) { + break + } + consumed++ + if (consumed % 50 === 0) { + ;(globalThis as any).gc() + const ext = process.memoryUsage().external - baseline + if (ext > peakExternal) { + peakExternal = ext + } + } } - } - // Total bytes produced ≈ APP_CHUNKS * (APP_CHUNK_BYTES + 5*SCRIPT_BYTES) - // ≈ 200 * (4KB + 20KB) ≈ 4.8MB - // With backpressure peak external should stay well below total. - expect(peakExternal).toBeLessThan(2 * 1024 * 1024) - expect(totalText.split(appChunkStr).length - 1).toBe(APP_CHUNKS) - expect(totalText.split(scriptStr).length - 1).toBe( - APP_CHUNKS * INJECT_PER_APP_CHUNK, - ) - }) -}) + // Without backpressure, peak external memory scales w/ CHUNKS*CHUNK_BYTES + // (~16MB). With backpressure, only a few chunks worth. + expect(peakExternal).toBeLessThan(2 * 1024 * 1024) // 2MB ceiling + expect(consumed).toBe(CHUNKS) + }) + + it('main path: scanner+inject path also honors backpressure', async () => { + // Same shape as fast-path test but with a router that forces the + // scanner+inject code path. Producer emits valid HTML fragments + // (ending at closing tags) so the scanner can release them. + const CHUNKS = 200 + const CHUNK_BYTES = 8 * 1024 + const filler = 'a'.repeat(CHUNK_BYTES - '

'.length) + const chunkStr = `

${filler}

` + const encoded = new TextEncoder().encode(chunkStr) + const firstFiller = 'a'.repeat( + CHUNK_BYTES - '

'.length - SCRIPT_BARRIER_HTML.length, + ) + const firstEncoded = new TextEncoder().encode( + `

${firstFiller}${SCRIPT_BARRIER_HTML}

`, + ) + + let produced = 0 + const stream = new ReadableStream({ + pull(controller) { + if (produced >= CHUNKS) { + controller.close() + return + } + produced++ + controller.enqueue(produced === 1 ? firstEncoded : encoded) + }, + }) + + const { router, finishSerialization } = makeMainPathRouter() + const out = transformReadableStreamWithRouter(router, stream) + // Mark serialization finished immediately so tryFinish() proceeds once + // upstream closes. + finishSerialization() + + const reader = out.getReader() + let consumed = 0 + let bytes = 0 + let maxLead = 0 + for (;;) { + await new Promise((r) => setTimeout(r, 5)) + const { done, value } = await reader.read() + if (done) { + break + } + consumed++ + bytes += value.byteLength + const lead = produced - consumed + if (lead > maxLead) { + maxLead = lead + } + } + + expect(maxLead).toBeLessThanOrEqual(8) + // The merger splits the first renderer record at the router boundary. + expect(consumed).toBe(CHUNKS + 1) + expect(bytes).toBe(CHUNKS * encoded.byteLength) + }) + }, +) diff --git a/packages/router-core/tests/transformStreamWithRouter.test.ts b/packages/router-core/tests/transformStreamWithRouter.test.ts index 903efeb0c9..e5ce1d8d50 100644 --- a/packages/router-core/tests/transformStreamWithRouter.test.ts +++ b/packages/router-core/tests/transformStreamWithRouter.test.ts @@ -1,111 +1,256 @@ -// CI-stable tests for transformStreamWithRouter behavior. +// CI-stable tests for transformReadableStreamWithRouter behavior. // // These exercise the deterministic side-effects of the SSR memory fix // (TanStack/router#7402) without relying on GC, timing of real I/O, or // process.memoryUsage(). On-demand backpressure/external-memory // assertions live in transformStreamBackpressure.perf.test.ts. -import { ReadableStream } from 'node:stream/web' -import { PassThrough } from 'node:stream' +import { PassThrough, Readable } from 'node:stream' import { describe, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' -import { GLOBAL_TSR, TSR_SCRIPT_BARRIER_ID } from '../src/ssr/constants' -import { createSsrStreamResponse } from '../src/ssr/handlerCallback' +import { GLOBAL_TSR } from '../src/ssr/constants' +import { + HYDRATION_SCRIPT_BOUNDARY_BYTES, + HydrationScriptOutputState, + MAX_HYDRATION_OUTPUT_CHUNK_BYTES, +} from '../src/ssr/hydrationScripts' +import { + createSsrStreamResponse, + replaceSsrResponse, +} from '../src/ssr/handlerCallback' import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' import { + transformHtmlStringWithRouter, transformPipeableStreamWithRouter, transformReadableStreamWithRouter, - transformStreamWithRouter, } from '../src/ssr/transformStreamWithRouter' +import { + DOCUMENT_CLOSE_BYTES, + SCRIPT_CLOSE, +} from '../src/ssr/htmlBoundaryScanner' import { createTestRouter } from './routerTestUtils' import type { RouterManagedTag } from '../src/manifest' +import type { HydrationScriptOutput } from '../src/ssr/hydrationScripts' -const MAX_LEFTOVER_CHARS = 2048 -const MAX_ROUTER_HTML_CHARS = 16 * 1024 * 1024 +const decoder = new TextDecoder() +const DOCUMENT_CLOSE = decoder.decode(DOCUMENT_CLOSE_BYTES) +const HYDRATION_SCRIPT_BOUNDARY_SUFFIX = decoder.decode( + HYDRATION_SCRIPT_BOUNDARY_BYTES, +) +const HYDRATION_SCRIPT_BOUNDARY_SOURCE = + `document.currentScript.remove()` + + HYDRATION_SCRIPT_BOUNDARY_SUFFIX.slice(0, -SCRIPT_CLOSE.length) +const SCRIPT_BARRIER_HTML = `` + +function internalSplitOffsets(value: string) { + return Array.from({ length: value.length - 1 }, (_, index) => index + 1) +} + +type FakeHydrationScripts = { + reserveFastPath: (output?: HydrationScriptOutput) => boolean + claimOutput: () => HydrationScriptOutput + liftBarrier: () => void + isInitialTaken: () => boolean + startSerializationTimeout: (timeoutMs: number) => void +} type FakeServerSsr = { - isSerializationFinished: () => boolean - reserveStreamFastPath: () => boolean - onInjectedHtml: (listener: () => void) => () => void - onSerializationFinished: (listener: () => void) => () => void - takeBufferedHtml: () => string | undefined + hydrationScripts: FakeHydrationScripts setRenderFinished: () => void + onCleanup: (listener: () => void) => void cleanup: () => void - liftScriptBarrier?: () => void } +type MakeRouterOptions = Partial> & + Partial + type FakeRouter = { serverSsr?: FakeServerSsr } -function makeRouter(opts: Partial = {}): { +type FakeHydrationRecord = { + bytes: Uint8Array + offset: number +} + +function makeRouter(opts: MakeRouterOptions = {}): { router: FakeRouter cleanupCalls: { count: number } - injectHtml: (html: string) => void + claimCalls: { count: number } + emitHydrationRecord: (record: string) => void + emitScriptBatch: (parts: ReadonlyArray) => void finishSerialization: () => void + failHydrationOutput: (error: unknown) => void } { const cleanupCalls = { count: 0 } + const claimCalls = { count: 0 } + const cleanupListeners: Array<() => void> = [] let cleanedUp = false - let buffered = '' - const injectedListeners: Array<() => void> = [] - const serializationListeners: Array<() => void> = [] + let producerDone = false + let claimed = false + let failure: unknown + let activeRecord: FakeHydrationRecord | undefined + const records: Array = [] + let listener: (() => void) | undefined + let state: HydrationScriptOutput['state'] = HydrationScriptOutputState.Waiting + let serializationTimeout: ReturnType | undefined + const encoder = new TextEncoder() + + function updateState() { + const nextState = + failure !== undefined + ? HydrationScriptOutputState.Failed + : activeRecord + ? HydrationScriptOutputState.Active + : records.length > 0 + ? HydrationScriptOutputState.Ready + : producerDone + ? HydrationScriptOutputState.Done + : HydrationScriptOutputState.Waiting + if (state !== nextState) { + state = nextState + listener?.() + } + } + + const output: HydrationScriptOutput = { + get state() { + return state + }, + get error() { + return failure + }, + pullChunk() { + if (state === HydrationScriptOutputState.Ready) { + activeRecord = records.shift()! + } else if (state !== HydrationScriptOutputState.Active) { + throw new Error('Fake hydration output is not ready') + } + + const record = activeRecord! + const end = Math.min( + record.offset + MAX_HYDRATION_OUTPUT_CHUNK_BYTES, + record.bytes.length, + ) + const chunk = record.bytes.subarray(record.offset, end) + record.offset = end + if (end === record.bytes.length) { + activeRecord = undefined + } + updateState() + return chunk + }, + subscribe(onChange) { + if (listener) { + throw new Error('Fake hydration output already has a subscriber') + } + listener = onChange + return () => { + if (listener === onChange) { + listener = undefined + } + } + }, + } + + const { + reserveFastPath = () => false, + claimOutput = () => { + claimCalls.count++ + if (claimed) { + throw new Error('Fake hydration output already has a consumer') + } + claimed = true + return output + }, + liftBarrier = () => {}, + isInitialTaken = () => true, + startSerializationTimeout = (timeoutMs: number) => { + if ( + producerDone || + failure !== undefined || + serializationTimeout !== undefined + ) { + return + } + serializationTimeout = setTimeout(() => { + serializationTimeout = undefined + failure = new Error('Serialization timeout after app render finished') + console.error('Serialization timeout after app render finished') + updateState() + }, timeoutMs) + }, + ...serverSsrOverrides + } = opts const router: FakeRouter = { serverSsr: { - isSerializationFinished: () => false, - reserveStreamFastPath: () => false, - onInjectedHtml: (cb) => { - injectedListeners.push(cb) - return () => { - const i = injectedListeners.indexOf(cb) - if (i >= 0) injectedListeners.splice(i, 1) - } - }, - onSerializationFinished: (cb) => { - serializationListeners.push(cb) - return () => { - const i = serializationListeners.indexOf(cb) - if (i >= 0) serializationListeners.splice(i, 1) - } - }, - takeBufferedHtml: () => { - const v = buffered - buffered = '' - return v || undefined + hydrationScripts: { + reserveFastPath, + claimOutput, + liftBarrier, + isInitialTaken, + startSerializationTimeout, }, setRenderFinished: () => {}, + onCleanup: (cleanupListener: () => void) => { + if (cleanedUp) { + return + } + cleanupListeners.push(cleanupListener) + }, cleanup: () => { - if (cleanedUp) return + if (cleanedUp) { + return + } cleanedUp = true cleanupCalls.count++ + if (serializationTimeout !== undefined) { + clearTimeout(serializationTimeout) + serializationTimeout = undefined + } + records.length = 0 + activeRecord = undefined + failure = undefined + listener = undefined + state = HydrationScriptOutputState.Done + // Mirror the real implementation: snapshot + clear, then notify. + const pendingCleanupListeners = cleanupListeners.slice() + cleanupListeners.length = 0 + for (const cleanupListener of pendingCleanupListeners) { + cleanupListener() + } router.serverSsr = undefined }, - liftScriptBarrier: () => {}, - ...opts, + ...serverSsrOverrides, }, } + function emitHydrationRecord(record: string) { + records.push({ + bytes: encoder.encode(record), + offset: 0, + }) + updateState() + } + return { router, cleanupCalls, - injectHtml: (html: string) => { - buffered += html - for (const l of injectedListeners.slice()) { - try { - l() - } catch (err) { - console.error('SSR injected HTML listener error:', err) - } - } - }, + claimCalls, + emitHydrationRecord, + emitScriptBatch: (parts) => emitHydrationRecord(renderScriptBatch(parts)), finishSerialization: () => { - for (const l of serializationListeners.slice()) { - try { - l() - } catch (err) { - console.error('Serialization listener error:', err) - } + producerDone = true + if (serializationTimeout !== undefined) { + clearTimeout(serializationTimeout) + serializationTimeout = undefined } + updateState() + }, + failHydrationOutput: (error) => { + failure = error + updateState() }, } } @@ -114,6 +259,7 @@ function makeManualUpstream(): { stream: ReadableStream push: (s: string) => void close: () => void + error: (reason: unknown) => void cancelled: { value: boolean; reason: unknown } } { let controllerRef: ReadableStreamDefaultController | undefined @@ -132,30 +278,74 @@ function makeManualUpstream(): { stream, push: (s) => controllerRef!.enqueue(encoder.encode(s)), close: () => controllerRef!.close(), + error: (reason) => controllerRef!.error(reason), cancelled, } } async function readAll(s: ReadableStream): Promise { const reader = s.getReader() + const decoder = new TextDecoder() let out = '' - while (true) { + for (;;) { const { done, value } = await reader.read() - if (done) break - // Buffer.from accepts any ArrayBufferView regardless of realm (jsdom env). - out += Buffer.from( - value.buffer, - value.byteOffset, - value.byteLength, - ).toString('utf8') + if (done) { + break + } + out += decoder.decode(value, { stream: true }) } - return out + return out + decoder.decode() +} + +async function readAllBytes( + stream: ReadableStream, +): Promise { + const reader = stream.getReader() + const chunks: Array = [] + for (;;) { + const { done, value } = await reader.read() + if (done) { + break + } + chunks.push(Buffer.from(value)) + } + return Buffer.concat(chunks) +} + +async function readAllPipeableChunks(stream: Readable): Promise> { + const chunks: Array = [] + for await (const chunk of stream) { + chunks.push(Buffer.from(chunk)) + } + return chunks +} + +async function readAllPipeableBytes(stream: Readable): Promise { + return Buffer.concat(await readAllPipeableChunks(stream)) +} + +function makeLargeStringRecord(prefix: string, suffix: string) { + return ( + prefix + + 'x'.repeat( + MAX_HYDRATION_OUTPUT_CHUNK_BYTES - 1 - Buffer.byteLength(prefix), + ) + + '😀' + + '漢x'.repeat(20_000) + + suffix + ) } // Yield to the microtask queue a few times so async stream operations can // drain. Avoids reliance on real timers. async function flush(n = 5) { - for (let i = 0; i < n; i++) await Promise.resolve() + for (let i = 0; i < n; i++) { + await Promise.resolve() + } +} + +function createIssuePayload() { + return 'x'.repeat(17 * 1024 * 1024) } function createDeferred() { @@ -183,7 +373,24 @@ function renderManagedScript(tag: RouterManagedTag) { const id = attrs.id ? ` id="${attrs.id}"` : '' const className = attrs.className ? ` class="${attrs.className}"` : '' const nonce = attrs.nonce ? ` nonce="${attrs.nonce}"` : '' - return `${tag.children ?? ''}` + const streamPart = + 'data-tsr-stream-part' in attrs ? ' data-tsr-stream-part=""' : '' + return `${tag.children ?? ''}` +} + +function renderManagedScripts(tags: Array) { + return tags.map(renderManagedScript).join('') +} + +function renderInitialScripts(scripts: { + before: Array + boundary: RouterManagedTag +}) { + return renderManagedScripts([...scripts.before, scripts.boundary]) +} + +function renderScriptBatch(parts: ReadonlyArray) { + return `` } function createRealSsrRouter(dehydratedData: Record) { @@ -202,7 +409,37 @@ function createRealSsrRouter(dehydratedData: Record) { }) } -describe('transformStreamWithRouter — real SSR scripts', () => { +describe('transformReadableStreamWithRouter — real SSR scripts', () => { + test('uses pass-through after Scripts takes all eager hydration scripts', async () => { + const router = createRealSsrRouter({ eager: 'loader-data' }) + attachRouterServerSsrUtils({ router, manifest: undefined }) + + await router.load() + await router.serverSsr!.dehydrate() + + // This is the server-side work performed by during rendering. + const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags() + expect(initialScripts).toBeDefined() + + const serverSsr = router.serverSsr! + const setRenderFinished = vi.spyOn(serverSsr, 'setRenderFinished') + const upstream = makeManualUpstream() + const html = `
app
${renderInitialScripts( + initialScripts!, + )}` + + const output = transformReadableStreamWithRouter(router, upstream.stream) + + // Pass-through reservation must not require render completion in advance. + expect(setRenderFinished).not.toHaveBeenCalled() + upstream.push(html) + upstream.close() + + await expect(readAll(output)).resolves.toBe(html) + expect(setRenderFinished).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + }) + test('flushes stream-end scripts before body close when serialization finishes before transform starts', async () => { const streamed = createDeferred() const router = createRealSsrRouter({ streamed: streamed.promise }) @@ -211,28 +448,24 @@ describe('transformStreamWithRouter — real SSR scripts', () => { await router.load() await router.serverSsr!.dehydrate() - const barrierScript = router.serverSsr!.takeBufferedScripts() + const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags() + expect(initialScripts).toBeDefined() + const barrierScript = initialScripts!.boundary + expect(barrierScript.attrs).not.toHaveProperty('id') expect(barrierScript).toBeDefined() - expect(barrierScript!.attrs?.id).toBe(TSR_SCRIPT_BARRIER_ID) - expect(barrierScript!.children).toContain(`${GLOBAL_TSR}.router=`) - expect(barrierScript!.children).not.toContain(`${GLOBAL_TSR}.e()`) + const initialHtml = renderInitialScripts(initialScripts!) + expect(initialHtml).toContain(`${GLOBAL_TSR}.router=`) + expect(initialHtml).not.toContain(`${GLOBAL_TSR}.e()`) - const serializationDone = new Promise((resolve) => { - router.serverSsr!.onSerializationFinished(resolve) - }) streamed.resolve('done') - await serializationDone + await flush(20) const upstream = makeManualUpstream() - const output = transformStreamWithRouter( + const output = transformReadableStreamWithRouter( router as any, upstream.stream as any, ) - upstream.push( - `
app
${renderManagedScript( - barrierScript!, - )}`, - ) + upstream.push(`
app
${initialHtml}`) upstream.close() const html = await readAll(output as any) @@ -252,25 +485,22 @@ describe('transformStreamWithRouter — real SSR scripts', () => { await router.load() await router.serverSsr!.dehydrate() - const barrierScript = router.serverSsr!.takeBufferedScripts() - expect(barrierScript).toBeDefined() + const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags() + expect(initialScripts).toBeDefined() const upstream = makeManualUpstream() - const output = transformStreamWithRouter( + const output = transformReadableStreamWithRouter( router as any, upstream.stream as any, ) upstream.push( - `
app
${renderManagedScript( - barrierScript!, + `
app
${renderInitialScripts( + initialScripts!, )}`, ) - const serializationDone = new Promise((resolve) => { - router.serverSsr!.onSerializationFinished(resolve) - }) streamed.controller.close() - await serializationDone + await flush(20) upstream.close() const html = await readAll(output as any) @@ -283,7 +513,55 @@ describe('transformStreamWithRouter — real SSR scripts', () => { expect(endIndex).toBeLessThan(html.indexOf('')) }) - test('flushes stream-end scripts even when no barrier marker was emitted', async () => { + test.each([ + ['completes', false], + ['is cancelled before the payload finishes', true], + ] as const)( + 'loader controllers are aborted only when the response %s', + async (_name, cancelled) => { + let loaderSignal: AbortSignal | undefined + const deferred = createDeferred() + const rootRoute = new BaseRootRoute({}) + const indexRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => null, + loader: ({ abortController }) => { + loaderSignal = abortController.signal + return { deferred: deferred.promise } + }, + }) + const router = createTestRouter({ + routeTree: rootRoute.addChildren([indexRoute]), + history: createMemoryHistory({ initialEntries: ['/'] }), + isServer: true, + }) + attachRouterServerSsrUtils({ router, manifest: undefined }) + await router.load() + await router.serverSsr!.dehydrate() + const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags()! + + const upstream = makeManualUpstream() + const output = transformReadableStreamWithRouter(router, upstream.stream) + upstream.push( + `${renderInitialScripts(initialScripts)}`, + ) + upstream.close() + expect(loaderSignal?.aborted).toBe(false) + + if (cancelled) { + await output.cancel(new Error('client gone')) + } else { + deferred.resolve('late') + await readAll(output as any) + } + + expect(router.serverSsr).toBeUndefined() + expect(loaderSignal?.aborted).toBe(cancelled) + }, + ) + + test('emits router scripts after the document when no Scripts barrier was rendered', async () => { const streamed = createDeferred() const router = createRealSsrRouter({ streamed: streamed.promise }) attachRouterServerSsrUtils({ router, manifest: undefined }) @@ -291,14 +569,11 @@ describe('transformStreamWithRouter — real SSR scripts', () => { await router.load() await router.serverSsr!.dehydrate() - const serializationDone = new Promise((resolve) => { - router.serverSsr!.onSerializationFinished(resolve) - }) streamed.resolve('done') - await serializationDone + await flush(20) const upstream = makeManualUpstream() - const output = transformStreamWithRouter( + const output = transformReadableStreamWithRouter( router as any, upstream.stream as any, ) @@ -306,66 +581,37 @@ describe('transformStreamWithRouter — real SSR scripts', () => { upstream.close() const html = await readAll(output as any) - - expect(html).toContain(`${GLOBAL_TSR}.router=`) - expect(html).toContain(`${GLOBAL_TSR}.e()`) - expect(html.indexOf(`${GLOBAL_TSR}.e()`)).toBeLessThan( - html.indexOf(''), - ) - }) - - test('keeps stream scripts before uppercase body close', async () => { - const streamed = createDeferred() - const router = createRealSsrRouter({ streamed: streamed.promise }) - attachRouterServerSsrUtils({ router, manifest: undefined }) - - await router.load() - await router.serverSsr!.dehydrate() - const barrierScript = router.serverSsr!.takeBufferedScripts()! - - const upstream = makeManualUpstream() - const output = transformStreamWithRouter( - router as any, - upstream.stream as any, - ) - upstream.push( - `${renderManagedScript(barrierScript)}
app
`, - ) - - const serializationDone = new Promise((resolve) => { - router.serverSsr!.onSerializationFinished(resolve) - }) - streamed.resolve('done') - await serializationDone - upstream.close() - - const html = await readAll(output as any) - expect(html).toContain(`${GLOBAL_TSR}.e()`) - expect(html.indexOf(`${GLOBAL_TSR}.e()`)).toBeLessThan( - html.indexOf(''), + const documentEnd = html.indexOf('') + ''.length + expect(html.slice(0, documentEnd)).toBe( + '
app
', ) + const tail = html.slice(documentEnd) + expect(tail).toContain(`${GLOBAL_TSR}.router=`) + expect(tail).toContain(`${GLOBAL_TSR}.e()`) + expect(tail).toMatch(/<\/script>$/) + expect(router.serverSsr).toBeUndefined() }) test('detects a barrier marker split across chunks', async () => { let liftCalls = 0 const { router, finishSerialization } = makeRouter({ - liftScriptBarrier: () => { + liftBarrier: () => { liftCalls++ }, }) const upstream = makeManualUpstream() - const output = transformStreamWithRouter( + const output = transformReadableStreamWithRouter( router as any, upstream.stream as any, ) - const splitAt = Math.floor(TSR_SCRIPT_BARRIER_ID.length / 2) + const markerStart = SCRIPT_BARRIER_HTML.indexOf( + HYDRATION_SCRIPT_BOUNDARY_SUFFIX, + ) + const splitAt = + markerStart + Math.floor(HYDRATION_SCRIPT_BOUNDARY_SUFFIX.length / 2) - upstream.push( - `
app
`, - ) + upstream.push(`${SCRIPT_BARRIER_HTML.slice(0, splitAt)}`) + upstream.push(`${SCRIPT_BARRIER_HTML.slice(splitAt)}
app
`) upstream.push('') upstream.close() finishSerialization() @@ -375,85 +621,239 @@ describe('transformStreamWithRouter — real SSR scripts', () => { }) test('does not inject stream scripts inside a split barrier script', async () => { - const { router, injectHtml, finishSerialization } = makeRouter({ - liftScriptBarrier: () => { - injectHtml('') + const { router, emitScriptBatch, finishSerialization } = makeRouter({ + liftBarrier: () => { + emitScriptBatch(['streamed()']) }, }) const upstream = makeManualUpstream() - const output = transformStreamWithRouter( + const output = transformReadableStreamWithRouter( router as any, upstream.stream as any, ) + const splitAt = + SCRIPT_BARRIER_HTML.indexOf(HYDRATION_SCRIPT_BOUNDARY_SUFFIX) + 4 upstream.push( - `
app
after
') finishSerialization() upstream.push('') upstream.close() const html = await readAll(output as any) - expect(html.indexOf('')).toBeGreaterThan( - html.indexOf('
after
'), + expect(html.indexOf(renderScriptBatch(['streamed()']))).toBeGreaterThan( + html.indexOf(SCRIPT_BARRIER_HTML), ) - expect(html.indexOf('')).toBeLessThan( + expect(html.indexOf(renderScriptBatch(['streamed()']))).toBeLessThan( + html.indexOf('
after
'), + ) + expect(html.indexOf(renderScriptBatch(['streamed()']))).toBeLessThan( html.indexOf(''), ) }) - test('remembers a flushed barrier marker until a later closing-tag boundary', async () => { - let liftCalls = 0 - const { router, finishSerialization } = makeRouter({ - liftScriptBarrier: () => { - liftCalls++ - }, - }) + test('uses a complete renderer record as an insertion boundary', async () => { + const { router, emitScriptBatch, finishSerialization } = makeRouter() const upstream = makeManualUpstream() - const output = transformStreamWithRouter( + const output = transformReadableStreamWithRouter( router as any, upstream.stream as any, + { + rendererSafePoint: 'record-end', + }, ) - const filler = 'x'.repeat(MAX_LEFTOVER_CHARS + 32) + const reader = output.getReader() + const decoder = new TextDecoder() + let html = '' - upstream.push( - `
app
', + ) + const output = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + + upstream.controller.enqueue(rendererBytes) + upstream.controller.close() + + await expect(readAllBytes(output)).resolves.toEqual( + Buffer.from(rendererBytes), + ) + expect(claimCalls.count).toBe(0) + expect(cleanupCalls.count).toBe(1) + }) + + test('dynamic pass-through preserves renderer bytes after document closes', async () => { + let allowFastPath = false + let reserveCalls = 0 + const { router, cleanupCalls, claimCalls, finishSerialization } = + makeRouter({ + reserveFastPath: () => { + reserveCalls++ + return allowFastPath + }, + }) + finishSerialization() + const upstream = createControlledStream() + const encoder = new TextEncoder() + const prefix = '
shell
' + const suffix = '' + const output = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + const reader = output.getReader() + + expect(reserveCalls).toBe(1) + allowFastPath = true + upstream.controller.enqueue(encoder.encode(prefix)) + expect(Buffer.from((await reader.read()).value!).toString()).toBe(prefix) + + // Finishing serialization alone cannot bypass the rendered boundary. + expect(reserveCalls).toBe(1) + upstream.controller.enqueue(encoder.encode(SCRIPT_BARRIER_HTML + suffix)) + expect(Buffer.from((await reader.read()).value!).toString()).toBe( + SCRIPT_BARRIER_HTML, + ) + expect(reserveCalls).toBe(1) + + // The next pull enters the scanner-free post-boundary pass-through phase. + expect(Buffer.from((await reader.read()).value!).toString()).toBe(suffix) + expect(reserveCalls).toBe(2) + expect(claimCalls.count).toBe(1) + upstream.controller.close() + + expect((await reader.read()).done).toBe(true) + expect(cleanupCalls.count).toBe(1) + }) + + test('generic streams wait for the document close before a late batch', async () => { + const { router, emitScriptBatch, cleanupCalls, finishSerialization } = + makeRouter() + const upstream = makeManualUpstream() + const output = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + const reader = output.getReader() + const firstAppChunk = '
first
' + + upstream.push(`${SCRIPT_BARRIER_HTML}${firstAppChunk}`) + const barrier = await reader.read() + const first = await reader.read() + expect(Buffer.from(barrier.value!).toString()).toBe(SCRIPT_BARRIER_HTML) + expect(Buffer.from(first.value!).toString()).toBe(firstAppChunk) + + const parts = ['lateBatch()'] + emitScriptBatch(parts) + upstream.push('next') + finishSerialization() + upstream.close() + + const remaining: Array = [] + for (;;) { + const { done, value } = await reader.read() + if (done) { + break + } + remaining.push(value) + } + + expect( + Buffer.concat([barrier.value!, first.value!, ...remaining]).toString(), + ).toBe( + `${SCRIPT_BARRIER_HTML}${firstAppChunk}next${renderScriptBatch( + parts, + )}`, + ) + expect(cleanupCalls.count).toBe(1) + }) + + test.each([ + ['record-end safe points', { rendererSafePoint: 'record-end' }], + ['conservative safe points', undefined], + ] as const)( + '%s preserve a non-canonical document close when a batch arrives later', + async (_, options) => { + const { router, emitScriptBatch, cleanupCalls, finishSerialization } = + makeRouter() + const upstream = makeManualUpstream() + const output = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + options, + ) + const reader = output.getReader() + const rendererHtml = + `
app
${SCRIPT_BARRIER_HTML}` + + '\n' + + upstream.push(rendererHtml) + let received = '' + while (received.length < rendererHtml.length) { + const result = await reader.read() + expect(result.done).toBe(false) + received += Buffer.from(result.value!).toString() + } + expect(received).toBe(rendererHtml) + + const parts = ['lateBatch()'] + emitScriptBatch(parts) + finishSerialization() + upstream.close() + + let remaining = '' + for (;;) { + const { done, value } = await reader.read() + if (done) { + break + } + remaining += Buffer.from(value).toString() + } + + expect(received + remaining).toBe(rendererHtml + renderScriptBatch(parts)) + expect(cleanupCalls.count).toBe(1) + }, + ) + + test('an aborted request stops eager string rendering', async () => { + const reason = new Error('request aborted') + const abortController = new AbortController() + abortController.abort(reason) + const onAbort = vi.fn() + const setRenderFinished = vi.fn() + const { router, cleanupCalls } = makeRouter({ + reserveFastPath: () => true, + setRenderFinished, + }) + + await expect( + transformHtmlStringWithRouter( + router as any, + 'ready', + { signal: abortController.signal, onAbort }, + ), + ).rejects.toBe(reason) + expect(setRenderFinished).not.toHaveBeenCalled() + expect(onAbort).toHaveBeenCalledOnce() + expect(onAbort).toHaveBeenCalledWith(reason) + expect(cleanupCalls.count).toBe(1) + }) + + test('a locked input stream fails synchronously and cleans SSR state', () => { + const { router, cleanupCalls } = makeRouter({ + reserveFastPath: () => true, + }) + const upstream = new ReadableStream() + const upstreamReader = upstream.getReader() + const onAbort = vi.fn() + + expect(() => + transformReadableStreamWithRouter(router as any, upstream as any, { + onAbort, + }), + ).toThrow() + expect(onAbort).toHaveBeenCalledOnce() + expect(cleanupCalls.count).toBe(1) + + upstreamReader.releaseLock() + }) + + test('a setup failure cancels an acquired input stream', async () => { + const { router, cleanupCalls } = makeRouter({ + reserveFastPath: () => { + throw new Error('setup failed') + }, + }) + const upstream = makeManualUpstream() + const onAbort = vi.fn() + + expect(() => + transformReadableStreamWithRouter(router as any, upstream.stream as any, { + onAbort, + }), + ).toThrow('setup failed') + await flush() + + expect(upstream.cancelled.value).toBe(true) + expect(onAbort).toHaveBeenCalledOnce() + expect(cleanupCalls.count).toBe(1) + }) + + test('a pre-aborted request fails setup before selecting a stream path', async () => { + const reserveFastPath = vi.fn(() => true) + const { router, cleanupCalls } = makeRouter({ reserveFastPath }) + const upstream = makeManualUpstream() + const requestAbort = new AbortController() + const reason = new Error('request already ended') + const onAbort = vi.fn() + requestAbort.abort(reason) + + expect(() => + transformReadableStreamWithRouter(router as any, upstream.stream as any, { + signal: requestAbort.signal, + onAbort, + }), + ).toThrow(reason) + await flush() + + expect(reserveFastPath).not.toHaveBeenCalled() + expect(upstream.cancelled).toEqual({ value: true, reason }) + expect(onAbort).toHaveBeenCalledOnce() + expect(cleanupCalls.count).toBe(1) + }) + + test('an already-failed hydration channel fails stream setup', async () => { + const state = makeRouter() + const upstream = makeManualUpstream() + const reason = new Error('hydration already failed') + const onAbort = vi.fn() + state.failHydrationOutput(reason) + + expect(() => + transformReadableStreamWithRouter( + state.router as any, + upstream.stream as any, + { + onAbort, + }, + ), + ).toThrow(reason) + await flush() + + expect(upstream.cancelled).toEqual({ value: true, reason }) + expect(onAbort).toHaveBeenCalledOnce() + expect(state.cleanupCalls.count).toBe(1) + }) + + test.each([ + ['fast', true], + ['merge', false], + ] as const)( + 'request abort immediately closes the %s path', + async (_, reserveFastPath) => { + const { router, cleanupCalls } = makeRouter({ + reserveFastPath: () => reserveFastPath, + }) + const upstream = makeManualUpstream() + const requestAbort = new AbortController() + const onAbort = vi.fn() + const output = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + { + signal: requestAbort.signal, + onAbort, + }, + ) + const reader = output.getReader() + const pendingRead = reader.read() + const reason = new Error('request ended') + + requestAbort.abort(reason) + + await expect(pendingRead).rejects.toBe(reason) + await flush() + expect(upstream.cancelled).toEqual({ value: true, reason }) + expect(onAbort).toHaveBeenCalledOnce() + expect(cleanupCalls.count).toBe(1) + }, + ) + test('downstream cancel propagates upstream and calls serverSsr.cleanup once', async () => { // Fast path: simpler, no scanner. Verifies cancel + cleanup contract. const { router, cleanupCalls } = makeRouter({ - isSerializationFinished: () => true, - reserveStreamFastPath: () => true, - takeBufferedHtml: () => undefined, + reserveFastPath: () => true, }) const upstream = makeManualUpstream() - const out = transformStreamWithRouter(router as any, upstream.stream as any) + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) const reader = ( out as any ).getReader() as ReadableStreamDefaultReader @@ -491,11 +1244,9 @@ describe('transformStreamWithRouter — cleanup side-effects', () => { expect(cleanupCalls.count).toBe(1) }) - test('downstream cancel waits for upstream cancellation to settle', async () => { + test('downstream cancel releases the upstream reader while cancellation settles', async () => { const { router, cleanupCalls } = makeRouter({ - isSerializationFinished: () => true, - reserveStreamFastPath: () => true, - takeBufferedHtml: () => undefined, + reserveFastPath: () => true, }) let resolveCancel!: () => void @@ -510,7 +1261,10 @@ describe('transformStreamWithRouter — cleanup side-effects', () => { }, }) - const out = transformStreamWithRouter(router as any, upstream as any) + const out = transformReadableStreamWithRouter( + router as any, + upstream as any, + ) const reader = ( out as any ).getReader() as ReadableStreamDefaultReader @@ -522,6 +1276,7 @@ describe('transformStreamWithRouter — cleanup side-effects', () => { await flush() expect(cancelSettled).toBe(false) + expect(upstream.locked).toBe(false) expect(cleanupCalls.count).toBe(1) resolveCancel() @@ -529,33 +1284,16 @@ describe('transformStreamWithRouter — cleanup side-effects', () => { expect(cancelSettled).toBe(true) }) - test('natural close calls cleanup exactly once', async () => { - const { router, cleanupCalls } = makeRouter({ - isSerializationFinished: () => true, - reserveStreamFastPath: () => true, - takeBufferedHtml: () => undefined, - }) - const upstream = makeManualUpstream() - - const out = transformStreamWithRouter(router as any, upstream.stream as any) - - upstream.push('done') - upstream.close() - - const text = await readAll(out as any) - expect(text).toContain('done') - expect(cleanupCalls.count).toBe(1) - }) - test('stream response metadata defers cleanup until body drains', async () => { const { router, cleanupCalls } = makeRouter({ - isSerializationFinished: () => true, - reserveStreamFastPath: () => true, - takeBufferedHtml: () => undefined, + reserveFastPath: () => true, }) const upstream = makeManualUpstream() - const out = transformStreamWithRouter(router as any, upstream.stream as any) + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) const response = new Response(out as any) const result = createSsrStreamResponse(router as any, response) @@ -571,19 +1309,19 @@ describe('transformStreamWithRouter — cleanup side-effects', () => { test('stream response dispose cancels body and cleans once', async () => { const { router, cleanupCalls } = makeRouter({ - isSerializationFinished: () => true, - reserveStreamFastPath: () => true, - takeBufferedHtml: () => undefined, + reserveFastPath: () => true, }) const upstream = makeManualUpstream() - const out = transformStreamWithRouter(router as any, upstream.stream as any) + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) const result = createSsrStreamResponse( router as any, new Response(out as any), ) expect(result.serverSsrCleanup).toBe('stream') - if (result.serverSsrCleanup !== 'stream') return await result.dispose('dropped') await result.dispose('dropped-again') @@ -592,113 +1330,281 @@ describe('transformStreamWithRouter — cleanup side-effects', () => { expect(cleanupCalls.count).toBe(1) }) - test('SSR fast path is used when explicitly safe', async () => { - let takeBufferedHtmlCalls = 0 + test('stream response replacement does not wait for cancellation', async () => { + const { router, cleanupCalls } = makeRouter({ + reserveFastPath: () => true, + }) + let cancelCalls = 0 + const stream = new ReadableStream({ + cancel() { + cancelCalls++ + return new Promise(() => {}) + }, + }) + const result = createSsrStreamResponse( + router as any, + new Response(stream as any), + ) + const replacement = new Response('replacement') + + const next = replaceSsrResponse(result, replacement, 'replaced') + + expect(next.response).toBe(replacement) + expect(cancelCalls).toBe(1) + expect(cleanupCalls.count).toBe(1) + }) + + test('external serverSsr cleanup releases a never-read merge transform immediately', async () => { + vi.useFakeTimers() + try { + const { router, cleanupCalls } = makeRouter() + const upstream = makeManualUpstream() + const aborts: Array = [] + + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + { + onAbort: (reason) => aborts.push(reason), + }, + ) + expect(vi.getTimerCount()).toBe(1) + + // A discarded response is never read and never cancelled; external + // cleanup must not leave the transform pinned until the lifetime timer. + router.serverSsr!.cleanup() + + expect(cleanupCalls.count).toBe(1) + expect(aborts).toHaveLength(1) + expect((aborts[0] as Error).name).toBe('AbortError') + expect(upstream.cancelled.value).toBe(true) + expect(vi.getTimerCount()).toBe(0) + await expect(out.getReader().read()).rejects.toMatchObject({ + name: 'AbortError', + }) + } finally { + vi.useRealTimers() + } + }) + + test('external serverSsr cleanup releases a never-read fast-path transform immediately', async () => { + vi.useFakeTimers() + try { + const { router, cleanupCalls } = makeRouter({ + reserveFastPath: () => true, + }) + const upstream = makeManualUpstream() + const aborts: Array = [] + + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + { + onAbort: (reason) => aborts.push(reason), + }, + ) + expect(vi.getTimerCount()).toBe(1) + + router.serverSsr!.cleanup() + + expect(cleanupCalls.count).toBe(1) + expect(aborts).toHaveLength(1) + expect(upstream.cancelled.value).toBe(true) + expect(vi.getTimerCount()).toBe(0) + await expect(out.getReader().read()).rejects.toMatchObject({ + name: 'AbortError', + }) + } finally { + vi.useRealTimers() + } + }) + + test('external serverSsr cleanup promptly fails a merge stream parked on hydration output', async () => { + const { router, cleanupCalls } = makeRouter() + const upstream = makeManualUpstream() + const aborts: Array = [] + + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + { + onAbort: (reason) => aborts.push(reason), + }, + ) + const reader = out.getReader() + + upstream.push(`${SCRIPT_BARRIER_HTML}`) + const first = await reader.read() + expect(first.done).toBe(false) + + // Renderer EOF with hydration output still Waiting parks the pump. + upstream.close() + const parked = reader.read() + await new Promise((resolve) => setTimeout(resolve, 0)) + + router.serverSsr!.cleanup() + + await expect(parked).rejects.toMatchObject({ name: 'AbortError' }) + expect(cleanupCalls.count).toBe(1) + expect(aborts).toHaveLength(1) + }) + + test('SSR byte-0 pass-through is used when explicitly safe', async () => { let setRenderFinishedCalls = 0 const { router, cleanupCalls } = makeRouter({ - isSerializationFinished: () => true, - reserveStreamFastPath: () => true, - takeBufferedHtml: () => { - takeBufferedHtmlCalls++ - return undefined - }, + reserveFastPath: () => true, setRenderFinished: () => { setRenderFinishedCalls++ }, }) const upstream = makeManualUpstream() - const out = transformStreamWithRouter(router as any, upstream.stream as any) + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) upstream.push('done') upstream.close() const text = await readAll(out as any) expect(text).toBe('done') - expect(takeBufferedHtmlCalls).toBe(0) expect(setRenderFinishedCalls).toBe(1) expect(cleanupCalls.count).toBe(1) }) - test('SSR fast path is bypassed when not explicitly safe', async () => { - let takeBufferedHtmlCalls = 0 - let pendingHtml: string | undefined = '' - const { router, injectHtml, finishSerialization } = makeRouter({ - isSerializationFinished: () => true, - reserveStreamFastPath: () => false, - takeBufferedHtml: () => { - takeBufferedHtmlCalls++ - const html = pendingHtml - pendingHtml = undefined - return html - }, + test('SSR pass-through is bypassed when not explicitly safe', async () => { + const { router, emitScriptBatch, finishSerialization } = makeRouter({ + reserveFastPath: () => false, }) const upstream = makeManualUpstream() - const out = transformStreamWithRouter(router as any, upstream.stream as any) - upstream.push('done') + emitScriptBatch(['pending()']) + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + upstream.push(`done${SCRIPT_BARRIER_HTML}`) upstream.close() finishSerialization() const text = await readAll(out as any) - expect(text).toContain('') - expect(text.indexOf('')).toBeLessThan( + expect(text).toContain(renderScriptBatch(['pending()'])) + expect(text.indexOf(renderScriptBatch(['pending()']))).toBeLessThan( text.indexOf(''), ) - expect(takeBufferedHtmlCalls).toBeGreaterThan(0) }) - test('SSR fast path errors on unexpected late injection', async () => { + const lifetimeTimeoutCases = [ + { + name: 'pass-through with an active reader', + reserveFastPath: true, + activeReader: true, + }, + { + name: 'pass-through without an active reader', + reserveFastPath: true, + activeReader: false, + }, + { + name: 'main path with an active reader', + reserveFastPath: false, + activeReader: true, + }, + { + name: 'main path without an active reader', + reserveFastPath: false, + activeReader: false, + }, + ] as const + + test.each(lifetimeTimeoutCases)( + 'lifetime timeout errors $name and cleans up', + async ({ reserveFastPath, activeReader }) => { + vi.useFakeTimers() + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + try { + const { router, cleanupCalls } = makeRouter({ + reserveFastPath: () => reserveFastPath, + }) + const upstream = makeManualUpstream() + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + { + lifetimeMs: 10, + }, + ) + + if (activeReader) { + const reader = out.getReader() + const pendingRead = reader.read() + const readError = expect(pendingRead).rejects.toThrow( + 'Stream lifetime exceeded', + ) + + await vi.advanceTimersByTimeAsync(15) + + await readError + reader.releaseLock() + } else { + await vi.advanceTimersByTimeAsync(15) + + const reader = out.getReader() + await expect(reader.read()).rejects.toThrow( + 'Stream lifetime exceeded', + ) + reader.releaseLock() + } + + expect(upstream.cancelled.value).toBe(true) + expect(upstream.cancelled.reason).toEqual( + new Error('Stream lifetime exceeded'), + ) + expect(cleanupCalls.count).toBe(1) + expect(warnSpy).toHaveBeenCalledOnce() + } finally { + warnSpy.mockRestore() + vi.useRealTimers() + } + }, + ) + + test('serialization timeout fails a completed render exactly once', async () => { + vi.useFakeTimers() const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) try { - const { router, injectHtml, cleanupCalls } = makeRouter({ - isSerializationFinished: () => true, - reserveStreamFastPath: () => true, - }) + const onAbort = vi.fn() + const { router, cleanupCalls } = makeRouter() const upstream = makeManualUpstream() - - const out = transformStreamWithRouter( + const output = transformReadableStreamWithRouter( router as any, upstream.stream as any, + { + timeoutMs: 10, + lifetimeMs: 1_000, + onAbort, + }, ) - injectHtml('') - - await expect(readAll(out as any)).rejects.toThrow( - 'SSR router HTML injected during fast path', - ) - expect(cleanupCalls.count).toBe(1) - } finally { - errorSpy.mockRestore() - } - }) - - test('lifetime timeout cancels upstream and runs cleanup once', async () => { - vi.useFakeTimers() - try { - const { router, cleanupCalls } = makeRouter({ - isSerializationFinished: () => true, - takeBufferedHtml: () => undefined, - }) - const upstream = makeManualUpstream() - - const out = transformStreamWithRouter( - router as any, - upstream.stream as any, - { lifetimeMs: 10 }, + const outputPromise = readAll(output) + const outputError = expect(outputPromise).rejects.toThrow( + 'Serialization timeout after app render finished', ) - // Do NOT consume. Advance fake time past lifetimeMs deterministically. + upstream.push(`${SCRIPT_BARRIER_HTML}${DOCUMENT_CLOSE}`) + upstream.close() + await flush(10) await vi.advanceTimersByTimeAsync(15) - expect(upstream.cancelled.value).toBe(true) + await outputError + expect(onAbort).toHaveBeenCalledOnce() + expect(onAbort.mock.calls[0]![0]).toEqual( + new Error('Serialization timeout after app render finished'), + ) expect(cleanupCalls.count).toBe(1) - - // Drain (read errors silently) so vitest doesn't see an unhandled error. - const reader = ( - out as any - ).getReader() as ReadableStreamDefaultReader - reader.read().catch(() => {}) - reader.releaseLock() + expect(errorSpy).toHaveBeenCalledOnce() + expect(vi.getTimerCount()).toBe(0) } finally { + errorSpy.mockRestore() vi.useRealTimers() } }) @@ -712,10 +1618,7 @@ describe('transformStreamWithRouter — cleanup side-effects', () => { } process.on('unhandledRejection', onUnhandled) try { - const { router, cleanupCalls } = makeRouter({ - isSerializationFinished: () => true, - takeBufferedHtml: () => undefined, - }) + const { router, cleanupCalls } = makeRouter() const stream = new ReadableStream({ start() {}, @@ -725,7 +1628,10 @@ describe('transformStreamWithRouter — cleanup side-effects', () => { }, }) - const out = transformStreamWithRouter(router as any, stream as any) + const out = transformReadableStreamWithRouter( + router as any, + stream as any, + ) const reader = ( out as any ).getReader() as ReadableStreamDefaultReader @@ -746,173 +1652,628 @@ describe('transformStreamWithRouter — cleanup side-effects', () => { } }) - test('server cleanup throwing does not prevent terminal stream cleanup', async () => { + test('an output-channel failure terminates without another downstream pull', async () => { const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) try { - const { router, finishSerialization } = makeRouter({ - cleanup: () => { - throw new Error('cleanup-boom') - }, - }) + const { router, cleanupCalls, failHydrationOutput } = makeRouter() const upstream = makeManualUpstream() - - const out = transformStreamWithRouter( + const out = transformReadableStreamWithRouter( router as any, upstream.stream as any, ) - upstream.push('done') - upstream.close() - finishSerialization() + const reason = new Error('hydration-output-failed') - await expect(readAll(out as any)).resolves.toContain('done') - expect(errorSpy).toHaveBeenCalled() - } finally { - errorSpy.mockRestore() - } - }) + failHydrationOutput(reason) + await flush() - test('throwing injected listener does not skip transform drain', async () => { - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - try { - const { router, injectHtml, finishSerialization } = makeRouter() - router.serverSsr!.onInjectedHtml(() => { - throw new Error('external-listener-boom') - }) - const upstream = makeManualUpstream() - - const out = transformStreamWithRouter( - router as any, - upstream.stream as any, - ) - - upstream.push('
app
') - injectHtml('') - upstream.push('') - upstream.close() - finishSerialization() - - const text = await readAll(out as any) - expect(text).toContain('') - expect(text.indexOf('')).toBeLessThan( - text.indexOf(''), - ) - } finally { - errorSpy.mockRestore() - } - }) - - test('tail overflow errors and runs cleanup', async () => { - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - try { - const { router, cleanupCalls, finishSerialization } = makeRouter() - const upstream = makeManualUpstream() - - const out = transformStreamWithRouter( - router as any, - upstream.stream as any, - ) - upstream.push(`done${'x'.repeat(64 * 1024 + 1)}`) - upstream.close() - finishSerialization() - - await expect(readAll(out as any)).rejects.toThrow( - 'SSR stream tail exceeded maximum buffer', - ) + await expect(readAll(out as any)).rejects.toBe(reason) + expect(upstream.cancelled.value).toBe(true) expect(cleanupCalls.count).toBe(1) } finally { errorSpy.mockRestore() } }) - test('router HTML overflow errors and runs cleanup', async () => { - const { router, injectHtml, cleanupCalls } = makeRouter() + test('places a late router batch after a post-document script patch and before the relocated close', async () => { + const { router, emitScriptBatch, cleanupCalls, finishSerialization } = + makeRouter() const upstream = makeManualUpstream() + const output = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + { + rendererSafePoint: 'script-close', + }, + ) + const reader = output.getReader() + const shell = `

loading

${SCRIPT_BARRIER_HTML}` + // Minimal resolved segment and replacement call. The runtime helper can be + // installed by the shell. + const rendererPatch = + '' + + '' + const appHtml = `${shell}${rendererPatch}` - const out = transformStreamWithRouter(router as any, upstream.stream as any) - injectHtml('x'.repeat(MAX_ROUTER_HTML_CHARS + 1)) + upstream.push(appHtml) - await expect(readAll(out as any)).rejects.toThrow( - 'SSR router HTML exceeded maximum buffer', + const shellChunk = await reader.read() + expect(shellChunk.done).toBe(false) + expect(Buffer.from(shellChunk.value!).toString('utf8')).toBe(shell) + + const patchChunk = await reader.read() + expect(patchChunk.done).toBe(false) + expect(Buffer.from(patchChunk.value!).toString('utf8')).toBe(rendererPatch) + + // The original close suffix has now been scanned and held. This batch is + // deliberately emitted afterward to cover the late-arrival ordering. + const routerParts = ['routerPayload()'] + emitScriptBatch(routerParts) + finishSerialization() + + const routerChunk = await reader.read() + expect(routerChunk.done).toBe(false) + expect(Buffer.from(routerChunk.value!).toString('utf8')).toBe( + renderScriptBatch(routerParts), + ) + + upstream.close() + + const chunks = [shellChunk.value!, patchChunk.value!, routerChunk.value!] + for (;;) { + const { done, value } = await reader.read() + if (done) { + break + } + chunks.push(value) + } + + const actual = Buffer.concat(chunks.map((chunk) => Buffer.from(chunk))) + const routerScript = renderScriptBatch(routerParts) + const expected = Buffer.from( + `${shell}${rendererPatch}${routerScript}`, + ) + + expect(actual).toEqual(expected) + expect(actual.indexOf(Buffer.from(rendererPatch))).toBeLessThan( + actual.indexOf(Buffer.from(routerScript)), + ) + expect(actual.indexOf(Buffer.from(routerScript))).toBeLessThan( + actual.indexOf(Buffer.from('')), ) expect(cleanupCalls.count).toBe(1) }) - test('pending output overflow errors and runs cleanup', async () => { - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - try { - const { router, cleanupCalls, finishSerialization } = makeRouter() + test.each(internalSplitOffsets(SCRIPT_CLOSE))( + 'waits for a script-close safe point split at byte %s before a router batch', + async (splitAt) => { + const { router, emitScriptBatch, finishSerialization } = makeRouter() const upstream = makeManualUpstream() - - const out = transformStreamWithRouter( + const output = transformReadableStreamWithRouter( router as any, upstream.stream as any, + { + rendererSafePoint: 'script-close', + }, ) - upstream.push(`${'x'.repeat(16 * 1024 * 1024 + 1)}`) - upstream.close() - finishSerialization() + const reader = output.getReader() + const patchPrefix = + '' + + upstream.push(`${SCRIPT_BARRIER_HTML}${patchPrefix}`) + expect(Buffer.from((await reader.read()).value!).toString()).toBe( + SCRIPT_BARRIER_HTML, + ) + expect(Buffer.from((await reader.read()).value!).toString()).toBe( + patchPrefix.slice(0, -1), + ) + + const parts = ['streamed()'] + emitScriptBatch(parts) + upstream.push(`${patchSuffix}${DOCUMENT_CLOSE}`) + upstream.close() + finishSerialization() + + let remaining = '' + for (;;) { + const { done, value } = await reader.read() + if (done) { + break + } + remaining += Buffer.from(value).toString() } + + expect(remaining).toBe( + `<${patchSuffix}${renderScriptBatch(parts)}${DOCUMENT_CLOSE}`, + ) }) - test('long text without closing tags partially flushes and keeps bounded leftover', async () => { - const { router, finishSerialization } = makeRouter() + test('places a router batch after a script-terminated patch and before its final close', async () => { + const { router, emitScriptBatch, cleanupCalls, finishSerialization } = + makeRouter() const upstream = makeManualUpstream() - const out = transformStreamWithRouter(router as any, upstream.stream as any) - const reader = (out as any).getReader() - const text = 'x'.repeat(MAX_LEFTOVER_CHARS + 32) + const output = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + { + rendererSafePoint: 'script-close', + }, + ) + const reader = output.getReader() + const shell = + `` + + `

loading

${SCRIPT_BARRIER_HTML}` + + '' + const rendererPatch = + '' + + '' - upstream.push(text) + upstream.push(shell) + const shellChunks = [await reader.read(), await reader.read()] + expect( + Buffer.concat( + shellChunks.map((chunk) => Buffer.from(chunk.value!)), + ).toString(), + ).toBe(shell) - const first = await reader.read() - expect(first.done).toBe(false) - const firstText = Buffer.from(first.value).toString('utf8') - expect(firstText).toBe('x'.repeat(32)) + upstream.push(rendererPatch) + const patchChunk = await reader.read() + expect(Buffer.from(patchChunk.value!).toString()).toBe(rendererPatch) + const routerParts = ['routerPayload()'] + emitScriptBatch(routerParts) + finishSerialization() + const routerChunk = await reader.read() + expect(Buffer.from(routerChunk.value!).toString()).toBe( + renderScriptBatch(routerParts), + ) + + upstream.push(DOCUMENT_CLOSE) + upstream.close() + + const closeChunk = await reader.read() + expect(Buffer.from(closeChunk.value!).toString()).toBe(DOCUMENT_CLOSE) + expect((await reader.read()).done).toBe(true) + expect(cleanupCalls.count).toBe(1) + }) + + test.each(['one byte chunk', 'byte chunks', 'one string record'] as const)( + 'relocates the document close after script safe points in %s', + async (input) => { + const { router, finishSerialization, cleanupCalls } = makeRouter() + const upstream = createControlledStream() + const output = transformReadableStreamWithRouter( + router as any, + upstream.stream, + { rendererSafePoint: 'script-close' }, + ) + const reader = output.getReader() + const patch = '' + const prefix = SCRIPT_BARRIER_HTML + patch + const filler = 'x'.repeat( + MAX_HYDRATION_OUTPUT_CHUNK_BYTES - prefix.length, + ) + const afterClose = '' + const first = prefix + filler + const last = DOCUMENT_CLOSE + afterClose + const encoder = new TextEncoder() + + if (input === 'one string record') { + upstream.controller.enqueue(first + last) + } else if (input === 'byte chunks') { + upstream.controller.enqueue(encoder.encode(first)) + upstream.controller.enqueue(encoder.encode(last)) + } else { + upstream.controller.enqueue(encoder.encode(first + last)) + } + upstream.controller.close() + + expect(Buffer.from((await reader.read()).value!).toString()).toBe( + SCRIPT_BARRIER_HTML, + ) + // Keep hydration waiting until a script safe point has interrupted the + // document-close search. The byte/string variants then advance chunks. + expect(Buffer.from((await reader.read()).value!).toString()).toBe(patch) + finishSerialization() + reader.releaseLock() + + await expect(readAll(output)).resolves.toBe( + filler + afterClose + DOCUMENT_CLOSE, + ) + expect(cleanupCalls.count).toBe(1) + }, + ) + + test.each( + ['', ''].flatMap((prefix) => + internalSplitOffsets(prefix + DOCUMENT_CLOSE).map((splitAt) => ({ + prefix, + splitAt, + })), + ), + )( + 'relocates the structural document close after "$prefix" split at byte $splitAt', + async ({ prefix, splitAt }) => { + const { router, finishSerialization } = makeRouter() + const upstream = makeManualUpstream() + const output = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + { rendererSafePoint: 'script-close' }, + ) + const shell = `${SCRIPT_BARRIER_HTML}` + const patch = '' + const beforeClose = `${shell}${patch}
app
` + const afterClose = '' + const close = prefix + DOCUMENT_CLOSE + + upstream.push(beforeClose + close.slice(0, splitAt)) + upstream.push(close.slice(splitAt) + afterClose) + upstream.close() + const reader = output.getReader() + expect(Buffer.from((await reader.read()).value!).toString()).toBe(shell) + expect(Buffer.from((await reader.read()).value!).toString()).toBe(patch) + finishSerialization() + reader.releaseLock() + + await expect(readAll(output)).resolves.toBe( + '
app
' + prefix + afterClose + DOCUMENT_CLOSE, + ) + }, + ) + + test('reconstructs one emoji split across upstream UTF-8 byte chunks', async () => { + const { router, finishSerialization } = makeRouter() + const upstream = createControlledStream() + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + const encoder = new TextEncoder() + const emoji = encoder.encode('😀') + const html = `

😀

${SCRIPT_BARRIER_HTML}` + + upstream.controller.enqueue(encoder.encode('

')) + upstream.controller.enqueue(emoji.slice(0, 2)) + upstream.controller.enqueue(emoji.slice(2)) + upstream.controller.enqueue( + encoder.encode(`

${SCRIPT_BARRIER_HTML}`), + ) + upstream.controller.close() + finishSerialization() + + await expect(readAll(out)).resolves.toBe(html) + }) + + test('does not interleave application bytes while an opaque record is active', async () => { + const { router, emitHydrationRecord, finishSerialization } = makeRouter() + const upstream = makeManualUpstream() + const output = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + const reader = output.getReader() + const record = 'R'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2 + 1) + const patch = '' + + upstream.push(`${SCRIPT_BARRIER_HTML}`) + expect(Buffer.from((await reader.read()).value!).toString()).toBe( + `${SCRIPT_BARRIER_HTML}`, + ) + + emitHydrationRecord(record) + upstream.push(patch + DOCUMENT_CLOSE) upstream.close() finishSerialization() let rest = '' for (;;) { const { done, value } = await reader.read() - if (done) break + if (done) { + break + } + rest += Buffer.from(value).toString() + } + + expect(rest).toBe(record + patch + DOCUMENT_CLOSE) + }) + + test('drains an active opaque record after prefetched renderer EOF', async () => { + const setRenderFinished = vi.fn() + const startSerializationTimeout = vi.fn() + const { router, emitHydrationRecord, finishSerialization } = makeRouter({ + setRenderFinished, + startSerializationTimeout, + }) + const upstream = makeManualUpstream() + const output = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + const reader = output.getReader() + const record = 'R'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES + 1) + + upstream.push(SCRIPT_BARRIER_HTML) + expect(Buffer.from((await reader.read()).value!).toString()).toBe( + SCRIPT_BARRIER_HTML, + ) + emitHydrationRecord(record) + finishSerialization() + upstream.close() + await flush() + + expect(startSerializationTimeout).toHaveBeenCalledOnce() + expect(startSerializationTimeout).toHaveBeenCalledWith(60_000) + expect(setRenderFinished).toHaveBeenCalledOnce() + + const first = await reader.read() + expect(first.done).toBe(false) + + let received = Buffer.from(first.value!).toString() + for (;;) { + const { done, value } = await reader.read() + if (done) { + break + } + received += Buffer.from(value).toString() + } + expect(received).toBe(record) + }) + + test('draining a large source does not read more app chunks per transport slice', async () => { + const { router, emitScriptBatch } = makeRouter() + const encoder = new TextEncoder() + let produced = 0 + const appStream = new ReadableStream({ + pull(controller) { + produced++ + controller.enqueue( + encoder.encode( + produced === 1 + ? `
app
${SCRIPT_BARRIER_HTML}` + : `

app-${produced}

`, + ), + ) + }, + }) + const out = transformReadableStreamWithRouter( + router as any, + appStream as any, + ) + emitScriptBatch([createIssuePayload()]) + const reader = out.getReader() + + const first = await reader.read() + expect(first.done).toBe(false) + await flush() + const producedBeforeRouterDrain = produced + + for (let index = 0; index < 8; index++) { + const next = await reader.read() + expect(next.done).toBe(false) + } + await flush() + + expect(produced).toBe(producedBeforeRouterDrain) + await reader.cancel() + }) + + test('a prefetched upstream error immediately stops an active large-source drain', async () => { + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const { router, emitScriptBatch, cleanupCalls } = makeRouter() + const upstream = makeManualUpstream() + const onAbort = vi.fn() + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + { onAbort }, + ) + const reader = out.getReader() + const upstreamError = new Error('renderer-failed') + + emitScriptBatch([createIssuePayload()]) + upstream.push(`${SCRIPT_BARRIER_HTML}`) + expect((await reader.read()).done).toBe(false) + expect((await reader.read()).done).toBe(false) + + upstream.error(upstreamError) + await flush() + + expect(cleanupCalls.count).toBe(1) + expect(onAbort).toHaveBeenCalledOnce() + expect(onAbort).toHaveBeenCalledWith(upstreamError) + await expect(reader.read()).rejects.toBe(upstreamError) + } finally { + errorSpy.mockRestore() + } + }) + + test('cancellation tears down an active large-source drain', async () => { + const { router, emitScriptBatch, cleanupCalls } = makeRouter() + const upstream = makeManualUpstream() + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + const reader = out.getReader() + + emitScriptBatch([createIssuePayload()]) + upstream.push(`
app
${SCRIPT_BARRIER_HTML}`) + + expect((await reader.read()).done).toBe(false) + expect((await reader.read()).done).toBe(false) + expect(cleanupCalls.count).toBe(0) + + await reader.cancel('consumer-gone') + + expect(upstream.cancelled.value).toBe(true) + expect(cleanupCalls.count).toBe(1) + }) + + test('lifetime timeout errors an active large-source drain', async () => { + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + vi.useFakeTimers() + try { + const { router, emitScriptBatch, cleanupCalls } = makeRouter() + const upstream = makeManualUpstream() + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + { + lifetimeMs: 10, + }, + ) + const reader = out.getReader() + + emitScriptBatch([createIssuePayload()]) + upstream.push(`
app
${SCRIPT_BARRIER_HTML}`) + + expect((await reader.read()).done).toBe(false) + expect((await reader.read()).done).toBe(false) + + await vi.advanceTimersByTimeAsync(15) + + await expect(reader.read()).rejects.toThrow('Stream lifetime exceeded') + expect(upstream.cancelled.value).toBe(true) + expect(upstream.cancelled.reason).toEqual( + new Error('Stream lifetime exceeded'), + ) + expect(cleanupCalls.count).toBe(1) + expect(warnSpy).toHaveBeenCalledOnce() + } finally { + vi.useRealTimers() + warnSpy.mockRestore() + } + }) + + test('forwards a large application byte chunk unchanged', async () => { + const { router, finishSerialization } = makeRouter() + const upstream = makeManualUpstream() + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + const reader = (out as any).getReader() + const text = '😀a'.repeat(50_000) + + upstream.push(text) + + const first = await reader.read() + expect(first.done).toBe(false) + const firstText = Buffer.from(first.value).toString('utf8') + expect(firstText).toBe(text) + + upstream.push(SCRIPT_BARRIER_HTML) + upstream.close() + finishSerialization() + + let rest = '' + for (;;) { + const { done, value } = await reader.read() + if (done) { + break + } rest += Buffer.from(value).toString('utf8') } - expect(firstText + rest).toBe(text) + expect(firstText + rest).toBe(text + SCRIPT_BARRIER_HTML) }) - test('takeBufferedHtml throwing errors stream and runs cleanup once', async () => { - const { router, cleanupCalls } = makeRouter({ - takeBufferedHtml: () => { - throw new Error('take-buffered-html-boom') - }, - }) + test('forwards an incomplete document close and drains pending router scripts', async () => { + const { router, emitScriptBatch, finishSerialization, cleanupCalls } = + makeRouter() const upstream = makeManualUpstream() + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + const reader = out.getReader() - const out = transformStreamWithRouter(router as any, upstream.stream as any) + upstream.push(`${SCRIPT_BARRIER_HTML}${SCRIPT_BARRIER_HTML}`, + ) - await expect(readAll(out as any)).rejects.toThrow('take-buffered-html-boom') + const pendingRead = reader.read() + await flush() + emitScriptBatch(['pending()']) + finishSerialization() + upstream.close() + + expect(Buffer.from((await pendingRead).value!).toString()).toBe( + 'pending();document.currentScript.remove()', + ) expect(cleanupCalls.count).toBe(1) }) test('downstream backpressure delays close; no chunks are lost', async () => { - // Consumer reads slowly: we verify all router-injected scripts AND the - // tail closing tags arrive before the stream ends, even though - // tryFinish() requests close while writes are still queued. - const { router, injectHtml, finishSerialization } = makeRouter() + // Consumer reads slowly: all router scripts and relocated closing tags + // must arrive before the stream ends. + const { router, emitScriptBatch, finishSerialization } = makeRouter() const upstream = makeManualUpstream() - const out = transformStreamWithRouter(router as any, upstream.stream as any) + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) - upstream.push('
a
') - // Queue many injected chunks while app is still rendering. - for (let i = 0; i < 50; i++) injectHtml(``) + upstream.push(`
a
${SCRIPT_BARRIER_HTML}`) + // Queue many script batches while app is still rendering. + for (let i = 0; i < 50; i++) { + emitScriptBatch([`S${i}`]) + } upstream.push('') upstream.close() finishSerialization() @@ -922,32 +2283,137 @@ describe('transformStreamWithRouter — cleanup side-effects', () => { expect(full).toContain('
a
') expect(full).toContain('') for (let i = 0; i < 50; i++) { - expect(full).toContain(``) + expect(full).toContain(renderScriptBatch([`S${i}`])) } // All scripts must appear before . - expect(full.indexOf('')).toBeLessThan( + expect(full.indexOf(renderScriptBatch(['S49']))).toBeLessThan( full.indexOf(''), ) }) }) -describe('transformStreamWithRouter — injected HTML ordering', () => { - test('router-injected HTML interleaves at scanner safe points, not mid-tag', async () => { - const { router, injectHtml, finishSerialization } = makeRouter() +describe('transformReadableStreamWithRouter — hydration output ordering', () => { + test('does not scan or lift the barrier before the initial script take', async () => { + let taken = false + const { router, emitScriptBatch, finishSerialization } = makeRouter({ + isInitialTaken: () => taken, + }) + const upstream = makeManualUpstream() + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + const reader = out.getReader() + const injected = 'late()' + const rendered = renderScriptBatch([injected]) + const decoder = new TextDecoder() + + // A Ready record plus barrier-lookalike bytes rendered before + // ran (initial take pending) must pass through without lifting. + emitScriptBatch([injected]) + upstream.push(`${SCRIPT_BARRIER_HTML}`) + const first = await reader.read() + expect(first.done).toBe(false) + expect(decoder.decode(first.value)).toBe( + `${SCRIPT_BARRIER_HTML}`, + ) + + // After the take, the real boundary lifts the barrier and the queued + // record is injected after it. + taken = true + upstream.push(`
x
${SCRIPT_BARRIER_HTML}${DOCUMENT_CLOSE}`) + upstream.close() + finishSerialization() + + let rest = '' + for (;;) { + const result = await reader.read() + if (result.done) { + break + } + rest += decoder.decode(result.value, { stream: true }) + } + const barrierEnd = + rest.indexOf(SCRIPT_BARRIER_HTML) + SCRIPT_BARRIER_HTML.length + expect(rest.indexOf(SCRIPT_BARRIER_HTML)).toBeGreaterThanOrEqual(0) + expect(rest.indexOf(rendered)).toBeGreaterThanOrEqual(barrierEnd) + expect(rest.endsWith(DOCUMENT_CLOSE)).toBe(true) + }) + + test('does not interpret close-looking bytes before the router boundary', async () => { + const { router, emitScriptBatch, finishSerialization } = makeRouter() + const upstream = makeManualUpstream() + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + const injected = 'pending()' + const rendered = renderScriptBatch([injected]) + const inlineScript = '' + + emitScriptBatch([injected]) + upstream.push( + `${inlineScript}
x
${SCRIPT_BARRIER_HTML}`, + ) + upstream.close() + finishSerialization() + + const full = await readAll(out as any) + expect(full).toContain(inlineScript) + expect(full.indexOf(rendered)).toBeGreaterThan(full.indexOf('')) + expect(full.indexOf(rendered)).toBeLessThan(full.lastIndexOf('')) + }) + + test('keeps queued script batches ordered when lifting the barrier emits synchronously', async () => { + const beforeLift = 'beforeLift()' + const duringLift = 'duringLift()' + const duringLiftEmitter: { + current?: (html: string) => void + } = {} + const { router, emitScriptBatch, finishSerialization } = makeRouter({ + liftBarrier: () => { + duringLiftEmitter.current!(duringLift) + }, + }) + duringLiftEmitter.current = (script) => emitScriptBatch([script]) + const upstream = makeManualUpstream() + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) + + emitScriptBatch([beforeLift]) + upstream.push(`${SCRIPT_BARRIER_HTML}`) + upstream.close() + finishSerialization() + + const full = await readAll(out as any) + expect(full.indexOf(renderScriptBatch([beforeLift]))).toBeGreaterThan( + full.indexOf(SCRIPT_BARRIER_HTML), + ) + expect(full.indexOf(renderScriptBatch([beforeLift]))).toBeLessThan( + full.indexOf(renderScriptBatch([duringLift])), + ) + expect(full.indexOf(renderScriptBatch([duringLift]))).toBeLessThan( + full.indexOf(''), + ) + }) + + test('drains queued batches after the exact boundary and before the close', async () => { + const { router, emitScriptBatch, finishSerialization } = makeRouter() const upstream = makeManualUpstream() - const out = transformStreamWithRouter(router as any, upstream.stream as any) + const out = transformReadableStreamWithRouter( + router as any, + upstream.stream as any, + ) - // App emits a chunk ending in a complete closing tag so the scanner - // can release content + flush pending router HTML at a safe boundary. - upstream.push('
app
') - // Injected during render — must be buffered, not enqueued ahead of - // pending app content, and not split across closing tags. - injectHtml('') - injectHtml('') + upstream.push(`
app
${SCRIPT_BARRIER_HTML}`) + // Router parts must not move ahead of pending application bytes. + emitScriptBatch(['X']) + emitScriptBatch(['Y']) - // Tail chunk: end of body. Triggers pendingClosingTags capture and - // flushPendingRouterHtml before the tail is emitted on tryFinish. + // The structural close is held until all router scripts finish. upstream.push('') upstream.close() finishSerialization() @@ -956,12 +2422,12 @@ describe('transformStreamWithRouter — injected HTML ordering', () => { // Order: app div → scripts → body close. expect(full).toContain('
app
') - expect(full).toContain('') - expect(full).toContain('') + expect(full).toContain(renderScriptBatch(['X'])) + expect(full).toContain(renderScriptBatch(['Y'])) expect(full.indexOf('
app
')).toBeLessThan( - full.indexOf(''), + full.indexOf(renderScriptBatch(['X'])), ) - expect(full.indexOf('')).toBeLessThan( + expect(full.indexOf(renderScriptBatch(['Y']))).toBeLessThan( full.indexOf(''), ) }) @@ -982,7 +2448,9 @@ describe('transformStreamWithRouter — injected HTML ordering', () => { const out = transformReadableStreamWithRouter( router as any, upstream as any, - { onAbort: () => aborts++ }, + { + onAbort: () => aborts++, + }, ) const reader = (out as any).getReader() @@ -997,7 +2465,9 @@ describe('transformStreamWithRouter — injected HTML ordering', () => { }) test('onAbort: NOT called on natural successful completion', async () => { - const { router, finishSerialization } = makeRouter() + const { router, finishSerialization } = makeRouter({ + reserveFastPath: () => true, + }) const upstream = new ReadableStream({ start(controller) { @@ -1010,23 +2480,249 @@ describe('transformStreamWithRouter — injected HTML ordering', () => { const out = transformReadableStreamWithRouter( router as any, upstream as any, - { onAbort: () => aborts++ }, + { + onAbort: () => aborts++, + }, ) - // tryFinish gates on serialization-finished; signal it AFTER transform - // has subscribed to the event. finishSerialization() // Drain to completion. const reader = (out as any).getReader() - while (true) { + for (;;) { const { done } = await reader.read() - if (done) break + if (done) { + break + } } expect(aborts).toBe(0) }) + test('readable wrapper accepts string chunks', async () => { + const { router } = makeRouter({ reserveFastPath: () => true }) + const source = 'string record' + const upstream = new ReadableStream({ + start(controller) { + controller.enqueue(source) + controller.close() + }, + }) + + const out = transformReadableStreamWithRouter(router as any, upstream) + + await expect(readAll(out)).resolves.toBe(source) + }) + + test('pipeable byte-0 pass-through encodes string records independently', async () => { + const { router } = makeRouter({ + reserveFastPath: () => true, + }) + const highSurrogate = String.fromCharCode(0xd83d) + const lowSurrogate = String.fromCharCode(0xde00) + const records = [ + '', + highSurrogate, + lowSurrogate, + '', + ] + const upstream = Readable.from(records) + const out = transformPipeableStreamWithRouter(router as any, upstream) + const actual = await readAllPipeableBytes(out) + const expected = Buffer.concat(records.map((record) => Buffer.from(record))) + + expect(actual).toEqual(expected) + expect(actual.includes(Buffer.from('😀'))).toBe(false) + }) + + test('pipeable byte-0 pass-through bounds one large string record', async () => { + const { router, cleanupCalls } = makeRouter({ + reserveFastPath: () => true, + }) + const source = makeLargeStringRecord('', '') + const upstream = Readable.from([source]) + const out = transformPipeableStreamWithRouter(router as any, upstream) + const chunks = await readAllPipeableChunks(out) + const actual = Buffer.concat(chunks) + + expect(source.indexOf('😀')).toBe(MAX_HYDRATION_OUTPUT_CHUNK_BYTES - 1) + expect(actual).toEqual(Buffer.from(source)) + expect( + Math.max(...chunks.map((chunk) => chunk.byteLength)), + ).toBeLessThanOrEqual(MAX_HYDRATION_OUTPUT_CHUNK_BYTES) + expect(cleanupCalls.count).toBe(1) + }) + + test('pipeable pass-through handles an encoding set during the first read', async () => { + const { router } = makeRouter({ + reserveFastPath: () => true, + }) + const source = 'français' + const upstream = new Readable({ + read() { + this.setEncoding('utf8') + this.push(Buffer.from(source)) + this.push(null) + }, + }) + + const out = transformPipeableStreamWithRouter(router as any, upstream) + const actual = await readAllPipeableBytes(out) + + expect(actual).toEqual(Buffer.from(source)) + }) + + test('pipeable merge path encodes string records independently', async () => { + const { router, emitScriptBatch, finishSerialization } = makeRouter() + const highSurrogate = String.fromCharCode(0xd83d) + const lowSurrogate = String.fromCharCode(0xde00) + const prefix = `${SCRIPT_BARRIER_HTML}` + const records = [prefix, highSurrogate, lowSurrogate, DOCUMENT_CLOSE] + const upstream = Readable.from(records) + const out = transformPipeableStreamWithRouter(router as any, upstream) + const parts = ['streamed()'] + + emitScriptBatch(parts) + finishSerialization() + + const actual = await readAllPipeableBytes(out) + const expected = Buffer.concat( + [ + prefix, + renderScriptBatch(parts), + highSurrogate, + lowSurrogate, + DOCUMENT_CLOSE, + ].map((record) => Buffer.from(record)), + ) + + expect(actual).toEqual(expected) + expect(actual.includes(Buffer.from('😀'))).toBe(false) + }) + + test('pipeable merge path bounds one large string record', async () => { + const { router, cleanupCalls, emitScriptBatch, finishSerialization } = + makeRouter() + const source = makeLargeStringRecord( + '
', + `
${SCRIPT_BARRIER_HTML}${DOCUMENT_CLOSE}`, + ) + const parts = ['streamed()'] + const routerScript = renderScriptBatch(parts) + const expected = + source.slice(0, -DOCUMENT_CLOSE.length) + routerScript + DOCUMENT_CLOSE + const upstream = Readable.from([source]) + const out = transformPipeableStreamWithRouter(router as any, upstream) + + emitScriptBatch(parts) + finishSerialization() + + const chunks = await readAllPipeableChunks(out) + const actual = Buffer.concat(chunks) + + expect(source.indexOf('😀')).toBe(MAX_HYDRATION_OUTPUT_CHUNK_BYTES - 1) + expect(actual).toEqual(Buffer.from(expected)) + expect(actual.indexOf(Buffer.from(routerScript))).toBeGreaterThan( + actual.indexOf(Buffer.from(SCRIPT_BARRIER_HTML)), + ) + expect(actual.indexOf(Buffer.from(routerScript))).toBeLessThan( + actual.lastIndexOf(Buffer.from(DOCUMENT_CLOSE)), + ) + expect( + Math.max(...chunks.map((chunk) => chunk.byteLength)), + ).toBeLessThanOrEqual(MAX_HYDRATION_OUTPUT_CHUNK_BYTES) + expect(cleanupCalls.count).toBe(1) + }) + + test('record-end does not split one large Node string record', async () => { + const { router, emitScriptBatch, finishSerialization, cleanupCalls } = + makeRouter() + const prefix = `${SCRIPT_BARRIER_HTML}` + const largeRecord = 'x'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2) + const parts = ['streamed()'] + const routerScript = renderScriptBatch(parts) + const upstream = Readable.from([prefix, largeRecord, DOCUMENT_CLOSE]) + const out = transformPipeableStreamWithRouter(router as any, upstream, { + rendererSafePoint: 'record-end', + }) + const iterator = out[Symbol.asyncIterator]() + const chunks = [Buffer.from((await iterator.next()).value)] + + chunks.push(Buffer.from((await iterator.next()).value)) + expect(chunks[0]).toEqual(Buffer.from(prefix)) + expect(chunks[1]).toEqual( + Buffer.alloc(MAX_HYDRATION_OUTPUT_CHUNK_BYTES, 'x'), + ) + + emitScriptBatch(parts) + finishSerialization() + + for (;;) { + const { done, value } = await iterator.next() + if (done) { + break + } + chunks.push(Buffer.from(value)) + } + + const actual = Buffer.concat(chunks) + const expected = Buffer.from( + prefix + largeRecord + routerScript + DOCUMENT_CLOSE, + ) + + expect(actual).toEqual(expected) + expect(actual.indexOf(Buffer.from(routerScript))).toBe( + Buffer.byteLength(prefix + largeRecord), + ) + expect(cleanupCalls.count).toBe(1) + }) + + test('cancelling a large Node string drain tears down once', async () => { + const { router, cleanupCalls } = makeRouter({ + reserveFastPath: () => true, + }) + const source = makeLargeStringRecord('', '') + let upstreamCancellations = 0 + let pushed = false + const upstream = new Readable({ + objectMode: true, + read() { + if (!pushed) { + pushed = true + this.push(source) + } + }, + destroy(_error, callback) { + upstreamCancellations++ + callback() + }, + }) + const upstreamClosed = new Promise((resolve) => { + upstream.once('close', resolve) + }) + const onAbort = vi.fn() + const out = transformReadableStreamWithRouter( + router as any, + Readable.toWeb(upstream) as any, + { + onAbort, + }, + ) + const reader = out.getReader() + const first = await reader.read() + + expect(first.value!.byteLength).toBe(MAX_HYDRATION_OUTPUT_CHUNK_BYTES - 1) + + const reason = new Error('consumer stopped') + await reader.cancel(reason) + await upstreamClosed + await flush() + + expect(upstreamCancellations).toBe(1) + expect(onAbort).toHaveBeenCalledOnce() + expect(cleanupCalls.count).toBe(1) + }) + test('onAbort: fires when pipeable wrapper consumer destroys', async () => { const { router, finishSerialization } = makeRouter() finishSerialization() @@ -1053,12 +2749,13 @@ describe('transformStreamWithRouter — injected HTML ordering', () => { expect(aborts).toBe(1) // Cleanup: destroy upstream so we don't leak. - if (!pass.destroyed) pass.destroy() + if (!pass.destroyed) { + pass.destroy() + } }) test('onAbort: lifetime timeout triggers abort exactly once', async () => { vi.useFakeTimers() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) try { const { router, finishSerialization } = makeRouter() @@ -1076,19 +2773,24 @@ describe('transformStreamWithRouter — injected HTML ordering', () => { const out = transformReadableStreamWithRouter( router as any, upstream as any, - { onAbort: () => aborts++, lifetimeMs: 1000 }, + { + onAbort: () => aborts++, + lifetimeMs: 1000, + }, ) - // Start reading (which may reject when stream is errored) + // Start reading before the lifetime watchdog errors the stream. const reader = (out as any).getReader() - const readP = reader.read().catch(() => undefined) + const readP = reader.read() + const readError = expect(readP).rejects.toThrow( + 'Stream lifetime exceeded', + ) await vi.advanceTimersByTimeAsync(1500) - await readP + await readError expect(aborts).toBe(1) } finally { - errorSpy.mockRestore() warnSpy.mockRestore() vi.useRealTimers() } @@ -1111,17 +2813,23 @@ describe('transformStreamWithRouter — injected HTML ordering', () => { const out = transformReadableStreamWithRouter( router as any, upstream as any, - { onAbort: () => aborts++, timeoutMs: 10 }, + { + onAbort: () => aborts++, + timeoutMs: 10, + }, ) const reader = (out as any).getReader() - const readP = reader.read().catch(() => undefined) + const readP = reader.read() + const readError = expect(readP).rejects.toThrow( + 'Stream lifetime exceeded', + ) await vi.advanceTimersByTimeAsync(15) expect(aborts).toBe(0) await vi.advanceTimersByTimeAsync(6) - await readP + await readError expect(aborts).toBe(1) } finally { errorSpy.mockRestore() @@ -1134,10 +2842,10 @@ describe('transformStreamWithRouter — injected HTML ordering', () => { const { router, finishSerialization } = makeRouter() finishSerialization() - // Simulate the Vue sync-setup-throw recovery path: a TransformStream is + // Simulate a synchronous producer setup failure: a TransformStream is // handed to the router transform, and the producer never writes before - // aborting the writable side. The router transform's readable must - // resolve (with done or an error) rather than wait for lifetimeMs. + // aborting the writable side. The router transform's readable must resolve + // (with done or an error) rather than wait for lifetimeMs. const ts = new TransformStream() const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) try { @@ -1145,7 +2853,9 @@ describe('transformStreamWithRouter — injected HTML ordering', () => { const out = transformReadableStreamWithRouter( router as any, ts.readable as any, - { onAbort: () => aborts++ }, + { + onAbort: () => aborts++, + }, ) void ts.writable.abort(new Error('setup-throw')).catch(() => {}) diff --git a/packages/router-core/tsconfig.json b/packages/router-core/tsconfig.json index faf64b9382..34cb3c4dc9 100644 --- a/packages/router-core/tsconfig.json +++ b/packages/router-core/tsconfig.json @@ -6,5 +6,11 @@ "@tanstack/router-core/isServer": ["./src/isServer/development.ts"] } }, - "include": ["src", "vite.config.ts", "tests", "vite-minify-plugin.ts"] + "include": [ + "src", + "vite.config.ts", + "tests", + "vite-minify-plugin.ts", + "benchmarks/ssr-streaming/worker.ts" + ] } diff --git a/packages/router-ssr-query-core/package.json b/packages/router-ssr-query-core/package.json index bb47f7f299..9e9038431c 100644 --- a/packages/router-ssr-query-core/package.json +++ b/packages/router-ssr-query-core/package.json @@ -66,7 +66,7 @@ "node": ">=20.19" }, "devDependencies": { - "@tanstack/router-core": ">=1.171.7", + "@tanstack/router-core": "workspace:*", "@tanstack/query-core": ">=5.102.0", "vite": "catalog:", "@tanstack/vite-config": "catalog:", @@ -77,7 +77,7 @@ "rimraf": "catalog:" }, "peerDependencies": { - "@tanstack/router-core": ">=1.127.0", + "@tanstack/router-core": ">=1.171.28", "@tanstack/query-core": ">=5.102.0" } } diff --git a/packages/router-ssr-query-core/src/index.ts b/packages/router-ssr-query-core/src/index.ts index 830e603793..a36eeddba1 100644 --- a/packages/router-ssr-query-core/src/index.ts +++ b/packages/router-ssr-query-core/src/index.ts @@ -225,35 +225,39 @@ export function setupCoreRouterSsrQueryIntegration({ } const originalHydrate = router.options.hydrate router.options.hydrate = async (dehydrated: DehydratedRouterQueryState) => { - await originalHydrate?.(dehydrated) - const query = dehydrated.query - if (query.initial) { - hydrateQueryClient( - queryClient, - { queries: query.initial }, - hydrateOptions, - ) + try { + await originalHydrate?.(dehydrated) + + if (query.initial) { + hydrateQueryClient( + queryClient, + { queries: query.initial }, + hydrateOptions, + ) + } + } catch (error) { + void query.stream.cancel(error).catch(() => {}) + throw error } const reader = query.stream.getReader() - reader - .read() - .then(function handle({ - done, - value, - }: ReadableStreamReadResult< - Array - >): void | Promise { - if (done) { - return + void (async () => { + try { + for (;;) { + const { done, value } = await reader.read() + if (done) { + return + } + hydrateQueryClient(queryClient, { queries: value }, hydrateOptions) } - hydrateQueryClient(queryClient, { queries: value }, hydrateOptions) - return reader.read().then(handle) - }) - .catch((error) => { + } catch (error) { console.error('Error reading query stream:', error) - }) + void reader.cancel(error).catch(() => {}) + } finally { + reader.releaseLock() + } + })() } if (handleRedirects) { const originalMutationCacheConfig = queryClient.getMutationCache().config diff --git a/packages/router-ssr-query-core/tests/index.test.ts b/packages/router-ssr-query-core/tests/index.test.ts index 4adb7a822c..af76a7579f 100644 --- a/packages/router-ssr-query-core/tests/index.test.ts +++ b/packages/router-ssr-query-core/tests/index.test.ts @@ -275,6 +275,116 @@ describe('setupCoreRouterSsrQueryIntegration', () => { expect(queryClient.getQueryData(['initial'])).toBe('initial-hydrated') expect(queryClient.getQueryData(['streamed'])).toBe('stream-hydrated') expect(queryClient.getQueryData(['streamed-batch'])).toBe('batch-hydrated') + expect(stream.locked).toBe(false) + }) + + it('releases a failed query stream reader', async () => { + const queryClient = track(new QueryClient()) + const router: TestRouter = { isServer: false, options: {} } + const error = new Error('stream failed') + const stream = new ReadableStream>({ + start(controller) { + controller.error(error) + }, + }) + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => undefined) + + setupCoreRouterSsrQueryIntegration({ + router: router as any, + queryClient, + }) + await router.options.hydrate?.({ query: { stream } }) + await vi.waitFor(() => { + expect(stream.locked).toBe(false) + }) + + expect(consoleError).toHaveBeenCalledWith( + 'Error reading query stream:', + error, + ) + }) + + it('cancels the query stream when hydration fails', async () => { + const queryClient = track(new QueryClient()) + const router: TestRouter = { isServer: false, options: {} } + const error = new Error('hydration failed') + const cancel = vi.fn(() => new Promise(() => {})) + const stream = new ReadableStream({ + start(controller) { + controller.enqueue([ + { + queryHash: '["streamed"]', + queryKey: ['streamed'], + state: createDehydratedQueryState('stream'), + }, + ]) + }, + cancel, + }) + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => undefined) + + setupCoreRouterSsrQueryIntegration({ + router: router as any, + queryClient, + hydrateOptions: { + defaultOptions: { + deserializeData: () => { + throw error + }, + }, + }, + }) + await router.options.hydrate?.({ query: { stream } }) + await vi.waitFor(() => { + expect(cancel).toHaveBeenCalledWith(error) + expect(stream.locked).toBe(false) + }) + + expect(consoleError).toHaveBeenCalledWith( + 'Error reading query stream:', + error, + ) + }) + + it('cancels the query stream when initial hydration fails', async () => { + const queryClient = track(new QueryClient()) + const router: TestRouter = { isServer: false, options: {} } + const error = new Error('initial hydration failed') + const cancel = vi.fn(() => new Promise(() => {})) + const stream = new ReadableStream({ cancel }) + + setupCoreRouterSsrQueryIntegration({ + router: router as any, + queryClient, + hydrateOptions: { + defaultOptions: { + deserializeData: () => { + throw error + }, + }, + }, + }) + await expect( + router.options.hydrate?.({ + query: { + initial: [ + { + queryHash: '["initial"]', + queryKey: ['initial'], + state: createDehydratedQueryState('initial'), + }, + ], + stream, + }, + }), + ).rejects.toBe(error) + + expect(cancel).toHaveBeenCalledWith(error) + expect(stream.locked).toBe(false) }) it('subscribes after initial dehydration and releases after rendering', async () => { diff --git a/packages/solid-router-ssr-query/package.json b/packages/solid-router-ssr-query/package.json index 32384db1b9..58832294d5 100644 --- a/packages/solid-router-ssr-query/package.json +++ b/packages/solid-router-ssr-query/package.json @@ -83,7 +83,7 @@ "peerDependencies": { "@tanstack/query-core": ">=5.102.0", "@tanstack/solid-query": ">=5.102.0", - "@tanstack/solid-router": ">=1.127.0", + "@tanstack/solid-router": ">=1.170.31", "solid-js": "^1.9.10" } } diff --git a/packages/solid-router/src/CatchBoundary.tsx b/packages/solid-router/src/CatchBoundary.tsx index 998115c10d..9f74cadc87 100644 --- a/packages/solid-router/src/CatchBoundary.tsx +++ b/packages/solid-router/src/CatchBoundary.tsx @@ -20,23 +20,34 @@ export function CatchBoundary( Solid.on(props.getResetKey, () => reset(), { defer: true }), ) - return process.env.NODE_ENV !== 'production' ? ( - renderInNonRouteComponentContext( - () => ( - - ), - 'errorComponent', + // A lazy error component can suspend after the route enters its + // error state. Keep that suspension here so it does not render the + // route's pending fallback again. + if (process.env.NODE_ENV !== 'production') { + return ( + + {renderInNonRouteComponentContext( + () => ( + + ), + 'errorComponent', + )} + ) - ) : ( - + } + + return ( + + + ) }} > diff --git a/packages/solid-router/src/Scripts.tsx b/packages/solid-router/src/Scripts.tsx index 0a547521e2..94d4febbf1 100644 --- a/packages/solid-router/src/Scripts.tsx +++ b/packages/solid-router/src/Scripts.tsx @@ -1,53 +1,45 @@ import * as Solid from 'solid-js' -import { _getAssetMatches, replaceEqualDeep } from '@tanstack/router-core' +import { + composeSsrBodyScripts, + getSsrBodyScriptParts, + replaceEqualDeep, +} from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' import { Asset } from './Asset' import { useRouter } from './useRouter' import type { RouterManagedTag } from '@tanstack/router-core' +/** + * During streaming SSR, `` marks where late hydration scripts may + * begin to be inserted. + */ export const Scripts = () => { const router = useRouter() const nonce = router.options.ssr?.nonce const scripts = Solid.createMemo( (previous: Array | undefined) => { - const matches = _getAssetMatches(router.stores.matches.get()) - const next: Array = [] - const assets: Array = [] - const manifest = router.ssr?.manifest - for (const match of matches) { - for (const script of match.scripts ?? []) { - if (!script) { - continue - } - const { children, ...attrs } = script - next.push({ - tag: 'script', - attrs: { ...attrs, nonce }, - children: children as string | undefined, - }) - } - for (const asset of manifest?.routes[match.routeId]?.scripts ?? []) { - assets.push({ - tag: 'script', - attrs: { ...asset.attrs, nonce }, - children: asset.children, - }) - } - } - next.push(...assets) + const next = composeSsrBodyScripts( + getSsrBodyScriptParts( + router.stores.matches.get(), + router.ssr?.manifest, + nonce, + ), + ) return previous ? replaceEqualDeep(previous, next) : next }, ) - const serverBufferedScript = + const initialHydrationScripts = (isServer ?? router.isServer) && router.serverSsr - ? router.serverSsr.takeBufferedScripts() + ? router.serverSsr.takeInitialHydrationScriptTags() : undefined - + const tags = () => + initialHydrationScripts + ? composeSsrBodyScripts([scripts(), []], initialHydrationScripts) + : scripts() return ( <> - {serverBufferedScript && } - {(asset) => } + {(asset) => } ) } diff --git a/packages/solid-router/src/awaited.tsx b/packages/solid-router/src/awaited.tsx index 148f45edda..ecc5fe2a5d 100644 --- a/packages/solid-router/src/awaited.tsx +++ b/packages/solid-router/src/awaited.tsx @@ -31,19 +31,7 @@ export function Await( }, ) { if (!('fallback' in props)) { - const [resource] = Solid.createResource( - () => defer(props.promise), - (p) => p, - { - deferStream: true, - }, - ) - - return ( - - {(data) => props.children(data())} - - ) + return } return ( @@ -61,8 +49,12 @@ function AwaitInner( ) { const [resource] = Solid.createResource( () => defer(props.promise), - (p) => p, + async (promise) => ({ value: await promise }), ) - return props.children(resource() as T) + return ( + + {(result) => props.children(result().value)} + + ) } diff --git a/packages/solid-router/src/index.tsx b/packages/solid-router/src/index.tsx index 6cd6020f43..9b1026a6b8 100644 --- a/packages/solid-router/src/index.tsx +++ b/packages/solid-router/src/index.tsx @@ -177,7 +177,6 @@ export type { RouterOptions, RouterConstructorOptions, ControllablePromise, - InjectedHtmlEntry, CreateFileRoute, CreateLazyFileRoute, AnySerializationAdapter, diff --git a/packages/solid-router/src/lazyRouteComponent.tsx b/packages/solid-router/src/lazyRouteComponent.tsx index ad47717b0d..32d4f07110 100644 --- a/packages/solid-router/src/lazyRouteComponent.tsx +++ b/packages/solid-router/src/lazyRouteComponent.tsx @@ -1,5 +1,5 @@ import { Dynamic } from 'solid-js/web' -import { createResource } from 'solid-js' +import { lazy } from 'solid-js' import { isModuleNotFoundError } from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' import type { AsyncRouteComponent } from './route' @@ -25,7 +25,7 @@ export function lazyRouteComponent< // Resolved clients have no preload work; SSR can reuse the import. if (!(isServer ?? typeof window === 'undefined')) { loadPromise = undefined - ;(lazyComp as any).preload = undefined + ;(Lazy as any).preload = undefined } comp = res[exportName ?? 'default'] return comp @@ -38,7 +38,16 @@ export function lazyRouteComponent< return loadPromise } - const lazyComp = function Lazy(props: any) { + function Lazy(props: any) { + if (comp || error) { + return render(props) + } + + return + } + + // Both preload and lazy resolution end here without starting another load. + function render(props: any) { // Now that we're out of preload and into actual render path, // throw the error if it was a module not found error during preload if (error) { @@ -67,10 +76,8 @@ export function lazyRouteComponent< sessionStorage.setItem(storageKey, '1') window.location.reload() - // Return empty component while we wait for window to reload - return { - default: () => null, - } + // Return no content while we wait for window to reload. + return null } } } @@ -79,18 +86,20 @@ export function lazyRouteComponent< throw error } - if (!comp) { - const [compResource] = createResource(load, { - initialValue: comp, - ssrLoadFrom: 'initial', - }) - return - } - return } - ;(lazyComp as any).preload = load + const Loadable = lazy(async () => { + await load() + if (process.env.NODE_ENV !== 'production' && !comp && !error) { + throw new Error( + `lazyRouteComponent: export "${String(exportName ?? 'default')}" not found`, + ) + } + return { default: render } + }) - return lazyComp as any + ;(Lazy as any).preload = load + + return Lazy as any } diff --git a/packages/solid-router/src/ssr/RouterServer.tsx b/packages/solid-router/src/ssr/RouterServer.tsx index baa1c45502..1cdc85e8c1 100644 --- a/packages/solid-router/src/ssr/RouterServer.tsx +++ b/packages/solid-router/src/ssr/RouterServer.tsx @@ -2,7 +2,6 @@ import { Hydration, HydrationScript, NoHydration, - ssr, useAssets, } from 'solid-js/web' import { MetaProvider } from '@solidjs/meta' @@ -26,14 +25,11 @@ export function ServerHeadContent() { return null } -const docType = ssr('') - export function RouterServer(props: { router: TRouter }) { return ( - {docType as any} diff --git a/packages/solid-router/src/ssr/renderOptions.ts b/packages/solid-router/src/ssr/renderOptions.ts new file mode 100644 index 0000000000..c91554de2f --- /dev/null +++ b/packages/solid-router/src/ssr/renderOptions.ts @@ -0,0 +1,29 @@ +import { makeSsrSerovalPlugin } from '@tanstack/router-core/ssr/server' +import type { renderToStream } from 'solid-js/web' +import type { AnyRouter, AnySerializationAdapter } from '@tanstack/router-core' + +// Adapters are module-level singletons, so their SSR plugins are cached per +// adapter rather than rebuilt for every request. +const pluginCache = new WeakMap< + AnySerializationAdapter, + ReturnType +>() + +function getPlugin(adapter: AnySerializationAdapter) { + let plugin = pluginCache.get(adapter) + if (!plugin) { + plugin = makeSsrSerovalPlugin(adapter) + pluginCache.set(adapter, plugin) + } + return plugin +} + +/** Solid renderer options shared by the stream and string paths. */ +export function getSolidRenderOptions(router: AnyRouter) { + return { + nonce: router.options.ssr?.nonce, + // `plugins` is honoured by Solid's server runtime but absent from its + // public option type. + plugins: router.options.serializationAdapters?.map(getPlugin), + } as Parameters[1] +} diff --git a/packages/solid-router/src/ssr/renderRouterToStream.tsx b/packages/solid-router/src/ssr/renderRouterToStream.tsx index 7432f19510..cd4d0f2cd6 100644 --- a/packages/solid-router/src/ssr/renderRouterToStream.tsx +++ b/packages/solid-router/src/ssr/renderRouterToStream.tsx @@ -2,37 +2,14 @@ import * as Solid from 'solid-js/web' import { isbot } from 'isbot' import { createSsrStreamResponse, + getSsrStatus, transformReadableStreamWithRouter, + waitForRequest, } from '@tanstack/router-core/ssr/server' -import { makeSsrSerovalPlugin } from '@tanstack/router-core' +import { getSolidRenderOptions } from './renderOptions' import type { JSXElement } from 'solid-js' -import type { ReadableStream } from 'node:stream/web' import type { AnyRouter } from '@tanstack/router-core' -const noop = () => {} - -// Bot responses wait for the server renderer before streaming. If the request -// disconnects during that wait, unblock so the pipe can abort and clean up. -async function waitForReadyOrAbort( - ready: Promise, - signal: AbortSignal, -) { - let cleanup = noop - try { - await Promise.race([ - ready, - new Promise((resolve) => { - const onAbort = () => resolve() - cleanup = () => signal.removeEventListener('abort', onAbort) - signal.addEventListener('abort', onAbort, { once: true }) - if (signal.aborted) resolve() - }), - ]) - } finally { - cleanup() - } -} - export const renderRouterToStream = async ({ request, router, @@ -44,139 +21,59 @@ export const renderRouterToStream = async ({ responseHeaders: Headers children: () => JSXElement }) => { - const { writable, readable } = new TransformStream() - - const docType = Solid.ssr('') - - const serializationAdapters = - (router.options as any)?.serializationAdapters || - (router.options.ssr as any)?.serializationAdapters - const serovalPlugins = serializationAdapters?.map((adapter: any) => { - const plugin = makeSsrSerovalPlugin(adapter, { didRun: false }) - return plugin - }) - - const stream = Solid.renderToStream( - () => ( - <> - {docType} - {children()} - - ), - { - nonce: router.options.ssr?.nonce, - plugins: serovalPlugins, - } as any, - ) - - // Solid's `pipeTo(w)` takes a single arg (no signal overload) and locks - // `w` via `w.getWriter()`. To still own the lifecycle we hand Solid a - // proxy WritableStream that forwards into an inner writer we control on - // the real TransformStream writable. Aborting the inner writer errors - // the underlying readable (which our router transform reads from), - // surfacing the cancel through the response pipeline. - // - // RESIDUAL RISK: solid-js@1.x does NOT expose a disposal hook on - // `renderToStream`, and its internal write loop swallows writer - // rejections (`writer.write(...).catch(() => {})` in - // solid-js/web/dist/server.js). So aborting the inner writer stops - // outbound bytes but does not terminate Solid's render continuation - // if a Suspense/resource never resolves — those pending promise - // continuations remain scheduled and can retain children/context/ - // request references via captured closures until natural completion - // or process exit. The request-scoped router graph itself is released - // by ServerSsr.cleanup() through the router stream lifecycle, so the leak - // is bounded to whatever the user's Suspense/resource closures capture. - // A hard upstream-abort guarantee would require a disposal API in solid-js. - const innerWriter = writable.getWriter() - let writerDone = false - const releaseWriter = () => { - try { - innerWriter.releaseLock() - } catch { - // already released / errored - } - } - const abortSolidPipe = (reason?: unknown) => { - if (writerDone) return - writerDone = true - void innerWriter - .abort(reason) - .catch(() => {}) - .finally(releaseWriter) + const signal = request.signal + if (signal.aborted) { + router.serverSsr?.cleanup() + throw signal.reason } - const onRequestAbort = () => { - abortSolidPipe(request.signal.reason) - } - - // Wire request abort before the bot all-ready wait. Otherwise a disconnect - // during `await stream` can leave this callback pending forever. - if (request.signal.aborted) { - onRequestAbort() - } else { - request.signal.addEventListener('abort', onRequestAbort, { once: true }) - router.serverSsr?.onCleanup(() => { - request.signal.removeEventListener('abort', onRequestAbort) - }) - } - - if (isbot(request.headers.get('User-Agent'))) { - await waitForReadyOrAbort( - Promise.resolve(stream as unknown), - request.signal, + try { + const docType = Solid.ssr('') + const stream = Solid.renderToStream( + () => ( + <> + {docType} + {children()} + + ), + getSolidRenderOptions(router), ) - } - const solidWritable = new WritableStream({ - write(chunk) { - return innerWriter.write(chunk) - }, - close() { - writerDone = true - return innerWriter.close().finally(releaseWriter) - }, - abort(reason) { - writerDone = true - return innerWriter.abort(reason).finally(releaseWriter) - }, - }) + // Cancelling the transform's reader errors this writable, which makes + // Solid's later writes reject and be ignored. Solid exposes no disposal + // handle for unresolved renderer work; see router-core's STREAMING.md. + const { readable, writable } = new TransformStream() + const rendererAbort = isbot(request.headers.get('User-Agent')) + ? new AbortController() + : undefined + const responseStream = transformReadableStreamWithRouter(router, readable, { + rendererSafePoint: 'record-end', + signal, + onAbort: rendererAbort + ? (reason) => rendererAbort.abort(reason) + : undefined, + }) - if (!request.signal.aborted) { - try { - void Promise.resolve(stream.pipeTo(solidWritable) as unknown).catch( - (err: any) => { - if ( - writerDone || - err?.name === 'AbortError' || - err?.code === 'ABORT_ERR' - ) - return - console.error('Error in Solid render stream:', err) - abortSolidPipe(err) - }, - ) - } catch (err: any) { - if (err?.name !== 'AbortError' && err?.code !== 'ABORT_ERR') { - console.error('Error in Solid render stream:', err) - } - abortSolidPipe(err) + if (rendererAbort) { + await waitForRequest(stream as unknown, rendererAbort.signal) } - } - const responseStream = transformReadableStreamWithRouter( - router, - readable as unknown as ReadableStream, - { signal: request.signal, onAbort: abortSolidPipe }, - ) - return createSsrStreamResponse( - router, - new Response(responseStream as any, { - status: - router._serverResult?.type === 'render' - ? router._serverResult.status - : 200, - headers: responseHeaders, - }), - ) + // The server export returns Promise. Solid's client declaration + // returns void, and this file is also checked under that export condition. + void Promise.resolve(stream.pipeTo(writable)).catch((error: unknown) => { + console.error('Error in Solid render stream:', error) + void writable.abort(error).catch(() => {}) + }) + + return createSsrStreamResponse( + router, + new Response(responseStream, { + status: getSsrStatus(router), + headers: responseHeaders, + }), + ) + } catch (error) { + router.serverSsr?.cleanup() + throw error + } } diff --git a/packages/solid-router/src/ssr/renderRouterToString.tsx b/packages/solid-router/src/ssr/renderRouterToString.tsx index 421ac234bc..fc9d45a8ba 100644 --- a/packages/solid-router/src/ssr/renderRouterToString.tsx +++ b/packages/solid-router/src/ssr/renderRouterToString.tsx @@ -1,9 +1,10 @@ import * as Solid from 'solid-js/web' -import { makeSsrSerovalPlugin } from '@tanstack/router-core' +import { renderSsrHtmlResponse } from '@tanstack/router-core/ssr/server' +import { getSolidRenderOptions } from './renderOptions' import type { AnyRouter } from '@tanstack/router-core' import type { JSXElement } from 'solid-js' -export const renderRouterToString = ({ +export const renderRouterToString = async ({ router, responseHeaders, children, @@ -12,39 +13,9 @@ export const renderRouterToString = ({ responseHeaders: Headers children: () => JSXElement }) => { - try { - const serializationAdapters = - (router.options as any)?.serializationAdapters || - (router.options.ssr as any)?.serializationAdapters - const serovalPlugins = serializationAdapters?.map((adapter: any) => { - const plugin = makeSsrSerovalPlugin(adapter, { didRun: false }) - return plugin - }) - - let html = Solid.renderToString(children, { - nonce: router.options.ssr?.nonce, - plugins: serovalPlugins, - } as any) - router.serverSsr!.setRenderFinished() - - const injectedHtml = router.serverSsr!.takeBufferedHtml() - if (injectedHtml) { - html = html.replace(``, () => `${injectedHtml}`) - } - return new Response(`${html}`, { - status: - router._serverResult?.type === 'render' - ? router._serverResult.status - : 200, - headers: responseHeaders, - }) - } catch (error) { - console.error('Render to string error:', error) - return new Response('Internal Server Error', { - status: 500, - headers: responseHeaders, - }) - } finally { - router.serverSsr?.cleanup() - } + return renderSsrHtmlResponse({ + router, + responseHeaders, + render: () => Solid.renderToString(children, getSolidRenderOptions(router)), + }) } diff --git a/packages/solid-router/tests/Await.test.tsx b/packages/solid-router/tests/Await.test.tsx new file mode 100644 index 0000000000..748a552e91 --- /dev/null +++ b/packages/solid-router/tests/Await.test.tsx @@ -0,0 +1,28 @@ +import { afterEach, describe, expect, it, vi } from 'vitest' +import { cleanup, render, waitFor } from '@solidjs/testing-library' +import { Await } from '../src/awaited' + +afterEach(cleanup) + +describe('Await', () => { + it.each([ + ['zero', 0], + ['false', false], + ['empty string', ''], + ['null', null], + ['undefined', undefined], + ])('renders a resolved %s value', async (_name, value) => { + const children = vi.fn(() => resolved) + + render(() => ( + pending}> + {children} + + )) + + await waitFor(() => { + expect(children).toHaveBeenCalledOnce() + }) + expect(children).toHaveBeenCalledWith(value) + }) +}) diff --git a/packages/solid-router/tests/CatchBoundary.test.tsx b/packages/solid-router/tests/CatchBoundary.test.tsx new file mode 100644 index 0000000000..4c1ad0a835 --- /dev/null +++ b/packages/solid-router/tests/CatchBoundary.test.tsx @@ -0,0 +1,131 @@ +import { resolve } from 'node:path' +import { Suspense, lazy } from 'solid-js' +import { afterEach, expect, onTestFinished, test, vi } from 'vitest' +import { cleanup, render, screen } from '@solidjs/testing-library' +import { createControlledPromise } from '@tanstack/router-core' +import { build } from 'vite' +import solid from 'vite-plugin-solid' +import { + CatchBoundary, + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, +} from '../src' +import type { ErrorComponentProps } from '../src' + +afterEach(() => { + cleanup() + vi.restoreAllMocks() +}) + +test('keeps the Outlet diagnostic context after a route render throws', async () => { + const warn = vi.spyOn(console, 'warn').mockImplementation(() => {}) + vi.spyOn(console, 'error').mockImplementation(() => {}) + const rootRoute = createRootRoute({ component: Outlet }) + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => { + throw new Error('Render failed') + }, + errorComponent: () => ( + <> + Render fallback + + + ), + }) + const router = createRouter({ + routeTree: rootRoute.addChildren([indexRoute]), + history: createMemoryHistory({ initialEntries: ['/'] }), + }) + + render(() => ) + + expect(await screen.findByText('Render fallback')).toBeInTheDocument() + expect(warn).toHaveBeenCalledWith( + 'Warning: An was rendered inside a errorComponent. should only be rendered inside a route component.', + ) +}) + +test('keeps a lazy error fallback inside its own Suspense boundary', async () => { + const renderError = new Error('Render failed') + const onCatch = vi.fn() + const ErrorFallback = (props: ErrorComponentProps) => ( + Lazy fallback: {props.error.message} + ) + const pending = createControlledPromise<{ default: typeof ErrorFallback }>() + const importer = vi.fn(() => pending) + const LazyError = lazy(importer) + onTestFinished(() => pending.resolve({ default: ErrorFallback })) + + function Broken(): never { + throw renderError + } + + render(() => ( + Outer pending}> + Ready shell + 0} + errorComponent={(props) => } + onCatch={onCatch} + > + + + + )) + + expect(importer).toHaveBeenCalledOnce() + expect(screen.getByText('Ready shell')).toBeInTheDocument() + expect(screen.queryByText('Outer pending')).not.toBeInTheDocument() + expect( + screen.queryByText('Lazy fallback: Render failed'), + ).not.toBeInTheDocument() + expect(onCatch).toHaveBeenCalledOnce() + expect(onCatch).toHaveBeenCalledWith(renderError) + + pending.resolve({ default: ErrorFallback }) + + expect( + await screen.findByText('Lazy fallback: Render failed'), + ).toBeInTheDocument() + expect(screen.getByText('Ready shell')).toBeInTheDocument() + expect(screen.queryByText('Outer pending')).not.toBeInTheDocument() +}) + +test('removes the diagnostic context from the production bundle', async () => { + const result = await build({ + configFile: false, + logLevel: 'silent', + plugins: [solid({ dev: false, hot: false })], + define: { 'process.env.NODE_ENV': JSON.stringify('production') }, + build: { + write: false, + minify: true, + lib: { + entry: resolve(import.meta.dirname, '../src/CatchBoundary.tsx'), + formats: ['es'], + }, + rollupOptions: { external: ['solid-js', 'solid-js/web'] }, + }, + }) + const outputs = Array.isArray(result) ? result : [result] + const code = outputs + .flatMap((output) => { + if (!('output' in output)) { + throw new Error('Expected an in-memory build result') + } + return output.output.flatMap((chunk) => + chunk.type === 'chunk' ? [chunk.code] : [], + ) + }) + .join('\n') + + expect(code).toContain('CatchBoundary') + expect(code).toContain('Suspense') + expect(code).not.toContain('.Provider') +}) diff --git a/packages/solid-router/tests/component-preload-retry.test.tsx b/packages/solid-router/tests/component-preload-retry.test.tsx index 47cee1d0d6..fda9f2ca3b 100644 --- a/packages/solid-router/tests/component-preload-retry.test.tsx +++ b/packages/solid-router/tests/component-preload-retry.test.tsx @@ -1,4 +1,5 @@ -import { afterEach, expect, test, vi } from 'vitest' +import { ErrorBoundary, Suspense } from 'solid-js' +import { afterEach, expect, onTestFinished, test, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library' import { createControlledPromise } from '@tanstack/router-core' import { @@ -118,14 +119,42 @@ test('revisiting a resolved lazy component skips pending UI', async () => { expect(importer).toHaveBeenCalledOnce() }) +test('a missing export fails through the route error UI instead of recursing', async () => { + vi.spyOn(console, 'error').mockImplementation(() => {}) + + const importer = vi.fn().mockResolvedValue({ Other: () => null }) + const Page = lazyRouteComponent(importer, 'Missing' as never) + const rootRoute = createRootRoute() + const pageRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/page', + component: Page, + errorComponent: (props: ErrorComponentProps) => ( +
{props.error.message}
+ ), + }) + const router = createRouter({ + routeTree: rootRoute.addChildren([pageRoute]), + history: createMemoryHistory({ initialEntries: ['/page'] }), + }) + + render(() => ) + + expect( + await screen.findByText('lazyRouteComponent: export "Missing" not found'), + ).toBeInTheDocument() +}) + test('a failed component download is retried from the route error UI', async () => { vi.spyOn(console, 'error').mockImplementation(() => {}) const PageContent = () =>
Page content
+ const retryImport = createControlledPromise<{ default: typeof PageContent }>() + onTestFinished(() => retryImport.resolve({ default: PageContent })) const importer = vi .fn<() => Promise<{ default: typeof PageContent }>>() .mockRejectedValueOnce(new Error('component download failed')) - .mockResolvedValue({ default: PageContent }) + .mockImplementation(() => retryImport) const Page = lazyRouteComponent(importer) function RouteError(props: ErrorComponentProps) { @@ -159,5 +188,62 @@ test('a failed component download is retried from the route error UI', async () fireEvent.click(await screen.findByRole('button', { name: 'Retry' })) + await vi.waitFor(() => expect(importer).toHaveBeenCalledTimes(2)) + expect(screen.queryByText('Page content')).not.toBeInTheDocument() + retryImport.resolve({ default: PageContent }) + expect(await screen.findByText('Page content')).toBeInTheDocument() + expect(importer).toHaveBeenCalledTimes(2) + expect(Page.preload).toBeUndefined() +}) + +test('a component first loaded during render recovers after an awaited preload retry', async () => { + const PageContent = () =>
Recovered component
+ const retryImport = createControlledPromise<{ default: typeof PageContent }>() + onTestFinished(() => retryImport.resolve({ default: PageContent })) + const importer = vi + .fn<() => Promise<{ default: typeof PageContent }>>() + .mockRejectedValueOnce(new Error('component download failed')) + .mockImplementation(() => retryImport) + const Page = lazyRouteComponent(importer) + let retry: Promise | undefined + + render(() => ( + ( + + )} + > + Loading component}> + + + + )) + + const button = await screen.findByRole('button', { + name: 'Retry component download failed', + }) + expect(importer).toHaveBeenCalledOnce() + fireEvent.click(button) + + expect(importer).toHaveBeenCalledTimes(2) + expect(retry).toBeDefined() + expect(Page.preload?.()).toBe(retry) + expect(button).toBeInTheDocument() + expect(screen.queryByText('Recovered component')).not.toBeInTheDocument() + + retryImport.resolve({ default: PageContent }) + await retry + + expect(await screen.findByText('Recovered component')).toBeInTheDocument() + expect(importer).toHaveBeenCalledTimes(2) + expect(Page.preload).toBeUndefined() }) diff --git a/packages/solid-router/tests/issue-8115-context.test.tsx b/packages/solid-router/tests/issue-8115-context.test.tsx index 659cb59309..114935549c 100644 --- a/packages/solid-router/tests/issue-8115-context.test.tsx +++ b/packages/solid-router/tests/issue-8115-context.test.tsx @@ -446,11 +446,14 @@ test('#8115: hydration does not render a successful route with missing context w expect(serverRouter.state.matches.at(-1)?.status).toBe('success') await serverRouter.serverSsr!.dehydrate() - const script = serverRouter.serverSsr!.takeBufferedScripts() - expect(script?.children).toBeTruthy() - currentScriptSpy.mockReturnValue(document.createElement('script')) - // This script comes exclusively from the router's production SSR serializer. - new Function(script!.children!)() + const scripts = serverRouter.serverSsr!.takeInitialHydrationScriptTags() + expect(scripts?.before.length).toBeGreaterThan(0) + // These scripts come exclusively from the router's production SSR serializer. + for (const script of scripts!.before) { + expect(script.children).toBeTruthy() + currentScriptSpy.mockReturnValue(document.createElement('script')) + new Function(script.children!)() + } } finally { currentScriptSpy.mockRestore() serverRouter.serverSsr?.cleanup() diff --git a/packages/solid-router/tests/lazyRouteComponent.production.test.tsx b/packages/solid-router/tests/lazyRouteComponent.production.test.tsx new file mode 100644 index 0000000000..34ccb97102 --- /dev/null +++ b/packages/solid-router/tests/lazyRouteComponent.production.test.tsx @@ -0,0 +1,135 @@ +import { resolve } from 'node:path' +import { setImmediate } from 'node:timers/promises' +import * as Solid from 'solid-js' +import * as SolidWeb from 'solid-js/web' +import { afterEach, beforeAll, expect, test, vi } from 'vitest' +import { cleanup, render, screen, waitFor } from '@solidjs/testing-library' +import { build } from 'vite' +import solid from 'vite-plugin-solid' +import type { lazyRouteComponent } from '../src/lazyRouteComponent' + +let productionLazyRouteComponent: typeof lazyRouteComponent + +beforeAll(async () => { + const result = await build({ + configFile: false, + logLevel: 'silent', + plugins: [solid({ dev: false, hot: false })], + define: { 'process.env.NODE_ENV': JSON.stringify('production') }, + build: { + write: false, + minify: true, + lib: { + entry: resolve(import.meta.dirname, '../src/lazyRouteComponent.tsx'), + formats: ['cjs'], + }, + rollupOptions: { external: ['solid-js', 'solid-js/web'] }, + }, + }) + const outputs = Array.isArray(result) ? result : [result] + const code = outputs + .flatMap((output) => { + if (!('output' in output)) { + throw new Error('Expected an in-memory build result') + } + return output.output.flatMap((chunk) => + chunk.type === 'chunk' ? [chunk.code] : [], + ) + }) + .join('\n') + const exports: { lazyRouteComponent?: typeof lazyRouteComponent } = {} + + // Use the test's Solid owner graph with the production-compiled router code. + new Function('require', 'exports', code)((id: string) => { + if (id === 'solid-js') { + return Solid + } + if (id === 'solid-js/web') { + return SolidWeb + } + throw new Error(`Unexpected external module: ${id}`) + }, exports) + + expect(exports.lazyRouteComponent).toBeTypeOf('function') + productionLazyRouteComponent = exports.lazyRouteComponent! +}, 60_000) + +afterEach(() => { + cleanup() + vi.restoreAllMocks() +}) + +test.each([ + { exportName: undefined, preload: false }, + { exportName: 'Missing', preload: false }, + { exportName: undefined, preload: true }, + { exportName: 'Missing', preload: true }, +])( + 'a missing $exportName export renders blank with preload=$preload in production', + async ({ exportName, preload }) => { + const importer = vi.fn().mockResolvedValue({ Other: () => null }) + const Page = productionLazyRouteComponent(importer, exportName as never) + const onError = vi.fn(() => Render failed) + if (preload) { + await Page.preload?.() + } + + const { container } = render(() => ( + + Loading component}> + + + + )) + + await waitFor(() => + expect(screen.queryByText('Loading component')).not.toBeInTheDocument(), + ) + // Finish queued lazy-import continuations before checking for render errors. + await setImmediate() + expect(importer).toHaveBeenCalled() + expect(onError).not.toHaveBeenCalled() + expect(container).toBeEmptyDOMElement() + }, +) + +test('a preloaded production component renders synchronously with its props', async () => { + const importer = vi.fn(() => + Promise.resolve({ + Page: (props: { label: string }) => {props.label}, + }), + ) + const Page = productionLazyRouteComponent(importer, 'Page') + await Page.preload?.() + + render(() => ( + Loading component}> + + + )) + + expect(screen.getByText('Ready component')).toBeInTheDocument() + expect(screen.queryByText('Loading component')).not.toBeInTheDocument() + expect(importer).toHaveBeenCalledOnce() + expect(Page.preload).toBeUndefined() +}) + +test('a rejected production import reaches the error boundary', async () => { + const importer = vi + .fn() + .mockRejectedValue(new Error('component download failed')) + const Page = productionLazyRouteComponent(importer) + + render(() => ( + {error.message}}> + Loading component}> + + + + )) + + expect( + await screen.findByText('component download failed'), + ).toBeInTheDocument() + expect(importer).toHaveBeenCalledOnce() +}) diff --git a/packages/solid-router/tests/renderRouterToStream.test.tsx b/packages/solid-router/tests/renderRouterToStream.test.tsx index 6351d83ebd..5986fea88b 100644 --- a/packages/solid-router/tests/renderRouterToStream.test.tsx +++ b/packages/solid-router/tests/renderRouterToStream.test.tsx @@ -1,12 +1,29 @@ import { afterEach, describe, expect, test, vi } from 'vitest' import { attachRouterServerSsrUtils } from '@tanstack/router-core/ssr/server' import { createMemoryHistory, createRootRoute, createRouter } from '../src' +import type * as RouterSsrServer from '@tanstack/router-core/ssr/server' import type * as SolidWeb from 'solid-js/web' const solidMocks = vi.hoisted(() => ({ renderToStream: vi.fn(), pipeTo: vi.fn(), })) +const routerTransformMocks = vi.hoisted(() => ({ + readableOptions: vi.fn(), +})) + +vi.mock('@tanstack/router-core/ssr/server', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + transformReadableStreamWithRouter: ( + ...args: Parameters + ) => { + routerTransformMocks.readableOptions(args[2]) + return actual.transformReadableStreamWithRouter(...args) + }, + } +}) vi.mock('solid-js/web', async () => { const actual = await vi.importActual('solid-js/web') @@ -28,6 +45,7 @@ function unwrapResponse( afterEach(() => { solidMocks.renderToStream.mockReset() solidMocks.pipeTo.mockReset() + routerTransformMocks.readableOptions.mockReset() vi.restoreAllMocks() }) @@ -50,22 +68,36 @@ function drainBody(response: Response) { return (async () => { for (;;) { const { done } = await reader.read() - if (done) return true + if (done) { + return true + } } })().catch(() => true) } -describe('renderRouterToStream - bot abort', () => { - test('request abort during bot wait terminates before rendering starts', async () => { +describe('renderRouterToStream', () => { + test('already-aborted requests do not start the Solid producer', async () => { + const abortController = new AbortController() + abortController.abort(new Error('already-gone')) + const router = await buildRouter() + + await expect( + renderRouterToStream({ + request: new Request('http://localhost/', { + signal: abortController.signal, + }), + router, + responseHeaders: new Headers(), + children: () => null, + }), + ).rejects.toThrow('already-gone') + + expect(solidMocks.renderToStream).not.toHaveBeenCalled() + expect(router.serverSsr).toBeUndefined() + }) + + test('request abort during bot wait terminates before piping starts', async () => { const neverReady = new Promise(() => {}) - solidMocks.pipeTo.mockImplementationOnce( - (writable: WritableStream) => { - const writer = writable.getWriter() - return writer - .write(new TextEncoder().encode('solid')) - .catch(() => {}) - }, - ) solidMocks.renderToStream.mockImplementationOnce( () => ({ @@ -76,7 +108,7 @@ describe('renderRouterToStream - bot abort', () => { const router = await buildRouter() const abortController = new AbortController() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + const reason = new Error('client-gone') try { const responsePromise = renderRouterToStream({ request: new Request('http://localhost/', { @@ -89,59 +121,311 @@ describe('renderRouterToStream - bot abort', () => { }) await Promise.resolve() - abortController.abort(new Error('client-gone')) + abortController.abort(reason) - const result = await Promise.race([ - responsePromise, - new Promise((resolve) => setTimeout(() => resolve(false), 2000)), - ]) - - expect(result).not.toBe(false) + await expect(responsePromise).rejects.toBe(reason) expect(solidMocks.pipeTo).not.toHaveBeenCalled() - const response = unwrapResponse(result as Exclude) - expect(response.body).not.toBeNull() + expect(router.serverSsr).toBeUndefined() + } finally { + router.serverSsr?.cleanup() + } + }) - const terminated = await Promise.race([ - drainBody(response), - new Promise((resolve) => setTimeout(() => resolve(false), 2000)), - ]) + test.each(['lifetime expiry', 'external cleanup'] as const)( + '%s rejects the bot wait and prevents late piping', + async (termination) => { + let resolveReady!: () => void + const ready = new Promise((resolve) => { + resolveReady = resolve + }) + solidMocks.renderToStream.mockImplementationOnce( + () => + ({ + then: ready.then.bind(ready), + pipeTo: solidMocks.pipeTo, + }) as any, + ) + const router = await buildRouter() + const owner = router.serverSsr! + const cleanup = vi.fn() + owner.onCleanup(cleanup) + const request = new Request('http://localhost/', { + headers: { 'User-Agent': 'Googlebot' }, + }) + const resolved = vi.fn() + const rejected = vi.fn() + const warn = vi.spyOn(console, 'warn').mockImplementation(() => {}) + vi.useFakeTimers() + const pending = renderRouterToStream({ + request, + router, + responseHeaders: new Headers(), + children: () => null, + }).then(resolved, rejected) - expect(terminated).toBe(true) + try { + await Promise.resolve() + expect(rejected).not.toHaveBeenCalled() + if (termination === 'lifetime expiry') { + await vi.advanceTimersByTimeAsync(120_000) + } else { + owner.cleanup() + await vi.advanceTimersByTimeAsync(0) + } + + expect(rejected).toHaveBeenCalledExactlyOnceWith( + expect.objectContaining({ + message: + termination === 'lifetime expiry' + ? 'Stream lifetime exceeded' + : 'SSR stream transform aborted by router SSR cleanup', + }), + ) + expect(request.signal.aborted).toBe(false) + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + expect(solidMocks.pipeTo).not.toHaveBeenCalled() + + resolveReady() + await vi.advanceTimersByTimeAsync(0) + expect(resolved).not.toHaveBeenCalled() + expect(solidMocks.pipeTo).not.toHaveBeenCalled() + } finally { + resolveReady() + await pending + owner.cleanup() + vi.useRealTimers() + warn.mockRestore() + } + }, + ) + + test('bots wait for renderer readiness before piping', async () => { + let resolveReady!: () => void + const ready = new Promise((resolve) => { + resolveReady = resolve + }) + solidMocks.renderToStream.mockImplementationOnce( + () => + ({ + then: ready.then.bind(ready), + pipeTo: solidMocks.pipeTo.mockImplementation( + () => new Promise(() => {}), + ), + }) as any, + ) + const router = await buildRouter() + try { + let settled = false + const responsePromise = renderRouterToStream({ + request: new Request('http://localhost/', { + headers: { 'User-Agent': 'Googlebot' }, + }), + router, + responseHeaders: new Headers(), + children: () => null, + }).then((result) => { + settled = true + return result + }) + + await Promise.resolve() + expect(settled).toBe(false) + expect(solidMocks.pipeTo).not.toHaveBeenCalled() + + resolveReady() + const result = await responsePromise + expect(unwrapResponse(result)).toBeInstanceOf(Response) + expect(solidMocks.pipeTo).toHaveBeenCalledOnce() + } finally { + router.serverSsr?.cleanup() + } + }) + + test('bot response does not wait for a backpressured pipe', async () => { + const html = new TextEncoder().encode( + 'solid', + ) + let pipeCompletion: Promise | undefined + solidMocks.renderToStream.mockImplementationOnce( + () => + ({ + then(resolve: () => void) { + resolve() + }, + pipeTo(writable: WritableStream) { + const writer = writable.getWriter() + pipeCompletion = writer.write(html).then(() => writer.close()) + return pipeCompletion + }, + }) as any, + ) + + const router = await buildRouter() + router.serverSsr!.disableHydration() + try { + const result = await renderRouterToStream({ + request: new Request('http://localhost/', { + headers: { 'User-Agent': 'Googlebot' }, + }), + router, + responseHeaders: new Headers(), + children: () => null, + }) + + expect(pipeCompletion).toBeDefined() + const response = unwrapResponse(result) + await expect(response.text()).resolves.toBe( + new TextDecoder().decode(html), + ) + await expect(pipeCompletion).resolves.toBeUndefined() + } finally { + router.serverSsr?.cleanup() + } + }) + + test.each([ + ['ordinary', new Error('solid-pipe-failed')], + [ + 'named AbortError', + Object.assign(new Error('solid-pipe-aborted'), { name: 'AbortError' }), + ], + ] as const)( + '%s pipeTo rejection logs, aborts the writer, and terminates the response', + async (_kind, pipeError) => { + solidMocks.renderToStream.mockImplementationOnce( + () => + ({ + pipeTo: () => Promise.reject(pipeError), + }) as any, + ) + + const router = await buildRouter() + const request = new Request('http://localhost/') + const addEventListener = vi.spyOn(request.signal, 'addEventListener') + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const response = unwrapResponse( + await renderRouterToStream({ + request, + router, + responseHeaders: new Headers(), + children: () => null, + }), + ) + expect(routerTransformMocks.readableOptions).toHaveBeenCalledWith( + expect.objectContaining({ rendererSafePoint: 'record-end' }), + ) + expect( + addEventListener.mock.calls.filter(([type]) => type === 'abort'), + ).toHaveLength(1) + + expect(await drainBody(response)).toBe(true) + expect(errorSpy).toHaveBeenCalledWith( + 'Error in Solid render stream:', + pipeError, + ) + } finally { + errorSpy.mockRestore() + router.serverSsr?.cleanup() + } + }, + ) + + test('async pipe failure cleans an unread response immediately', async () => { + let rejectPipe!: (reason: unknown) => void + const pipeCompletion = new Promise((_resolve, reject) => { + rejectPipe = reject + }) + solidMocks.renderToStream.mockImplementationOnce( + () => ({ pipeTo: () => pipeCompletion }) as any, + ) + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + const router = await buildRouter() + try { + const result = await renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + children: () => null, + }) + expect(unwrapResponse(result).body).not.toBeNull() + + rejectPipe(new Error('solid-pipe-failed-unread')) + await vi.waitFor(() => expect(router.serverSsr).toBeUndefined()) } finally { errorSpy.mockRestore() router.serverSsr?.cleanup() } }) - test('pipeTo rejection aborts writer and terminates response stream', async () => { + test('request abort after attachment stops outgoing Solid writes', async () => { + let outboundWriter!: WritableStreamDefaultWriter + solidMocks.pipeTo.mockImplementationOnce( + (writable: WritableStream) => { + outboundWriter = writable.getWriter() + return new Promise(() => {}) + }, + ) solidMocks.renderToStream.mockImplementationOnce( - () => - ({ - pipeTo: () => Promise.reject(new Error('solid-pipe-failed')), - }) as any, + () => ({ pipeTo: solidMocks.pipeTo }) as any, ) const router = await buildRouter() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + const abortController = new AbortController() + const request = new Request('http://localhost/', { + signal: abortController.signal, + }) + const addEventListener = vi.spyOn(request.signal, 'addEventListener') try { const response = unwrapResponse( await renderRouterToStream({ - request: new Request('http://localhost/'), + request, router, responseHeaders: new Headers(), children: () => null, }), ) - const terminated = await Promise.race([ - drainBody(response), - new Promise((resolve) => setTimeout(() => resolve(false), 2000)), - ]) + expect(solidMocks.pipeTo).toHaveBeenCalledOnce() + expect( + addEventListener.mock.calls.filter(([type]) => type === 'abort'), + ).toHaveLength(1) + abortController.abort(new Error('solid-request-gone')) - expect(terminated).toBe(true) - expect(errorSpy).toHaveBeenCalled() + await expect( + outboundWriter.write(new TextEncoder().encode('late Solid chunk')), + ).rejects.toBeDefined() + + expect(await drainBody(response)).toBe(true) + } finally { + router.serverSsr?.cleanup() + } + }) + + test('request abort during renderer setup is caught before transform attachment', async () => { + const abortController = new AbortController() + solidMocks.renderToStream.mockImplementationOnce(() => { + abortController.abort(new Error('solid-setup-request-gone')) + return { pipeTo: solidMocks.pipeTo } as any + }) + + const router = await buildRouter() + try { + await expect( + renderRouterToStream({ + request: new Request('http://localhost/', { + signal: abortController.signal, + }), + router, + responseHeaders: new Headers(), + children: () => null, + }), + ).rejects.toThrow('solid-setup-request-gone') + + expect(solidMocks.pipeTo).not.toHaveBeenCalled() + expect(router.serverSsr).toBeUndefined() } finally { - errorSpy.mockRestore() router.serverSsr?.cleanup() } }) diff --git a/packages/solid-router/tests/server/Await.test.tsx b/packages/solid-router/tests/server/Await.test.tsx new file mode 100644 index 0000000000..613f3018f2 --- /dev/null +++ b/packages/solid-router/tests/server/Await.test.tsx @@ -0,0 +1,72 @@ +import { ErrorBoundary, Suspense } from 'solid-js' +import { describe, expect, it, vi } from 'vitest' +import { renderToStream, renderToStringAsync } from 'solid-js/web' +import { Await } from '../../src/awaited' + +describe('Await (server)', () => { + it('flushes blank content while an Await without a fallback is pending', async () => { + let resolvePromise!: (value: string) => void + const promise = new Promise((resolve) => { + resolvePromise = resolve + }) + const records: Array = [] + const completed = renderToStream(() => ( + + + {(value) => {value}} + + + )).pipeTo( + new WritableStream({ + write(chunk) { + records.push(new TextDecoder().decode(chunk)) + }, + }), + ) + + await vi.waitFor(() => expect(records.length).toBeGreaterThan(0)) + expect(records.join('')).not.toContain('resolved') + + resolvePromise('resolved') + await completed + expect(records.join('')).toContain('resolved') + }) + + it('renders an error boundary when an Await without a fallback rejects', async () => { + const html = await renderToStringAsync(() => ( + outer pending}> + {error.message}}> + inner pending}> + + {(value) => {value}} + + + + + )) + + expect(html).toContain('rejected') + expect(html).not.toContain('pending') + }) + + it.each([ + ['zero', 0], + ['false', false], + ['empty string', ''], + ['null', null], + ['undefined', undefined], + ])('renders a resolved %s value', async (_name, value) => { + const children = vi.fn(() => resolved) + + const html = await renderToStringAsync(() => ( + pending}> + {children} + + )) + + expect(children).toHaveBeenCalledOnce() + expect(children).toHaveBeenCalledWith(value) + expect(html).toContain('resolved') + expect(html).not.toContain('pending') + }) +}) diff --git a/packages/solid-router/tests/server/doctype.test.tsx b/packages/solid-router/tests/server/doctype.test.tsx new file mode 100644 index 0000000000..229c17202f --- /dev/null +++ b/packages/solid-router/tests/server/doctype.test.tsx @@ -0,0 +1,44 @@ +import { describe, expect, test } from 'vitest' +import { createRootRoute, createRouter } from '../../src' +import { + RouterServer, + createRequestHandler, + renderRouterToStream, + renderRouterToString, +} from '../../src/ssr/server' + +async function renderDocument(mode: 'stream' | 'string') { + const request = new Request('http://localhost/') + const rootRoute = createRootRoute({ + component: () =>
home
, + }) + const handler = createRequestHandler({ + request, + createRouter: () => createRouter({ routeTree: rootRoute, isServer: true }), + }) + + return handler(({ router, responseHeaders }) => { + const children = () => + return mode === 'stream' + ? renderRouterToStream({ + request, + router, + responseHeaders, + children, + }) + : renderRouterToString({ router, responseHeaders, children }) + }) +} + +describe('document type', () => { + test.each(['stream', 'string'] as const)( + '%s output contains one document type', + async (mode) => { + const response = await renderDocument(mode) + const html = await response.text() + + expect(html.startsWith('/g)).toHaveLength(1) + }, + ) +}) diff --git a/packages/solid-router/tests/server/errorComponent.test.tsx b/packages/solid-router/tests/server/errorComponent.test.tsx index 38c0731010..cb64f3b679 100644 --- a/packages/solid-router/tests/server/errorComponent.test.tsx +++ b/packages/solid-router/tests/server/errorComponent.test.tsx @@ -1,12 +1,74 @@ +import { Suspense, onCleanup } from 'solid-js' import { describe, expect, it, vi } from 'vitest' -import { createRootRoute, createRoute, createRouter } from '../../src' +import { + Await, + createRootRoute, + createRoute, + createRouter, + lazyRouteComponent, +} from '../../src' import { RouterServer, createRequestHandler, + renderRouterToStream, renderRouterToString, } from '../../src/ssr/server' +import type { AnyRouter } from '@tanstack/router-core' + +function createLazyErrorComponent() { + return lazyRouteComponent( + () => + Promise.resolve({ + ErrorComponent: ({ error }: { error: Error }) => ( +
Route error: {error.message}
+ ), + }), + 'ErrorComponent', + ) +} describe('errorComponent (server)', () => { + it('cleans up components and router state after a synchronous string-render error', async () => { + vi.useFakeTimers() + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => undefined) + + try { + const rootRoute = createRootRoute() + const handler = createRequestHandler({ + request: new Request('http://localhost/'), + createRouter: () => + createRouter({ routeTree: rootRoute, isServer: true }), + }) + let requestRouter: AnyRouter | undefined + const componentCleanup = vi.fn() + + const response = await handler(({ router, responseHeaders }) => { + requestRouter = router + return renderRouterToString({ + router, + responseHeaders, + children: () => { + onCleanup(componentCleanup) + throw new Error('render boom') + }, + }) + }) + + expect(response.status).toBe(500) + expect(requestRouter?.serverSsr).toBeUndefined() + // Solid's synchronous renderer schedules disposal for the next task. + await vi.runOnlyPendingTimersAsync() + expect(componentCleanup).toHaveBeenCalledOnce() + expect(vi.getTimerCount()).toBe(0) + } finally { + consoleError.mockRestore() + vi.clearAllTimers() + vi.useRealTimers() + } + }) + it.each([ ['Error', new Error('loader boom')], ['Error with cause', new Error('loader boom', { cause: false })], @@ -81,4 +143,88 @@ describe('errorComponent (server)', () => { expect(html).not.toContain('Index route') }, ) + + it.each(['string', 'stream'] as const)( + 'handles a lazy error component during %s rendering', + async (mode) => { + const rootRoute = createRootRoute() + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => { + throw new Error('render boom') + }, + errorComponent: createLazyErrorComponent(), + }) + const routeTree = rootRoute.addChildren([indexRoute]) + const request = new Request('http://localhost/') + const handler = createRequestHandler({ + request, + createRouter: () => createRouter({ routeTree, isServer: true }), + }) + + const response = await handler(({ router, responseHeaders }) => { + const children = () => + return mode === 'stream' + ? renderRouterToStream({ request, router, responseHeaders, children }) + : renderRouterToString({ router, responseHeaders, children }) + }) + const html = await response.text() + + if (mode === 'stream') { + expect(html).toContain('data-testid="error-component"') + expect(html).toContain('render boom') + } else { + // The error boundary's Suspense fallback is blank during string rendering. + expect(html.startsWith('')).toBe(true) + expect(html).not.toContain('data-testid="error-component"') + } + }, + ) + + it('renders the route error component when a streamed Await rejects', async () => { + let rejectDeferred!: (error: Error) => void + const deferred = new Promise((_resolve, reject) => { + rejectDeferred = reject + }) + const rootRoute = createRootRoute() + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + loader: () => ({ deferred }), + component: () => { + const data = indexRoute.useLoaderData() + return ( + pending}> + + {() => resolved} + + + ) + }, + errorComponent: createLazyErrorComponent(), + }) + const routeTree = rootRoute.addChildren([indexRoute]) + const request = new Request('http://localhost/') + const handler = createRequestHandler({ + request, + createRouter: () => createRouter({ routeTree, isServer: true }), + }) + const response = await handler(({ router, responseHeaders }) => + renderRouterToStream({ + request, + router, + responseHeaders, + children: () => , + }), + ) + const htmlPromise = response.text() + + rejectDeferred(new Error('deferred boom')) + const html = await htmlPromise + + expect(html).toContain('data-testid="error-component"') + expect(html).toContain('deferred boom') + expect(html).not.toContain('pending') + }) }) diff --git a/packages/solid-router/tests/server/lazyRouteComponent.test.tsx b/packages/solid-router/tests/server/lazyRouteComponent.test.tsx new file mode 100644 index 0000000000..95ab8a5cdd --- /dev/null +++ b/packages/solid-router/tests/server/lazyRouteComponent.test.tsx @@ -0,0 +1,148 @@ +import { ErrorBoundary, Suspense, createContext, useContext } from 'solid-js' +import { renderToString, renderToStringAsync } from 'solid-js/web' +import { afterEach, describe, expect, it, vi } from 'vitest' +import { lazyRouteComponent } from '../../src/lazyRouteComponent' + +afterEach(() => { + vi.unstubAllEnvs() +}) + +describe('lazyRouteComponent (server)', () => { + it.each([ + { exportName: undefined, preload: false }, + { exportName: 'Missing', preload: false }, + { exportName: undefined, preload: true }, + { exportName: 'Missing', preload: true }, + ])( + 'renders a missing $exportName export as blank in production (preload: $preload)', + async ({ exportName, preload }) => { + vi.stubEnv('NODE_ENV', 'production') + const importer = vi.fn( + (): Promise null>> => + Promise.resolve({ + Other: () => null, + }), + ) + const Page = lazyRouteComponent(importer, exportName) + const onError = vi.fn() + const onUnhandledRejection = vi.fn() + process.on('unhandledRejection', onUnhandledRejection) + + try { + if (preload) { + await Page.preload?.() + } + + const html = await renderToStringAsync( + () => ( + { + onError(error) + return Render failed + }} + > + Pending}> + + + + ), + { timeoutMs: 1_000 }, + ) + // Promise rejection events are dispatched after the current microtasks. + await new Promise((resolve) => setImmediate(resolve)) + + // Solid can retain hydration scripts and boundary comments without + // rendering content for the missing component. + const content = html + .replace(/]*>[\s\S]*?<\/script>/g, '') + .replace(//g, '') + expect(content).toBe('') + expect(importer).toHaveBeenCalledOnce() + expect(onError).not.toHaveBeenCalled() + expect(onUnhandledRejection).not.toHaveBeenCalled() + } finally { + process.off('unhandledRejection', onUnhandledRejection) + } + }, + ) + + it('renders a preloaded component synchronously and reuses its import', async () => { + const importer = vi.fn(() => + Promise.resolve({ + default: (props: { label: string }) => {props.label}, + }), + ) + const Page = lazyRouteComponent(importer) + const preload = Page.preload?.() + await preload + + const html = renderToString(() => ( + Pending}> + + + )) + + expect(html).toContain('Preloaded page') + expect(html).not.toContain('Pending') + expect(Page.preload?.()).toBe(preload) + expect(importer).toHaveBeenCalledOnce() + }) + + it('renders synchronously after an awaited retry of a failed import', async () => { + const failure = new Error('component download failed') + const Content = (props: { label: string }) => {props.label} + const importer = vi + .fn<() => Promise<{ default: typeof Content }>>() + .mockRejectedValueOnce(failure) + .mockResolvedValueOnce({ default: Content }) + const Page = lazyRouteComponent(importer) + + await Page.preload?.() + expect(() => renderToString(() => )).toThrow( + failure, + ) + + const retry = Page.preload?.() + await retry + const html = renderToString(() => ) + + expect(html).toContain('Recovered page') + expect(Page.preload?.()).toBe(retry) + expect(importer).toHaveBeenCalledTimes(2) + }) + + it.each([false, true])( + 'preserves provider context and component props (preload: %s)', + async (preload) => { + const Context = createContext('missing context') + const importer = vi.fn(() => + Promise.resolve({ + Page: (props: { label: string; children: string }) => ( + + {useContext(Context)}:{props.label}:{props.children} + + ), + }), + ) + const Page = lazyRouteComponent(importer, 'Page') + if (preload) { + await Page.preload?.() + } + + const html = await renderToStringAsync(() => ( + + Pending}> + child prop + + + )) + + expect(html).toContain('provided context') + expect(html).toContain('page prop') + expect(html).toContain('child prop') + expect(html).not.toContain('missing context') + expect(html).not.toContain('Pending') + expect(importer).toHaveBeenCalledOnce() + }, + ) +}) diff --git a/packages/solid-router/tests/server/renderRouterToStream.test.tsx b/packages/solid-router/tests/server/renderRouterToStream.test.tsx new file mode 100644 index 0000000000..b0a2bf3ad4 --- /dev/null +++ b/packages/solid-router/tests/server/renderRouterToStream.test.tsx @@ -0,0 +1,74 @@ +import { Suspense, createResource } from 'solid-js' +import { expect, test, vi } from 'vitest' +import { attachRouterServerSsrUtils } from '@tanstack/router-core/ssr/server' +import { createMemoryHistory, createRootRoute, createRouter } from '../../src' +import { renderRouterToStream } from '../../src/ssr/renderRouterToStream' + +test('the lifetime limit rejects a native Solid bot wait before its resource settles', async () => { + let resolveResource!: (value: string) => void + const resource = new Promise((resolve) => { + resolveResource = resolve + }) + function Deferred() { + const [value] = createResource(() => resource) + return {value()} + } + + const router = createRouter({ + history: createMemoryHistory({ initialEntries: ['/'] }), + routeTree: createRootRoute({ component: () => null }), + isServer: true, + }) + attachRouterServerSsrUtils({ router, manifest: undefined }) + await router.load() + await router.serverSsr!.dehydrate() + + const owner = router.serverSsr! + const cleanup = vi.spyOn(owner, 'cleanup') + const warn = vi.spyOn(console, 'warn').mockImplementation(() => {}) + const request = new Request('http://localhost/', { + headers: { 'User-Agent': 'Googlebot' }, + }) + const resolved = vi.fn() + const rejected = vi.fn() + vi.useFakeTimers() + const pending = renderRouterToStream({ + request, + router, + responseHeaders: new Headers(), + children: () => ( + + + waiting

}> + +
+ + + ), + }).then(resolved, rejected) + + try { + await Promise.resolve() + expect(resolved).not.toHaveBeenCalled() + expect(rejected).not.toHaveBeenCalled() + + await vi.advanceTimersByTimeAsync(120_000) + + expect(rejected).toHaveBeenCalledExactlyOnceWith( + expect.objectContaining({ message: 'Stream lifetime exceeded' }), + ) + expect(resolved).not.toHaveBeenCalled() + expect(request.signal.aborted).toBe(false) + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + } finally { + // Solid exposes no cancellation handle for this resource. Let its native + // renderer finish so the test does not retain unresolved component work. + resolveResource('finished') + await pending + router.serverSsr?.cleanup() + vi.useRealTimers() + warn.mockRestore() + cleanup.mockRestore() + } +}) diff --git a/packages/solid-router/tests/server/renderRouterToString.test.tsx b/packages/solid-router/tests/server/renderRouterToString.test.tsx new file mode 100644 index 0000000000..91a439ca1b --- /dev/null +++ b/packages/solid-router/tests/server/renderRouterToString.test.tsx @@ -0,0 +1,52 @@ +import { Suspense } from 'solid-js' +import { expect, it } from 'vitest' +import { Await, createRootRoute, createRoute, createRouter } from '../../src' +import { + RouterServer, + createRequestHandler, + renderRouterToString, +} from '../../src/ssr/server' + +it('renders the Suspense fallback while finishing deferred hydration data', async () => { + let resolveDeferred!: (value: string) => void + const deferred = new Promise((resolve) => { + resolveDeferred = resolve + }) + const rootRoute = createRootRoute() + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + loader: () => ({ deferred }), + component: () => { + const data = indexRoute.useLoaderData() + queueMicrotask(() => resolveDeferred('deferred value')) + return ( + pending}> + + {(value) => {String(value)}} + + + ) + }, + }) + const routeTree = rootRoute.addChildren([indexRoute]) + const handler = createRequestHandler({ + request: new Request('http://localhost/'), + createRouter: () => createRouter({ routeTree, isServer: true }), + }) + + const response = await handler(({ router, responseHeaders }) => + renderRouterToString({ + router, + responseHeaders, + children: () => , + }), + ) + const html = await response.text() + + expect(response.status).toBe(200) + expect(html).toContain('data-testid="pending"') + expect(html).not.toContain('data-testid="resolved"') + expect(html).toContain('deferred value') + expect(html).toContain('$_TSR.e()') +}) diff --git a/packages/solid-router/tests/server/renderToStreamRecords.test.tsx b/packages/solid-router/tests/server/renderToStreamRecords.test.tsx new file mode 100644 index 0000000000..5ce7165618 --- /dev/null +++ b/packages/solid-router/tests/server/renderToStreamRecords.test.tsx @@ -0,0 +1,61 @@ +import { Suspense, createResource } from 'solid-js' +import { describe, expect, test } from 'vitest' +import { renderToStream } from 'solid-js/web' + +describe('installed Solid stream renderer', () => { + test('writes a resolved Suspense patch as complete records', async () => { + let resolveResource!: (value: string) => void + const resource = new Promise((resolve) => { + resolveResource = resolve + }) + + function Deferred() { + const [value] = createResource(() => resource) + return ( + solid-fallback

}> +

{value()}

+
+ ) + } + + const records: Array = [] + let resolveFirstRecord!: () => void + const firstRecord = new Promise((resolve) => { + resolveFirstRecord = resolve + }) + const stream = renderToStream(() => ( + + + + + + )) + const completed = stream.pipeTo( + new WritableStream({ + write(chunk) { + records.push(new TextDecoder('utf-8', { fatal: true }).decode(chunk)) + if (records.length === 1) { + resolveFirstRecord() + } + }, + }), + ) + + await firstRecord + expect(records[0]).toContain('solid-fallback') + + resolveResource('solid-resolved') + await completed + + const templateIndex = records.findIndex((record) => + record.includes('solid-resolved'), + ) + expect(templateIndex).toBeGreaterThan(0) + expect(records[templateIndex]).toMatch( + /^]*>[\s\S]*<\/template>$/, + ) + + const scriptRecord = records[templateIndex + 1] + expect(scriptRecord).toMatch(/^]*>[\s\S]*<\/script>$/) + }) +}) diff --git a/packages/solid-start-server/src/defaultStreamHandler.tsx b/packages/solid-start-server/src/defaultStreamHandler.tsx index 9575b801e0..ea189a0596 100644 --- a/packages/solid-start-server/src/defaultStreamHandler.tsx +++ b/packages/solid-start-server/src/defaultStreamHandler.tsx @@ -5,8 +5,8 @@ import { import { StartServer } from './StartServer' export const defaultStreamHandler = defineHandlerCallback( - async ({ request, router, responseHeaders }) => - await renderRouterToStream({ + ({ request, router, responseHeaders }) => + renderRouterToStream({ request, router, responseHeaders, diff --git a/packages/start-client-core/src/client-rpc/frame-decoder.ts b/packages/start-client-core/src/client-rpc/frame-decoder.ts index cd1a0c719f..dd33dcb55a 100644 --- a/packages/start-client-core/src/client-rpc/frame-decoder.ts +++ b/packages/start-client-core/src/client-rpc/frame-decoder.ts @@ -1,425 +1,281 @@ -/** - * Client-side frame decoder for multiplexed responses. - * - * Decodes binary frame protocol and reconstructs: - * - JSON stream (NDJSON lines for seroval) - * - Raw streams (binary data as ReadableStream) - */ +import { + FRAME_HEADER_SIZE, + FRAME_TYPE_CHUNK, + FRAME_TYPE_END, + FRAME_TYPE_ERROR, + FRAME_TYPE_JSON, + MAX_FRAMED_STREAMS, + MAX_FRAME_PAYLOAD_SIZE, + MAX_UNREAD_RAW_STREAM_BYTES, +} from '../constants' -import { FRAME_HEADER_SIZE, FrameType } from '../constants' +const decoder = new TextDecoder() +const empty: Uint8Array = new Uint8Array() +// With a zero high-water mark, `-desiredSize` is the unread byte count. +const rawStreamQueue = new ByteLengthQueuingStrategy({ highWaterMark: 0 }) -/** Cached TextDecoder for frame decoding */ -const textDecoder = new TextDecoder() - -/** Shared empty buffer for empty buffer case - avoids allocation */ -const EMPTY_BUFFER = new Uint8Array(0) - -/** Hardening limits to prevent memory/CPU DoS */ -const MAX_FRAME_PAYLOAD_SIZE = 16 * 1024 * 1024 // 16MiB -const MAX_BUFFERED_BYTES = 32 * 1024 * 1024 // 32MiB -const MAX_STREAMS = 1024 -const MAX_FRAMES = 100_000 // Limit total frames to prevent CPU DoS - -/** - * Result of frame decoding. - */ -export interface FrameDecoderResult { - /** Gets or creates a raw stream by ID (for use by deserialize plugin) */ - getStream: (id: number) => ReadableStream - /** Stream of JSON strings (NDJSON lines) */ - chunks: ReadableStream -} - -/** - * Creates a frame decoder that processes a multiplexed response stream. - * - * @param input The raw response body stream - * @returns Decoded JSON stream and stream getter function - */ -export function createFrameDecoder( - input: ReadableStream, -): FrameDecoderResult { - const streamControllers = new Map< - number, - ReadableStreamDefaultController - >() - const streams = new Map>() - const cancelledStreamIds = new Set() - - let cancelled = false as boolean - let inputReader: ReadableStreamReader | null = null - let frameCount = 0 +type Closed = 1 +type Failed = readonly [unknown] +type State = 0 | Closed | Failed +type RawController = + | ReadableStreamDefaultController + | null // canceled by its consumer + | false // ended by the wire or decoder +type RawEntry = [ReadableStream, RawController] +export function createFrameDecoder(input: ReadableStream) { + const reader = input.getReader() + const rawStreams = new Map() + let state = 0 as State + let resume: (() => void) | undefined let jsonController!: ReadableStreamDefaultController - const jsonChunks = new ReadableStream({ + + const wake = () => { + resume?.() + resume = undefined + } + + const settleRaw = (entry: RawEntry, terminal: Closed | Failed) => { + const controller = entry[1] + entry[1] = false + if (controller) { + if (terminal === 1) { + controller.close() + } else { + controller.error(terminal[0]) + } + } + } + + const chunks = new ReadableStream({ start(controller) { jsonController = controller }, - cancel() { - cancelled = true - try { - inputReader?.cancel() - } catch { - // Ignore + pull: wake, + cancel(reason) { + // Every raw stream, including one requested later, ends with this reason. + const failed: Failed = [ + reason === undefined ? new Error('Framed response cancelled') : reason, + ] + state = failed + wake() + void reader.cancel(reason).catch(() => {}) + for (const entry of rawStreams.values()) { + settleRaw(entry, failed) } - - streamControllers.forEach((ctrl) => { - try { - ctrl.error(new Error('Framed response cancelled')) - } catch { - // Ignore - } - }) - streamControllers.clear() - streams.clear() - cancelledStreamIds.clear() }, }) - /** - * Gets or creates a stream for a given stream ID. - * Called by deserialize plugin when it encounters a RawStream reference. - */ - function getOrCreateStream(id: number): ReadableStream { - const existing = streams.get(id) + function getRaw(id: number): RawEntry { + const existing = rawStreams.get(id) if (existing) { return existing } + if (rawStreams.size >= MAX_FRAMED_STREAMS) { + throw new Error('Too many raw streams') + } - // If we already received an END/ERROR for this streamId, returning a fresh stream - // would hang consumers. Return an already-closed stream instead. - if (cancelledStreamIds.has(id)) { - return new ReadableStream({ - start(controller) { - controller.close() + let controller!: ReadableStreamDefaultController + const stream = new ReadableStream( + { + start(value) { + controller = value + }, + cancel() { + if (entry[1] !== false) { + entry[1] = null + } }, - }) - } - - if (streams.size >= MAX_STREAMS) { - throw new Error( - `Too many raw streams in framed response (max ${MAX_STREAMS})`, - ) - } - - const stream = new ReadableStream({ - start(ctrl) { - streamControllers.set(id, ctrl) }, - cancel() { - cancelledStreamIds.add(id) - streamControllers.delete(id) - streams.delete(id) - }, - }) - streams.set(id, stream) - return stream + rawStreamQueue, + ) + const entry: RawEntry = [stream, controller] + rawStreams.set(id, entry) + if (state !== 0) { + settleRaw(entry, state) + } + return entry } - /** - * Ensures stream exists and returns its controller for enqueuing data. - * Used for CHUNK frames where we need to ensure stream is created. - */ - function ensureController( - id: number, - ): ReadableStreamDefaultController | undefined { - getOrCreateStream(id) - return streamControllers.get(id) + function getStream(id: number): ReadableStream { + if (id === 0 || id >>> 0 !== id) { + throw new RangeError('Invalid raw stream ID') + } + return getRaw(id)[0] } - // Process frames asynchronously - ;(async () => { - const reader = input.getReader() - inputReader = reader + void (async () => { + let inputChunk = empty + let inputOffset = 0 - const bufferList: Array = [] - // Index of the first un-consumed chunk in bufferList. Advancing this - // pointer is O(1); using bufferList.shift() to drop a consumed chunk is - // O(n) and degrades to O(n^2) when a single large frame is assembled from - // many small chunks (e.g. a big RawStream payload split across reads). - let bufferHead = 0 - let totalLength = 0 - - function advanceBufferHead(): void { - bufferList[bufferHead++] = EMPTY_BUFFER - - // Reset drained buffers immediately and compact long-lived buffers in batches. - if (bufferHead === bufferList.length) { - bufferList.length = 0 - bufferHead = 0 - } else if (bufferHead >= 32) { - bufferList.splice(0, bufferHead) - bufferHead = 0 + async function more(): Promise { + while (inputOffset === inputChunk.byteLength) { + inputChunk = empty + inputOffset = 0 + const next = await reader.read() + if (state !== 0 || next.done) { + return false + } + inputChunk = next.value } + return true } - - /** - * Reads header bytes from buffer chunks without flattening. - * Returns header data or null if not enough bytes available. - */ - function readHeader(): { - type: number - streamId: number - length: number - } | null { - if (totalLength < FRAME_HEADER_SIZE) return null - const first = bufferList[bufferHead]! - - // Fast path: header fits entirely in first chunk (common case) - if (first.length >= FRAME_HEADER_SIZE) { - const type = first[0]! - const streamId = - ((first[1]! << 24) | - (first[2]! << 16) | - (first[3]! << 8) | - first[4]!) >>> - 0 - const length = - ((first[5]! << 24) | - (first[6]! << 16) | - (first[7]! << 8) | - first[8]!) >>> - 0 - return { type, streamId, length } + async function read( + length: number, + cleanEof?: boolean, + ): Promise { + if (length === 0) { + return empty } - - // Slow path: header spans multiple chunks - flatten header bytes only - const headerBytes = new Uint8Array(FRAME_HEADER_SIZE) - let offset = 0 - let remaining = FRAME_HEADER_SIZE - for (let i = bufferHead; i < bufferList.length && remaining > 0; i++) { - const chunk = bufferList[i]! - const toCopy = Math.min(chunk.length, remaining) - headerBytes.set(chunk.subarray(0, toCopy), offset) - offset += toCopy - remaining -= toCopy + if (!(await more())) { + if (cleanEof) { + return + } + throw new Error('Incomplete frame') } - - const type = headerBytes[0]! - const streamId = - ((headerBytes[1]! << 24) | - (headerBytes[2]! << 16) | - (headerBytes[3]! << 8) | - headerBytes[4]!) >>> - 0 - const length = - ((headerBytes[5]! << 24) | - (headerBytes[6]! << 16) | - (headerBytes[7]! << 8) | - headerBytes[8]!) >>> - 0 - - return { type, streamId, length } - } - - /** - * Flattens buffer list into single Uint8Array and removes from list. - */ - function extractFlattened(count: number): Uint8Array { - if (count === 0) return EMPTY_BUFFER - // Fast path: the requested bytes are fully contained in the first buffered - // chunk (the common case — most frames arrive within a single network - // read). Return a subarray view instead of allocating a new buffer and - // copying `count` bytes. The view shares the chunk's backing ArrayBuffer, - // which is safe because buffered chunks are never mutated in place after - // being read from the network. - const first = bufferList[bufferHead] - if (first && first.length >= count) { - const result = first.subarray(0, count) - if (first.length === count) { - advanceBufferHead() - } else { - bufferList[bufferHead] = first.subarray(count) + const available = inputChunk.byteLength - inputOffset + if (available >= length) { + const result = inputChunk.subarray(inputOffset, inputOffset + length) + inputOffset += length + if (inputOffset === inputChunk.byteLength) { + inputChunk = empty + inputOffset = 0 } - totalLength -= count return result } - // Slow path: the requested bytes span multiple chunks — flatten by copying. - const result = new Uint8Array(count) + const result = new Uint8Array(length) let offset = 0 - let remaining = count - - while (remaining > 0 && bufferHead < bufferList.length) { - const chunk = bufferList[bufferHead]! - const toCopy = Math.min(chunk.length, remaining) - result.set(chunk.subarray(0, toCopy), offset) - - offset += toCopy - remaining -= toCopy - - if (toCopy === chunk.length) { - advanceBufferHead() - } else { - bufferList[bufferHead] = chunk.subarray(toCopy) + while (offset < length) { + if (!(await more())) { + throw new Error('Incomplete frame') } + const size = Math.min( + length - offset, + inputChunk.byteLength - inputOffset, + ) + result.set(inputChunk.subarray(inputOffset, inputOffset + size), offset) + inputOffset += size + offset += size + } + if (inputOffset === inputChunk.byteLength) { + inputChunk = empty + inputOffset = 0 } - - totalLength -= count return result } try { - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - while (true) { - const { done, value } = await reader.read() - if (cancelled) break - if (done) break - + while (state === 0) { + let header = await read(FRAME_HEADER_SIZE, true) + // Cancellation can run while the read is suspended. // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - if (!value) continue + if (state !== 0) { + return + } + if (!header) { + for (const entry of rawStreams.values()) { + if (entry[1]) { + throw new Error('Incomplete raw stream') + } + } + state = 1 + jsonController.close() + return + } - // Append incoming chunk to buffer list - if (totalLength + value.length > MAX_BUFFERED_BYTES) { - throw new Error( - `Framed response buffer exceeded ${MAX_BUFFERED_BYTES} bytes`, + const type = header[0]! + const streamId = + ((header[1]! << 24) | + (header[2]! << 16) | + (header[3]! << 8) | + header[4]!) >>> + 0 + const length = + ((header[5]! << 24) | + (header[6]! << 16) | + (header[7]! << 8) | + header[8]!) >>> + 0 + header = empty + + if ( + type > FRAME_TYPE_ERROR || + (type === FRAME_TYPE_JSON) !== (streamId === 0) || + length > MAX_FRAME_PAYLOAD_SIZE || + (type === FRAME_TYPE_END && length !== 0) + ) { + throw new Error('Invalid frame') + } + + const entry = type === FRAME_TYPE_JSON ? undefined : getRaw(streamId) + if (entry?.[1] === false) { + throw new Error('Raw stream already ended') + } + + let payload = (await read(length))! + // Cancellation can run while the read is suspended. + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + if (state !== 0) { + return + } + if (!entry) { + const value = decoder.decode(payload) + payload = empty + jsonController.enqueue(value) + // Cancellation wakes this wait even when JSON demand stays at zero. + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + while (state === 0 && jsonController.desiredSize! <= 0) { + await new Promise((resolve) => { + resume = resolve + }) + } + continue + } + + if (type === FRAME_TYPE_CHUNK) { + const controller = entry[1] + if (controller) { + if (-controller.desiredSize! > MAX_UNREAD_RAW_STREAM_BYTES) { + controller.error( + new Error(`Raw stream ${streamId} has too many unread bytes`), + ) + entry[1] = null + payload = empty + continue + } + // A small view would pin its whole network buffer; copy those. + const chunk = + payload.byteLength * 4 < payload.buffer.byteLength + ? payload.slice() + : payload + payload = empty + controller.enqueue(chunk) + } + } else { + settleRaw( + entry, + type === FRAME_TYPE_END ? 1 : [new Error(decoder.decode(payload))], ) } - bufferList.push(value) - totalLength += value.length - - // Parse complete frames from buffer - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - while (true) { - const header = readHeader() - if (!header) break // Not enough bytes for header - - const { type, streamId, length } = header - - if ( - type !== FrameType.JSON && - type !== FrameType.CHUNK && - type !== FrameType.END && - type !== FrameType.ERROR - ) { - throw new Error(`Unknown frame type: ${type}`) - } - - // Enforce stream id conventions: JSON uses streamId 0, raw streams use non-zero ids - if (type === FrameType.JSON) { - if (streamId !== 0) { - throw new Error('Invalid JSON frame streamId (expected 0)') - } - } else { - if (streamId === 0) { - throw new Error('Invalid raw frame streamId (expected non-zero)') - } - } - - if (length > MAX_FRAME_PAYLOAD_SIZE) { - throw new Error( - `Frame payload too large: ${length} bytes (max ${MAX_FRAME_PAYLOAD_SIZE})`, - ) - } - - const frameSize = FRAME_HEADER_SIZE + length - if (totalLength < frameSize) break // Wait for more data - - if (++frameCount > MAX_FRAMES) { - throw new Error( - `Too many frames in framed response (max ${MAX_FRAMES})`, - ) - } - - // Extract and consume header bytes - extractFlattened(FRAME_HEADER_SIZE) - - // Extract payload - const payload = extractFlattened(length) - - // Process frame by type - switch (type) { - case FrameType.JSON: { - try { - jsonController.enqueue(textDecoder.decode(payload)) - } catch { - // JSON stream may be cancelled/closed - } - break - } - - case FrameType.CHUNK: { - const ctrl = ensureController(streamId) - if (ctrl) { - ctrl.enqueue(payload) - } - break - } - - case FrameType.END: { - const ctrl = ensureController(streamId) - cancelledStreamIds.add(streamId) - if (ctrl) { - try { - ctrl.close() - } catch { - // Already closed - } - streamControllers.delete(streamId) - } - break - } - - case FrameType.ERROR: { - const ctrl = ensureController(streamId) - cancelledStreamIds.add(streamId) - if (ctrl) { - const message = textDecoder.decode(payload) - ctrl.error(new Error(message)) - streamControllers.delete(streamId) - } - break - } - } - } } - - if (totalLength !== 0) { - throw new Error('Incomplete frame at end of framed response') - } - - // Close JSON stream when done - try { - jsonController.close() - } catch { - // JSON stream may be cancelled/closed - } - - // Close any remaining streams (shouldn't happen in normal operation) - streamControllers.forEach((ctrl) => { - try { - ctrl.close() - } catch { - // Already closed - } - }) - streamControllers.clear() } catch (error) { - // Error reading - propagate to all streams - try { + if (state === 0) { + const failed: Failed = [error] + state = failed + void reader.cancel(error).catch(() => {}) jsonController.error(error) - } catch { - // Already errored/closed - } - streamControllers.forEach((ctrl) => { - try { - ctrl.error(error) - } catch { - // Already errored/closed + for (const entry of rawStreams.values()) { + settleRaw(entry, failed) } - }) - streamControllers.clear() - } finally { - try { - reader.releaseLock() - } catch { - // Ignore } - inputReader = null + } finally { + inputChunk = empty + reader.releaseLock() } })() - return { getStream: getOrCreateStream, chunks: jsonChunks } + return [chunks, getStream] as const } diff --git a/packages/start-client-core/src/client-rpc/index.ts b/packages/start-client-core/src/client-rpc/index.ts index a50dc46635..b12e671307 100644 --- a/packages/start-client-core/src/client-rpc/index.ts +++ b/packages/start-client-core/src/client-rpc/index.ts @@ -1 +1,11 @@ export { createClientRpc } from './createClientRpc' +export { + FRAME_HEADER_SIZE, + FRAME_TYPE_CHUNK, + FRAME_TYPE_END, + FRAME_TYPE_ERROR, + FRAME_TYPE_JSON, + MAX_FRAMED_STREAMS, + MAX_FRAME_PAYLOAD_SIZE, + MAX_UNREAD_RAW_STREAM_BYTES, +} from '../constants' diff --git a/packages/start-client-core/src/client-rpc/serverFnFetcher.ts b/packages/start-client-core/src/client-rpc/serverFnFetcher.ts index 2534b6bb93..1720c44c2a 100644 --- a/packages/start-client-core/src/client-rpc/serverFnFetcher.ts +++ b/packages/start-client-core/src/client-rpc/serverFnFetcher.ts @@ -1,24 +1,24 @@ import { - createRawStreamDeserializePlugin, encode, invariant, isNotFound, parseRedirect, } from '@tanstack/router-core' +import { createRawStreamDeserializePlugin } from '@tanstack/router-core/ssr/client' import { fromCrossJSON, toJSONAsync } from 'seroval' import { getDefaultSerovalPlugins } from '../getDefaultSerovalPlugins' import { TSS_CONTENT_TYPE_FRAMED, TSS_FORMDATA_CONTEXT, + TSS_FRAMED_PROTOCOL_VERSION, X_TSS_RAW_RESPONSE, X_TSS_SERIALIZED, - validateFramedProtocolVersion, } from '../constants' import { createFrameDecoder } from './frame-decoder' import type { FunctionMiddlewareClientFnOptions } from '../createMiddleware' import type { Plugin as SerovalPlugin } from 'seroval' -let serovalPlugins: Array> | null = null +let serovalPlugins: Array> | undefined /** * Current async post-processing context for deserialization. @@ -30,34 +30,13 @@ let serovalPlugins: Array> | null = null * This uses a synchronous execution context pattern: * - Each call to `fromCrossJSON` is synchronous * - Within that synchronous execution, all `fromSerializable` calls happen - * - We set the context before `fromCrossJSON`, clear it after - * - For streaming chunks, we set/clear context around each `onMessage` call + * - We set the context before `fromCrossJSON`, then clear it afterward * * Even with concurrent server function calls, each individual deserialization * is atomic (synchronous), so promises are correctly scoped to their call. */ let currentPostProcessContext: Array> | null = null -/** - * Set the current post-processing context for async deserialization work. - * Called before deserialization starts. - * - * @param ctx - Array to collect async work promises, or null to clear - */ -export function setPostProcessContext( - ctx: Array> | null, -): void { - currentPostProcessContext = ctx -} - -/** - * Get the current post-processing context. - * Returns null if no deserialization is in progress. - */ -export function getPostProcessContext(): Array> | null { - return currentPostProcessContext -} - /** * Track an async post-processing promise in the current deserialization context. * Called by deserializers that need to perform async work after sync deserialization. @@ -72,6 +51,25 @@ export function trackPostProcessPromise(promise: Promise): void { } } +function deserialize( + value: any, + options: { + refs?: Map + plugins: Array> + }, + promises: Array>, +) { + currentPostProcessContext = promises + try { + return fromCrossJSON(value, options) + } catch (error) { + observePostProcessPromises(promises) + throw error + } finally { + currentPostProcessContext = null + } +} + /** * Helper to await all post-processing promises. * Uses Promise.allSettled to ensure all promises complete even if some reject. @@ -81,9 +79,17 @@ async function awaitPostProcessPromises( ): Promise { if (promises.length > 0) { await Promise.allSettled(promises) + promises.length = 0 } } +function observePostProcessPromises(promises: Array>): void { + for (const promise of promises) { + void promise.catch(() => {}) + } + promises.length = 0 +} + /** * Checks if an object has at least one own enumerable property. * More efficient than Object.keys(obj).length > 0 as it short-circuits on first property. @@ -115,22 +121,20 @@ export async function serverFnFetcher( if (!serovalPlugins) { serovalPlugins = getDefaultSerovalPlugins() } - const _first = args[0] - - const first = _first as FunctionMiddlewareClientFnOptions & { + const first = args[0] as FunctionMiddlewareClientFnOptions & { headers?: HeadersInit } // Use custom fetch if provided, otherwise fall back to the passed handler (global fetch) const fetchImpl = first.fetch ?? handler - const type = first.data instanceof FormData ? 'formData' : 'payload' + const isFormData = first.data instanceof FormData // Arrange the headers - const headers = first.headers ? new Headers(first.headers) : new Headers() + const headers = new Headers(first.headers) headers.set('x-tsr-serverFn', 'true') - if (type === 'payload') { + if (!isFormData) { headers.set( 'accept', `${TSS_CONTENT_TYPE_FRAMED}, application/x-ndjson, application/json`, @@ -139,7 +143,7 @@ export async function serverFnFetcher( // If the method is GET, we need to move the payload to the query string if (first.method === 'GET') { - if (type === 'formData') { + if (isFormData) { throw new Error('FormData is not supported with GET requests') } const serializedPayload = await serializePayload(first) @@ -163,7 +167,7 @@ export async function serverFnFetcher( } } - return await getResponse(async () => + return getResponse(() => fetchImpl(url, { method: first.method, headers, @@ -176,29 +180,30 @@ export async function serverFnFetcher( async function serializePayload( opts: FunctionMiddlewareClientFnOptions, ): Promise { - let payloadAvailable = false - const payloadToSerialize: any = {} + let payload: any if (opts.data !== undefined) { - payloadAvailable = true - payloadToSerialize['data'] = opts.data + payload = { data: opts.data } } // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition if (opts.context && hasOwnProperties(opts.context)) { - payloadAvailable = true - payloadToSerialize['context'] = opts.context + ;(payload ??= {}).context = opts.context } - if (payloadAvailable) { - return serialize(payloadToSerialize) - } - return undefined + return payload ? serialize(payload, opts.signal) : undefined } -async function serialize(data: any) { - return JSON.stringify( - await Promise.resolve(toJSONAsync(data, { plugins: serovalPlugins! })), - ) +async function serialize(data: any, signal?: AbortSignal) { + signal?.throwIfAborted() + let value + try { + value = await toJSONAsync(data, { + plugins: signal ? getDefaultSerovalPlugins(signal) : serovalPlugins!, + }) + } finally { + signal?.throwIfAborted() + } + return JSON.stringify(value) } async function getFetchBody( @@ -208,18 +213,14 @@ async function getFetchBody( let serializedContext = undefined // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition if (opts.context && hasOwnProperties(opts.context)) { - serializedContext = await serialize(opts.context) + serializedContext = await serialize(opts.context, opts.signal) } if (serializedContext !== undefined) { opts.data.set(TSS_FORMDATA_CONTEXT, serializedContext) } return opts.data } - const serializedBody = await serializePayload(opts) - if (serializedBody) { - return serializedBody - } - return undefined + return serializePayload(opts) } /** @@ -238,7 +239,6 @@ async function getResponse(fn: () => Promise) { if (error instanceof Response) { response = error } else { - console.log(error) throw error } } @@ -266,39 +266,33 @@ async function getResponse(fn: () => Promise) { // If it's a framed response (contains RawStream), use frame decoder if (contentType.includes(TSS_CONTENT_TYPE_FRAMED)) { - // Validate protocol version compatibility - validateFramedProtocolVersion(contentType) - + // A server without a version parameter predates versioning. + const version = /;\s*v=(\d+)/.exec(contentType)?.[1] + if (version && +version !== TSS_FRAMED_PROTOCOL_VERSION) { + throw new Error(`Unsupported framed protocol version ${version}`) + } if (!response.body) { throw new Error('No response body for framed response') } - const { getStream, chunks } = createFrameDecoder(response.body) + const [chunks, getStream] = createFrameDecoder(response.body) // Create deserialize plugin that wires up the raw streams const rawStreamPlugin = createRawStreamDeserializePlugin(getStream) - const plugins = [rawStreamPlugin, ...(serovalPlugins || [])] + const plugins = [rawStreamPlugin, ...serovalPlugins!] - const refs = new Map() - result = await processFramedResponse({ - jsonStream: chunks, - onMessage: (msg: any) => fromCrossJSON(msg, { refs, plugins }), - onError(msg, error) { - console.error(msg, error) - }, - }) + result = await processFramedResponse(chunks, plugins) } // If it's a JSON response, it can be simpler else if (contentType.includes('application/json')) { const jsonPayload = await response.json() // Track async post-processing work for this deserialization const postProcessPromises: Array> = [] - setPostProcessContext(postProcessPromises) - try { - result = fromCrossJSON(jsonPayload, { plugins: serovalPlugins! }) - } finally { - setPostProcessContext(null) - } + result = deserialize( + jsonPayload, + { plugins: serovalPlugins! }, + postProcessPromises, + ) // Await any async post-processing before returning await awaitPostProcessPromises(postProcessPromises) } @@ -340,102 +334,66 @@ async function getResponse(fn: () => Promise) { return response } -/** - * Processes a framed response where each JSON chunk is a complete JSON string - * (already decoded by frame decoder). - * - * Uses per-chunk post-processing context to ensure async deserialization work - * completes before the next chunk is processed. This prevents issues when - * streaming values require async post-processing (e.g., RSC decoding). - */ -async function processFramedResponse({ - jsonStream, - onMessage, - onError, -}: { - jsonStream: ReadableStream - onMessage: (msg: any) => any - onError?: (msg: string, error?: any) => void -}) { +/** Processes the complete JSON values emitted by the frame decoder. */ +async function processFramedResponse( + jsonStream: ReadableStream, + plugins: Array>, +) { const reader = jsonStream.getReader() + const options = { refs: new Map(), plugins } - // Read first JSON frame - this is the main result - const { value: firstValue, done: firstDone } = await reader.read() - if (firstDone || !firstValue) { - throw new Error('Stream ended before first object') + // TODO: promises and streams that Seroval created from earlier records stay + // pending after a transport failure. Rejecting them needs a Seroval API for + // aborting a cross-JSON deserialization session; do not reach into + // Seroval's refs to do it here. + const fail = (error: unknown) => { + void reader.cancel(error).catch(() => {}) } - // Each frame is a complete JSON string - const firstObject = JSON.parse(firstValue) + let result: any + const initialPostProcessPromises: Array> = [] + try { + const first = await reader.read() + if (first.done) { + throw new Error('Stream ended before first object') + } - // Process remaining frames for streaming refs like RawStream. - // Keep draining until the server closes the stream. - // Each chunk gets its own post-processing context to properly scope async work. - let drainCancelled = false as boolean - const drain = (async () => { + result = deserialize( + JSON.parse(first.value), + options, + initialPostProcessPromises, + ) + } catch (error) { + fail(error) + reader.releaseLock() + throw error + } + + // Keep consuming patches before awaiting root post-processing: that work may + // itself depend on raw frames which follow later JSON frames on the wire. + void (async () => { + const postProcessPromises: Array> = [] try { - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - while (true) { - const { value, done } = await reader.read() - if (done) break - if (value) { - try { - // Set up post-processing context for this chunk - const chunkPostProcessPromises: Array> = [] - setPostProcessContext(chunkPostProcessPromises) - try { - onMessage(JSON.parse(value)) - } finally { - setPostProcessContext(null) - } - // Await any async post-processing from this chunk before processing next. - // This ensures values requiring async work are ready before their - // containing Promise/Stream resolves/emits to consumers. - await awaitPostProcessPromises(chunkPostProcessPromises) - } catch (e) { - onError?.(`Invalid JSON: ${value}`, e) - } + for (;;) { + const next = await reader.read() + if (next.done) { + return } + + deserialize(JSON.parse(next.value), options, postProcessPromises) + // Later patches publish their promise/stream values synchronously. + // Observe auxiliary work without blocking frames those values need. + observePostProcessPromises(postProcessPromises) } - } catch (err) { - if (!drainCancelled) { - onError?.('Stream processing error:', err) - } + } catch (error) { + fail(error) + console.error('Stream processing error:', error) + } finally { + reader.releaseLock() } })() - // Process first object with its own post-processing context - let result: any - const initialPostProcessPromises: Array> = [] - setPostProcessContext(initialPostProcessPromises) - try { - result = onMessage(firstObject) - } catch (err) { - setPostProcessContext(null) - drainCancelled = true - reader.cancel().catch(() => {}) - throw err - } - setPostProcessContext(null) - - // Await initial post-processing promises before returning result await awaitPostProcessPromises(initialPostProcessPromises) - // If the initial decode fails async, stop draining to avoid holding - // onto the response body and raw stream buffers unnecessarily. - Promise.resolve(result).catch(() => { - drainCancelled = true - reader.cancel().catch(() => {}) - }) - - // Detach reader once draining completes. - drain.finally(() => { - try { - reader.releaseLock() - } catch { - // Ignore - } - }) - return result } diff --git a/packages/start-client-core/src/constants.ts b/packages/start-client-core/src/constants.ts index 3df983dfe7..1b7bd1077e 100644 --- a/packages/start-client-core/src/constants.ts +++ b/packages/start-client-core/src/constants.ts @@ -14,59 +14,33 @@ export const TSS_CONTENT_TYPE_FRAMED = 'application/x-tss-framed' /** * Frame types for binary multiplexing protocol. */ -export const FrameType = { - /** Seroval JSON chunk (NDJSON line) */ - JSON: 0, - /** Raw stream data chunk */ - CHUNK: 1, - /** Raw stream end (EOF) */ - END: 2, - /** Raw stream error */ - ERROR: 3, -} as const - -export type FrameType = (typeof FrameType)[keyof typeof FrameType] +export const FRAME_TYPE_JSON = 0 +export const FRAME_TYPE_CHUNK = 1 +export const FRAME_TYPE_END = 2 +export const FRAME_TYPE_ERROR = 3 /** Header size in bytes: type(1) + streamId(4) + length(4) */ export const FRAME_HEADER_SIZE = 9 +/** Largest payload accepted by one framed-protocol record. */ +export const MAX_FRAME_PAYLOAD_SIZE = 16 * 1024 * 1024 + +/** Largest number of raw streams accepted in one framed response. */ +export const MAX_FRAMED_STREAMS = 1024 + +/** + * Largest number of bytes one raw stream may hold unread. Raw streams share + * one ordered response, so an unread stream would otherwise buffer without + * bound while later frames arrive. + */ +export const MAX_UNREAD_RAW_STREAM_BYTES = 128 * 1024 * 1024 + /** Current protocol version for framed responses */ export const TSS_FRAMED_PROTOCOL_VERSION = 1 /** Full Content-Type header value with version parameter */ export const TSS_CONTENT_TYPE_FRAMED_VERSIONED = `${TSS_CONTENT_TYPE_FRAMED}; v=${TSS_FRAMED_PROTOCOL_VERSION}` -/** - * Parses the version parameter from a framed Content-Type header. - * Returns undefined if no version parameter is present. - */ -const FRAMED_VERSION_REGEX = /;\s*v=(\d+)/ -export function parseFramedProtocolVersion( - contentType: string, -): number | undefined { - // Match "v=" in the content-type parameters - const match = contentType.match(FRAMED_VERSION_REGEX) - return match ? parseInt(match[1]!, 10) : undefined -} - -/** - * Validates that the server's protocol version is compatible with this client. - * Throws an error if versions are incompatible. - */ -export function validateFramedProtocolVersion(contentType: string): void { - const serverVersion = parseFramedProtocolVersion(contentType) - if (serverVersion === undefined) { - // No version specified - assume compatible (backwards compat) - return - } - if (serverVersion !== TSS_FRAMED_PROTOCOL_VERSION) { - throw new Error( - `Incompatible framed protocol version: server=${serverVersion}, client=${TSS_FRAMED_PROTOCOL_VERSION}. ` + - `Please ensure client and server are using compatible versions.`, - ) - } -} - /** * Minimal metadata about a server function, available to client middleware. * Only contains the function ID since name/filename may expose server internals. diff --git a/packages/start-client-core/src/getDefaultSerovalPlugins.ts b/packages/start-client-core/src/getDefaultSerovalPlugins.ts index 8070137c20..3071e9924f 100644 --- a/packages/start-client-core/src/getDefaultSerovalPlugins.ts +++ b/packages/start-client-core/src/getDefaultSerovalPlugins.ts @@ -1,18 +1,27 @@ import { + createDefaultSerovalPlugins, makeSerovalPlugin, - defaultSerovalPlugins as routerDefaultSerovalPlugins, -} from '@tanstack/router-core' +} from '@tanstack/router-core/ssr/client' import { getStartOptions } from './getStartOptions' -import type { AnySerializationAdapter } from '@tanstack/router-core' +import type { AnySerializationAdapter } from '@tanstack/router-core/ssr/client' import type { Plugin } from 'seroval' -export function getDefaultSerovalPlugins(): Array> { - const start = getStartOptions() - const adapters = start?.serializationAdapters as +/** Start's serialization adapters followed by `routerPlugins`. */ +export function getSerovalPlugins( + routerPlugins: Array>, +): Array> { + const adapters = getStartOptions()?.serializationAdapters as | Array | undefined - return [ - ...(adapters?.map(makeSerovalPlugin) ?? []), - ...routerDefaultSerovalPlugins, - ] + return [...(adapters?.map(makeSerovalPlugin) ?? []), ...routerPlugins] +} + +/** + * Plugins for client JSON transport. The optional signal stops RawStream + * pumps when the request is aborted. + */ +export function getDefaultSerovalPlugins( + signal?: AbortSignal, +): Array> { + return getSerovalPlugins(createDefaultSerovalPlugins(signal)) } diff --git a/packages/start-client-core/src/index.tsx b/packages/start-client-core/src/index.tsx index 5bf09c4440..e9a8b92d85 100644 --- a/packages/start-client-core/src/index.tsx +++ b/packages/start-client-core/src/index.tsx @@ -1,6 +1,11 @@ export type { JsonResponse } from '@tanstack/router-core/ssr/client' -export { hydrate, json, mergeHeaders } from '@tanstack/router-core/ssr/client' +export { + defaultSerovalDeserializerPlugins, + hydrate, + json, + mergeHeaders, +} from '@tanstack/router-core/ssr/client' export { RawStream } from '@tanstack/router-core' export type { OnRawStreamCallback } from '@tanstack/router-core' @@ -102,18 +107,12 @@ export { TSS_CONTENT_TYPE_FRAMED, TSS_CONTENT_TYPE_FRAMED_VERSIONED, TSS_FRAMED_PROTOCOL_VERSION, - FrameType, FRAME_HEADER_SIZE, X_TSS_SERIALIZED, X_TSS_RAW_RESPONSE, X_TSS_CONTEXT, - validateFramedProtocolVersion, -} from './constants' -export type { - FrameType as FrameTypeValue, - ClientFnMeta, - ServerFnMeta, } from './constants' +export type { ClientFnMeta, ServerFnMeta } from './constants' export type * from './serverRoute' @@ -129,7 +128,10 @@ export type { export type { Register } from '@tanstack/router-core' export { getRouterInstance } from './getRouterInstance' -export { getDefaultSerovalPlugins } from './getDefaultSerovalPlugins' +export { + getDefaultSerovalPlugins, + getSerovalPlugins, +} from './getDefaultSerovalPlugins' export { getGlobalStartContext } from './getGlobalStartContext' export { safeObjectMerge, createNullProtoObject } from './safeObjectMerge' export { trackPostProcessPromise } from './client-rpc/serverFnFetcher' diff --git a/packages/start-client-core/tests/frame-decoder.test.ts b/packages/start-client-core/tests/frame-decoder.test.ts index 17862c480b..0b330c2884 100644 --- a/packages/start-client-core/tests/frame-decoder.test.ts +++ b/packages/start-client-core/tests/frame-decoder.test.ts @@ -1,6 +1,35 @@ -import { describe, expect, it } from 'vitest' +import { describe, expect, it, vi } from 'vitest' +import { RawStream, createControlledPromise } from '@tanstack/router-core' +import { createRawStreamRPCPlugin } from '@tanstack/router-core/ssr/server' +import { runWithStartContext } from '@tanstack/start-storage-context' +import { SerovalDeserializationError, toCrossJSONStream } from 'seroval' import { createFrameDecoder } from '../src/client-rpc/frame-decoder' -import { FRAME_HEADER_SIZE, FrameType } from '../src/constants' +import { + serverFnFetcher, + trackPostProcessPromise, +} from '../src/client-rpc/serverFnFetcher' +import { + FRAME_HEADER_SIZE, + FRAME_TYPE_CHUNK, + FRAME_TYPE_END, + FRAME_TYPE_ERROR, + FRAME_TYPE_JSON, + MAX_FRAME_PAYLOAD_SIZE, + MAX_UNREAD_RAW_STREAM_BYTES, + TSS_CONTENT_TYPE_FRAMED_VERSIONED, + X_TSS_SERIALIZED, +} from '../src/constants' +import type * as Seroval from 'seroval' + +const serovalMocks = vi.hoisted(() => ({ + fromCrossJSON: vi.fn(), +})) + +vi.mock('seroval', async (importOriginal) => { + const actual = await importOriginal() + serovalMocks.fromCrossJSON.mockImplementation(actual.fromCrossJSON) + return { ...actual, fromCrossJSON: serovalMocks.fromCrossJSON } +}) /** * Helper to encode a frame for testing @@ -20,44 +49,405 @@ function encodeFrame( } function encodeJSONFrame(json: string): Uint8Array { - return encodeFrame(FrameType.JSON, 0, new TextEncoder().encode(json)) + return encodeFrame(FRAME_TYPE_JSON, 0, new TextEncoder().encode(json)) } function encodeChunkFrame(streamId: number, data: Uint8Array): Uint8Array { - return encodeFrame(FrameType.CHUNK, streamId, data) + return encodeFrame(FRAME_TYPE_CHUNK, streamId, data) } function encodeEndFrame(streamId: number): Uint8Array { - return encodeFrame(FrameType.END, streamId, new Uint8Array(0)) + return encodeFrame(FRAME_TYPE_END, streamId, new Uint8Array(0)) } function encodeErrorFrame(streamId: number, message: string): Uint8Array { return encodeFrame( - FrameType.ERROR, + FRAME_TYPE_ERROR, streamId, new TextEncoder().encode(message), ) } +async function readBytes( + reader: ReadableStreamDefaultReader, +): Promise { + const chunks: Array = [] + let length = 0 + for (;;) { + const next = await reader.read() + if (next.done) { + break + } + chunks.push(next.value) + length += next.value.byteLength + } + const result = new Uint8Array(length) + let offset = 0 + for (const chunk of chunks) { + result.set(chunk, offset) + offset += chunk.byteLength + } + return result +} + describe('frame-decoder', () => { + it('cancels RawStream request serialization when the request is aborted', async () => { + const cancel = vi.fn(() => new Promise(() => {})) + const stream = new ReadableStream({ + pull: () => new Promise(() => {}), + cancel, + }) + const controller = new AbortController() + const reason = new Error('request aborted') + const handler = vi.fn() + + const request = runWithStartContext( + { startOptions: undefined } as any, + async () => + serverFnFetcher( + 'http://localhost/_serverFn/test', + [ + { + method: 'POST', + data: new RawStream(stream), + signal: controller.signal, + }, + ], + handler, + ), + ) + + await vi.waitFor(() => expect(stream.locked).toBe(true)) + controller.abort(reason) + + await expect(request).rejects.toBe(reason) + expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) + expect(handler).not.toHaveBeenCalled() + expect(stream.locked).toBe(false) + }) + + it('cancels a framed response whose first JSON value is invalid', async () => { + const cancel = vi.fn() + const body = new ReadableStream({ + start(controller) { + controller.enqueue(encodeJSONFrame('{')) + }, + cancel, + }) + + await expect( + runWithStartContext({ startOptions: undefined } as any, async () => + serverFnFetcher( + 'http://localhost/_serverFn/test', + [{ method: 'POST' }], + () => + new Response(body, { + headers: { + 'content-type': TSS_CONTENT_TYPE_FRAMED_VERSIONED, + [X_TSS_SERIALIZED]: 'true', + }, + }), + ), + ), + ).rejects.toBeInstanceOf(SyntaxError) + + expect(cancel).toHaveBeenCalledOnce() + await vi.waitFor(() => expect(body.locked).toBe(false)) + }) + + it.each([ + ['JSON', 'application/json', false], + ['framed', TSS_CONTENT_TYPE_FRAMED_VERSIONED, true], + ])( + 'observes tracked post-processing when initial %s deserialization throws', + async (_name, contentType, framed) => { + const observe = vi.fn(() => Promise.resolve()) + const tracked = { catch: observe } as unknown as Promise + const error = new Error('deserialization failed') + serovalMocks.fromCrossJSON.mockImplementationOnce(() => { + trackPostProcessPromise(tracked) + throw error + }) + + const cancel = vi.fn() + const body = framed + ? new ReadableStream({ + start(controller) { + controller.enqueue(encodeJSONFrame('{}')) + }, + cancel, + }) + : '{}' + + await expect( + runWithStartContext({ startOptions: undefined } as any, async () => + serverFnFetcher( + 'http://localhost/_serverFn/test', + [{ method: 'POST' }], + () => + new Response(body, { + headers: { + 'content-type': contentType, + [X_TSS_SERIALIZED]: 'true', + }, + }), + ), + ), + ).rejects.toBe(error) + + expect(observe).toHaveBeenCalledOnce() + if (framed) { + expect(cancel).toHaveBeenCalledOnce() + await vi.waitFor(() => + expect((body as ReadableStream).locked).toBe(false), + ) + } + }, + ) + + it('continues framed patches without awaiting their post-processing', async () => { + let releaseGate!: () => void + const gate = new Promise((resolve) => { + releaseGate = resolve + }) + let resolveLastPatch!: () => void + const lastPatch = new Promise((resolve) => { + resolveLastPatch = resolve + }) + const result = { ok: true } + + serovalMocks.fromCrossJSON + .mockImplementationOnce(() => result) + .mockImplementationOnce(() => { + trackPostProcessPromise(gate) + }) + .mockImplementationOnce(() => { + releaseGate() + resolveLastPatch() + }) + + const body = new ReadableStream({ + start(controller) { + controller.enqueue(encodeJSONFrame('{}')) + controller.enqueue(encodeJSONFrame('{}')) + controller.enqueue(encodeJSONFrame('{}')) + controller.close() + }, + }) + + const request = runWithStartContext( + { startOptions: undefined } as any, + async () => + serverFnFetcher( + 'http://localhost/_serverFn/test', + [{ method: 'POST' }], + () => + new Response(body, { + headers: { + 'content-type': TSS_CONTENT_TYPE_FRAMED_VERSIONED, + [X_TSS_SERIALIZED]: 'true', + }, + }), + ), + ) + + await lastPatch + await expect(request).resolves.toBe(result) + await vi.waitFor(() => expect(body.locked).toBe(false)) + }) + + it.each(['invalid JSON', 'invalid patch', 'read failure'] as const)( + 'cancels the response and fails raw streams after %s', + async (failure) => { + const log = vi.spyOn(console, 'error').mockImplementation(() => {}) + const cancel = vi.fn() + let controller!: ReadableStreamDefaultController + const body = new ReadableStream({ + start(value) { + controller = value + }, + cancel, + }) + const ready = createControlledPromise() + const dispose = toCrossJSONStream( + { + ready, + raw: new RawStream(new ReadableStream()), + }, + { + refs: new Map(), + plugins: [createRawStreamRPCPlugin(() => {})], + onParse(value) { + controller.enqueue(encodeJSONFrame(JSON.stringify(value))) + }, + }, + ) + + try { + const result = await runWithStartContext( + { startOptions: undefined } as any, + async () => + serverFnFetcher( + 'http://localhost/_serverFn/test', + [{ method: 'POST' }], + () => + new Response(body, { + headers: { + 'content-type': TSS_CONTENT_TYPE_FRAMED_VERSIONED, + [X_TSS_SERIALIZED]: 'true', + }, + }), + ), + ) + const rawReader = result.raw.getReader() + + ready.resolve('ready') + await expect(result.ready).resolves.toBe('ready') + const failures = Promise.allSettled([rawReader.read()]) + + const transportError = new Error('transport failed') + if (failure === 'read failure') { + controller.error(transportError) + } else { + controller.enqueue( + encodeJSONFrame(failure === 'invalid JSON' ? '{' : '{}'), + ) + } + + await vi.waitFor(() => expect(log).toHaveBeenCalledOnce()) + const error = log.mock.calls[0]![1] + if (failure === 'read failure') { + expect(error).toBe(transportError) + } else { + expect(error).toBeInstanceOf( + failure === 'invalid JSON' + ? SyntaxError + : SerovalDeserializationError, + ) + expect(cancel).toHaveBeenCalledExactlyOnceWith(error) + } + await expect(failures).resolves.toEqual([ + { status: 'rejected', reason: error }, + ]) + await expect(result.ready).resolves.toBe('ready') + rawReader.releaseLock() + await vi.waitFor(() => expect(body.locked).toBe(false)) + } finally { + dispose() + log.mockRestore() + } + }, + ) + + // Promises and streams that Seroval created from earlier records cannot be + // settled by the client after a transport failure without a Seroval API for + // aborting a cross-JSON deserialization session. + it.todo('rejects pending framed promises after a transport failure') + + it('cancels the response when the initial framed deserialization fails', async () => { + const error = new Error('initial deserialization failed') + serovalMocks.fromCrossJSON.mockImplementationOnce(() => { + throw error + }) + + const cancel = vi.fn() + let controller!: ReadableStreamDefaultController + const body = new ReadableStream({ + start(value) { + controller = value + }, + cancel, + }) + const dispose = toCrossJSONStream( + { value: 'first' }, + { + refs: new Map(), + onParse(value) { + controller.enqueue(encodeJSONFrame(JSON.stringify(value))) + }, + }, + ) + + try { + await expect( + runWithStartContext({ startOptions: undefined } as any, async () => + serverFnFetcher( + 'http://localhost/_serverFn/test', + [{ method: 'POST' }], + () => + new Response(body, { + headers: { + 'content-type': TSS_CONTENT_TYPE_FRAMED_VERSIONED, + [X_TSS_SERIALIZED]: 'true', + }, + }), + ), + ), + ).rejects.toBe(error) + expect(cancel).toHaveBeenCalledExactlyOnceWith(error) + await vi.waitFor(() => expect(body.locked).toBe(false)) + } finally { + dispose() + } + }) + describe('createFrameDecoder', () => { - it('should reject unknown frame type', async () => { - const badFrame = encodeFrame(99, 0, new Uint8Array(0)) + it('should throw synchronously when the input is already locked', () => { + const input = new ReadableStream() + const reader = input.getReader() + + try { + expect(() => createFrameDecoder(input)).toThrow() + } finally { + reader.releaseLock() + } + }) + + it('should ignore empty input chunks', async () => { const input = new ReadableStream({ start(controller) { - controller.enqueue(badFrame) + for (let index = 0; index < 1_000; index++) { + controller.enqueue(new Uint8Array()) + } + controller.enqueue(encodeJSONFrame('{"ok":true}')) controller.close() }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [chunks] = createFrameDecoder(input) + const reader = chunks.getReader() + await expect(reader.read()).resolves.toEqual({ + done: false, + value: '{"ok":true}', + }) + await expect(reader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) + }) + + it('should reject unknown frame type', async () => { + const badFrame = encodeFrame(99, 0, new Uint8Array(0)) + let cancelReason: unknown + const input = new ReadableStream({ + start(controller) { + controller.enqueue(badFrame) + }, + cancel(reason) { + cancelReason = reason + }, + }) + + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() - await expect(reader.read()).rejects.toThrow('Unknown frame type') + await expect(reader.read()).rejects.toThrow('Invalid frame') + expect(cancelReason).toBeInstanceOf(Error) + expect(input.locked).toBe(false) }) it('should reject raw frames with streamId 0', async () => { - const badChunk = encodeFrame(FrameType.CHUNK, 0, new Uint8Array([1])) + const badChunk = encodeFrame(FRAME_TYPE_CHUNK, 0, new Uint8Array([1])) const input = new ReadableStream({ start(controller) { controller.enqueue(badChunk) @@ -65,15 +455,15 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() - await expect(reader.read()).rejects.toThrow('Invalid raw frame streamId') + await expect(reader.read()).rejects.toThrow('Invalid frame') }) it('should reject JSON frames with non-zero streamId', async () => { const badJson = encodeFrame( - FrameType.JSON, + FRAME_TYPE_JSON, 1, new TextEncoder().encode('{}\n'), ) @@ -84,17 +474,17 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() - await expect(reader.read()).rejects.toThrow('Invalid JSON frame streamId') + await expect(reader.read()).rejects.toThrow('Invalid frame') }) it('should reject oversized frame payloads', async () => { // Declare a payload length > MAX_FRAME_PAYLOAD_SIZE with no payload. const headerOnly = new Uint8Array(FRAME_HEADER_SIZE) const view = new DataView(headerOnly.buffer) - view.setUint8(0, FrameType.JSON) + view.setUint8(0, FRAME_TYPE_JSON) view.setUint32(1, 0, false) view.setUint32(5, 16 * 1024 * 1024 + 1, false) @@ -105,16 +495,16 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() - await expect(reader.read()).rejects.toThrow('Frame payload too large') + await expect(reader.read()).rejects.toThrow('Invalid frame') }) it('should reject incomplete frames at end-of-stream', async () => { const headerOnly = new Uint8Array(FRAME_HEADER_SIZE) const view = new DataView(headerOnly.buffer) - view.setUint8(0, FrameType.JSON) + view.setUint8(0, FRAME_TYPE_JSON) view.setUint32(1, 0, false) view.setUint32(5, 3, false) @@ -125,12 +515,219 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() await expect(reader.read()).rejects.toThrow('Incomplete frame') }) + it('should reject END frames with a payload', async () => { + const input = new ReadableStream({ + start(controller) { + controller.enqueue( + encodeFrame(FRAME_TYPE_END, 1, new Uint8Array([1])), + ) + }, + }) + + const [chunks] = createFrameDecoder(input) + await expect(chunks.getReader().read()).rejects.toThrow('Invalid frame') + }) + + it('should reject invalid getStream IDs', async () => { + const input = new ReadableStream({ pull() {} }) + const [chunks, getStream] = createFrameDecoder(input) + + for (const id of [0, -1, 1.5, 0x1_0000_0000, NaN, Infinity]) { + expect(() => getStream(id)).toThrow('Invalid raw stream ID') + } + const maxStream = getStream(0xffff_ffff) + expect(getStream(0xffff_ffff)).toBe(maxStream) + await chunks.cancel() + }) + + it('should reject frames after a raw stream has ended', async () => { + const firstEnd = encodeEndFrame(1) + const secondEnd = encodeEndFrame(1) + const input = new ReadableStream({ + start(controller) { + const frames = new Uint8Array(firstEnd.length + secondEnd.length) + frames.set(firstEnd) + frames.set(secondEnd, firstEnd.length) + controller.enqueue(frames) + }, + }) + + const [chunks] = createFrameDecoder(input) + await expect(chunks.getReader().read()).rejects.toThrow( + 'Raw stream already ended', + ) + }) + + it('rejects a header-only CHUNK for an ended stream without pulling its payload', async () => { + const chunkHeader = encodeChunkFrame(1, new Uint8Array()) + new DataView(chunkHeader.buffer).setUint32( + 5, + MAX_FRAME_PAYLOAD_SIZE, + false, + ) + const frames = [encodeEndFrame(1), chunkHeader] + let pulls = 0 + const input = new ReadableStream( + { + pull(controller) { + pulls++ + const frame = frames.shift() + if (!frame) { + throw new Error('Payload was pulled') + } + controller.enqueue(frame) + }, + }, + { highWaterMark: 0 }, + ) + + const [chunks] = createFrameDecoder(input) + await expect(chunks.getReader().read()).rejects.toThrow( + 'Raw stream already ended', + ) + expect(pulls).toBe(2) + }) + + it('returns stable closed streams after completion', async () => { + const input = new ReadableStream({ + start(controller) { + controller.close() + }, + }) + const [chunks, getStream] = createFrameDecoder(input) + + await expect(chunks.getReader().read()).resolves.toEqual({ + done: true, + value: undefined, + }) + const stream = getStream(1) + expect(getStream(1)).toBe(stream) + await expect(stream.getReader().read()).resolves.toEqual({ + done: true, + value: undefined, + }) + }) + + it('errors active and late streams after a fatal frame', async () => { + const json = encodeJSONFrame('{"ref":1}') + const malformed = encodeFrame(99, 0, new Uint8Array()) + const cancel = vi.fn() + const input = new ReadableStream({ + start(controller) { + const frames = new Uint8Array(json.length + malformed.length) + frames.set(json) + frames.set(malformed, json.length) + controller.enqueue(frames) + }, + cancel, + }) + const [chunks, getStream] = createFrameDecoder(input) + const jsonReader = chunks.getReader() + + await jsonReader.read() + const active = getStream(1) + await expect(jsonReader.read()).rejects.toThrow('Invalid frame') + await expect(active.getReader().read()).rejects.toThrow('Invalid frame') + const late = getStream(2) + expect(getStream(2)).toBe(late) + await expect(late.getReader().read()).rejects.toThrow('Invalid frame') + expect(cancel).toHaveBeenCalledOnce() + expect(input.locked).toBe(false) + }) + + it('errors a raw stream when input ends without END', async () => { + const json = encodeJSONFrame('{"ref":1}') + const chunk = encodeChunkFrame(1, new Uint8Array([1])) + const input = new ReadableStream({ + start(controller) { + const frames = new Uint8Array(json.length + chunk.length) + frames.set(json) + frames.set(chunk, json.length) + controller.enqueue(frames) + controller.close() + }, + }) + const [chunks, getStream] = createFrameDecoder(input) + const jsonReader = chunks.getReader() + await jsonReader.read() + const rawReader = getStream(1).getReader() + + await expect(rawReader.read()).resolves.toEqual({ + done: false, + value: new Uint8Array([1]), + }) + await expect(rawReader.read()).rejects.toThrow('Incomplete raw stream') + await expect(jsonReader.read()).rejects.toThrow('Incomplete raw stream') + }) + + it('accepts clean EOF for a cancelled raw stream', async () => { + let inputController!: ReadableStreamDefaultController + const input = new ReadableStream({ + start(controller) { + inputController = controller + }, + }) + const [chunks, getStream] = createFrameDecoder(input) + const jsonReader = chunks.getReader() + + inputController.enqueue(encodeJSONFrame('{"ref":1}')) + await jsonReader.read() + await getStream(1).cancel() + inputController.close() + + await expect(jsonReader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) + }) + + it('accepts clean EOF after cancelling an unread stream that received END', async () => { + let inputController!: ReadableStreamDefaultController + let pulls = 0 + const frames = [ + encodeJSONFrame('{"ref":1}'), + encodeChunkFrame(1, new Uint8Array([1])), + encodeEndFrame(1), + ] + const input = new ReadableStream( + { + start(controller) { + inputController = controller + }, + pull(controller) { + pulls++ + const frame = frames.shift() + if (frame) { + controller.enqueue(frame) + } + }, + }, + { highWaterMark: 0 }, + ) + const [chunks, getStream] = createFrameDecoder(input) + const jsonReader = chunks.getReader() + + await expect(jsonReader.read()).resolves.toEqual({ + done: false, + value: '{"ref":1}', + }) + const rawStream = getStream(1) + await vi.waitFor(() => expect(pulls).toBe(4)) + await rawStream.cancel('unused') + inputController.close() + + await expect(jsonReader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) + }) + it('should cancel input when jsonChunks cancelled', async () => { let cancelled = false const input = new ReadableStream({ @@ -140,15 +737,320 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() await reader.cancel() expect(cancelled).toBe(true) }) + it('does not decode a payload after JSON cancellation wins its read', async () => { + const first = encodeJSONFrame('{"first":true}') + const second = encodeJSONFrame('{"second":true}') + const firstInput = new Uint8Array(first.length + FRAME_HEADER_SIZE) + firstInput.set(first) + firstInput.set(second.subarray(0, FRAME_HEADER_SIZE), first.length) + + let pulls = 0 + let jsonReader!: ReadableStreamDefaultReader + const cancel = vi.fn() + const decode = vi.spyOn(TextDecoder.prototype, 'decode') + const input = new ReadableStream( + { + pull(controller) { + if (pulls++ === 0) { + controller.enqueue(firstInput) + } else { + queueMicrotask(() => void jsonReader.cancel('stop')) + controller.enqueue(second.subarray(FRAME_HEADER_SIZE)) + } + }, + cancel, + }, + { highWaterMark: 0 }, + ) + + try { + const [chunks] = createFrameDecoder(input) + jsonReader = chunks.getReader() + await expect(jsonReader.read()).resolves.toEqual({ + done: false, + value: '{"first":true}', + }) + decode.mockClear() + + await vi.waitFor(() => expect(input.locked).toBe(false)) + expect(decode).not.toHaveBeenCalled() + expect(cancel).toHaveBeenCalledWith('stop') + } finally { + decode.mockRestore() + } + }) + + it('continues decoding while a raw chunk is unread', async () => { + const frames = [ + encodeJSONFrame('{"ref":1}'), + encodeChunkFrame(1, new Uint8Array([1])), + encodeJSONFrame('{"after":true}'), + encodeEndFrame(1), + ] + let pulls = 0 + const input = new ReadableStream( + { + pull(controller) { + const frame = frames[pulls++] + if (frame) { + controller.enqueue(frame) + } else { + controller.close() + } + }, + }, + { highWaterMark: 0 }, + ) + + const [chunks, getStream] = createFrameDecoder(input) + const jsonReader = chunks.getReader() + await expect(jsonReader.read()).resolves.toEqual({ + done: false, + value: '{"ref":1}', + }) + const rawStream = getStream(1) + await expect(jsonReader.read()).resolves.toEqual({ + done: false, + value: '{"after":true}', + }) + + const rawReader = rawStream.getReader() + await expect(rawReader.read()).resolves.toEqual({ + done: false, + value: new Uint8Array([1]), + }) + await expect(rawReader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) + expect(getStream(1)).toBe(rawStream) + }) + + it('keeps the multiplexed response active after one raw stream is cancelled', async () => { + const frames = [ + encodeJSONFrame('{"refs":[1,2]}'), + encodeChunkFrame(1, new Uint8Array([1])), + encodeChunkFrame(1, new Uint8Array([2])), + encodeEndFrame(1), + encodeChunkFrame(2, new Uint8Array([3])), + encodeEndFrame(2), + encodeJSONFrame('{"after":true}'), + ] + let pulls = 0 + const input = new ReadableStream( + { + pull(controller) { + const frame = frames[pulls++] + if (frame) { + controller.enqueue(frame) + } else { + controller.close() + } + }, + }, + { highWaterMark: 0 }, + ) + + const [chunks, getStream] = createFrameDecoder(input) + const jsonReader = chunks.getReader() + await jsonReader.read() + const blockingStream = getStream(1) + const otherReader = getStream(2).getReader() + const otherRead = otherReader.read() + await vi.waitFor(() => expect(pulls).toBe(frames.length)) + + await blockingStream.cancel('unused') + await expect(otherRead).resolves.toEqual({ + done: false, + value: new Uint8Array([3]), + }) + await expect(otherReader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) + await expect(jsonReader.read()).resolves.toEqual({ + done: false, + value: '{"after":true}', + }) + await expect(jsonReader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) + expect(getStream(1)).toBe(blockingStream) + await expect(blockingStream.getReader().read()).resolves.toEqual({ + done: true, + value: undefined, + }) + }) + + it('streams more than the old 16 MiB queue limit when consumed', async () => { + const payload = new Uint8Array(1024 * 1024) + let frame = 0 + const input = new ReadableStream( + { + pull(controller) { + if (frame++ === 0) { + controller.enqueue(encodeJSONFrame('{"ref":1}')) + } else if (frame <= 18) { + controller.enqueue(encodeChunkFrame(1, payload)) + } else if (frame === 19) { + controller.enqueue(encodeEndFrame(1)) + } else { + controller.close() + } + }, + }, + { highWaterMark: 0 }, + ) + + const [chunks, getStream] = createFrameDecoder(input) + const jsonReader = chunks.getReader() + await jsonReader.read() + const rawReader = getStream(1).getReader() + let bytes = 0 + for (;;) { + const next = await rawReader.read() + if (next.done) { + break + } + bytes += next.value.byteLength + } + + expect(bytes).toBe(17 * 1024 * 1024) + await expect(jsonReader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) + }) + + it('cancelling JSON aborts the response while a raw chunk is unread', async () => { + let pulls = 0 + let inputCancelReason: unknown + const frames = [ + encodeJSONFrame('{"ref":1}'), + encodeChunkFrame(1, new Uint8Array([1])), + ] + const input = new ReadableStream( + { + pull(controller) { + const frame = frames[pulls++] + if (frame) { + controller.enqueue(frame) + } + }, + cancel(reason) { + inputCancelReason = reason + }, + }, + { highWaterMark: 0 }, + ) + + const [chunks, getStream] = createFrameDecoder(input) + const jsonReader = chunks.getReader() + await jsonReader.read() + const rawStream = getStream(1) + await vi.waitFor(() => expect(pulls).toBe(frames.length + 1)) + + const reason = 'stop' + await jsonReader.cancel(reason) + await expect(rawStream.getReader().read()).rejects.toBe(reason) + expect(inputCancelReason).toBe(reason) + await vi.waitFor(() => expect(input.locked).toBe(false)) + // A stream requested after cancellation fails the same way. + await expect(getStream(2).getReader().read()).rejects.toBe(reason) + }) + + it.each(['A first', 'B first'] as const)( + 'fails only the over-limit raw stream with %s frames', + async (order) => { + const aChunk = encodeChunkFrame(1, new Uint8Array(1024 * 1024)) + const aFrameCount = MAX_UNREAD_RAW_STREAM_BYTES / (1024 * 1024) + 2 + const aFrames = Array.from({ length: aFrameCount }, () => aChunk) + const bFrames = [ + encodeChunkFrame(2, Uint8Array.of(1, 2)), + encodeChunkFrame(2, Uint8Array.of(3, 4)), + encodeEndFrame(2), + ] + const frames = [ + encodeJSONFrame('{"refs":[1,2]}'), + ...(order === 'A first' ? aFrames : bFrames), + ...(order === 'A first' ? bFrames : aFrames), + encodeChunkFrame(1, Uint8Array.of(9)), + encodeEndFrame(1), + encodeJSONFrame('{"after":true}'), + ] + let pulls = 0 + const input = new ReadableStream( + { + pull(controller) { + const frame = frames[pulls++] + if (frame) { + controller.enqueue(frame) + } else { + controller.close() + } + }, + }, + { highWaterMark: 0 }, + ) + + const [chunks, getStream] = createFrameDecoder(input) + const jsonReader = chunks.getReader() + await expect(jsonReader.read()).resolves.toEqual({ + done: false, + value: '{"refs":[1,2]}', + }) + const aReader = getStream(1).getReader() + const bReader = getStream(2).getReader() + + await expect(readBytes(bReader)).resolves.toEqual( + Uint8Array.of(1, 2, 3, 4), + ) + await expect(jsonReader.read()).resolves.toEqual({ + done: false, + value: '{"after":true}', + }) + await expect(aReader.read()).rejects.toThrow( + 'Raw stream 1 has too many unread bytes', + ) + await expect(jsonReader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) + expect(pulls).toBe(frames.length + 1) + }, + ) + + it('copies a small chunk instead of pinning its network buffer', async () => { + const network = new Uint8Array(4096) + const frame = encodeChunkFrame(1, Uint8Array.of(1, 2, 3)) + network.set(frame) + const input = new ReadableStream({ + start(controller) { + controller.enqueue(encodeJSONFrame('{}')) + controller.enqueue(network.subarray(0, frame.byteLength)) + controller.enqueue(encodeEndFrame(1)) + controller.close() + }, + }) + + const [chunks, getStream] = createFrameDecoder(input) + const raw = getStream(1).getReader() + await chunks.getReader().read() + const { value } = await raw.read() + expect(Array.from(value!)).toEqual([1, 2, 3]) + expect(value!.buffer.byteLength).toBe(3) + }) + it('should reject too many raw streams', async () => { - // END frames create streams via ensureController, even with no CHUNKs. + // END frames create streams, even with no CHUNKs. const frames: Array = [] for (let i = 1; i <= 1025; i++) { frames.push(encodeEndFrame(i)) @@ -169,27 +1071,59 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() await expect(reader.read()).rejects.toThrow('Too many raw streams') }) - it('should reject when buffered bytes exceed limit', async () => { - // No valid frame can be parsed from this; we just want to exceed MAX_BUFFERED_BYTES. - const tooLarge = new Uint8Array(32 * 1024 * 1024 + 1) - - const input = new ReadableStream({ - start(controller) { - controller.enqueue(tooLarge) - controller.close() - }, + it('rejects a header-only CHUNK for a 1025th stream without pulling its payload', async () => { + const chunkHeader = encodeChunkFrame(1025, new Uint8Array()) + new DataView(chunkHeader.buffer).setUint32( + 5, + MAX_FRAME_PAYLOAD_SIZE, + false, + ) + let releaseHeader!: () => void + const headerReady = new Promise((resolve) => { + releaseHeader = resolve }) + let pulls = 0 + const input = new ReadableStream( + { + async pull(controller) { + pulls++ + if (pulls > 1) { + throw new Error('Payload was pulled') + } + await headerReady + controller.enqueue(chunkHeader) + }, + }, + { highWaterMark: 0 }, + ) + const [chunks, getStream] = createFrameDecoder(input) + for (let id = 1; id <= 1024; id++) { + getStream(id) + } - const { chunks: jsonChunks } = createFrameDecoder(input) - const reader = jsonChunks.getReader() + releaseHeader() + await expect(chunks.getReader().read()).rejects.toThrow( + 'Too many raw streams', + ) + expect(pulls).toBe(1) + }) - await expect(reader.read()).rejects.toThrow('buffer exceeded') + it('should count cancelled raw streams toward the stream limit', async () => { + const input = new ReadableStream({ pull() {} }) + const [chunks, getStream] = createFrameDecoder(input) + + for (let id = 1; id <= 1024; id++) { + await getStream(id).cancel() + } + + expect(() => getStream(1025)).toThrow('Too many raw streams') + await chunks.cancel() }) it('should decode JSON frames', async () => { @@ -207,14 +1141,16 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() const chunks: Array = [] - while (true) { + for (;;) { const { done, value } = await reader.read() - if (done) break + if (done) { + break + } chunks.push(value) } @@ -240,8 +1176,7 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks, getStream: getOrCreateStream } = - createFrameDecoder(input) + const [jsonChunks, getOrCreateStream] = createFrameDecoder(input) // Pre-create the stream before consuming const stream5 = getOrCreateStream(5) @@ -277,22 +1212,23 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() const chunks: Array = [] - while (true) { + for (;;) { const { done, value } = await reader.read() - if (done) break + if (done) { + break + } chunks.push(value) } expect(chunks).toEqual(['{"test":"data"}']) }) - it('should use fast path when header fits in first chunk', async () => { - // Single chunk contains entire frame - exercises fast path + it('should decode a frame from one input chunk', async () => { const frame = encodeJSONFrame('{"fast":"path"}') const input = new ReadableStream({ @@ -302,15 +1238,14 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() const { value } = await reader.read() expect(value).toBe('{"fast":"path"}') }) - it('should use slow path when header spans multiple chunks', async () => { - // Split header itself across multiple chunks - exercises slow path + it('should decode a header split across input chunks', async () => { const frame = encodeJSONFrame('{"slow":"path"}') // Split at byte 3, then byte 6, then rest - header is 9 bytes @@ -327,7 +1262,7 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() const { value } = await reader.read() @@ -354,7 +1289,7 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() const { value } = await reader.read() @@ -388,8 +1323,7 @@ describe('frame-decoder', () => { }, }) - const { getStream: getOrCreateStream, chunks: jsonChunks } = - createFrameDecoder(input) + const [jsonChunks, getOrCreateStream] = createFrameDecoder(input) // Pre-create streams before consuming const stream1 = getOrCreateStream(1) @@ -403,11 +1337,19 @@ describe('frame-decoder', () => { const reader1 = stream1.getReader() const { value: val1 } = await reader1.read() expect(val1).toEqual(new Uint8Array([10])) + await expect(reader1.read()).resolves.toEqual({ + done: true, + value: undefined, + }) // Read stream 2 const reader2 = stream2.getReader() const { value: val2 } = await reader2.read() expect(val2).toEqual(new Uint8Array([20])) + await expect(reader2.read()).resolves.toEqual({ + done: true, + value: undefined, + }) }) it('should handle error frames for existing streams', async () => { @@ -430,8 +1372,7 @@ describe('frame-decoder', () => { }, }) - const { getStream: getOrCreateStream, chunks: jsonChunks } = - createFrameDecoder(input) + const [jsonChunks, getOrCreateStream] = createFrameDecoder(input) // Pre-create stream 3 const stream3 = getOrCreateStream(3) @@ -441,30 +1382,19 @@ describe('frame-decoder', () => { await jsonReader.read() const reader = stream3.getReader() - - // Stream was created but then errored - // Reading should throw the error - let errorCaught = false - let chunkReceived = false - try { - while (true) { - const { value, done } = await reader.read() - if (done) break - if (value) chunkReceived = true - } - } catch (error) { - errorCaught = true - expect((error as Error).message).toBe('Stream failed') - } - - // Either we got the chunk before error, or we got error immediately - // The important thing is that the error was thrown - expect(errorCaught).toBe(true) + await expect(reader.read()).resolves.toEqual({ + done: false, + value: new Uint8Array([1]), + }) + await expect(reader.read()).rejects.toThrow('Stream failed') + expect(getOrCreateStream(3)).toBe(stream3) + await expect(jsonReader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) }) it('should preserve stream after END frame for late consumers', async () => { - // This tests a race condition fix: stream should still be available - // even if END frame is processed before getOrCreateStream is called const jsonFrame = encodeJSONFrame('{"streamRef":7}') const chunkFrame = encodeChunkFrame(7, new Uint8Array([42, 43, 44])) const endFrame = encodeEndFrame(7) @@ -483,21 +1413,15 @@ describe('frame-decoder', () => { }, }) - const { getStream: getOrCreateStream, chunks: jsonChunks } = - createFrameDecoder(input) + const [jsonChunks, getOrCreateStream] = createFrameDecoder(input) - // First, fully consume JSON stream (this processes all frames) + // The reference is admitted before its raw data, so the deserializer can + // obtain the stream without requiring the decoder to buffer it eagerly. const jsonReader = jsonChunks.getReader() - const chunks: Array = [] - while (true) { - const { done, value } = await jsonReader.read() - if (done) break - chunks.push(value) - } - expect(chunks).toEqual(['{"streamRef":7}']) - - // Now call getOrCreateStream AFTER all frames processed (including END) - // This simulates deserializer calling getOrCreateStream late + await expect(jsonReader.read()).resolves.toEqual({ + done: false, + value: '{"streamRef":7}', + }) const stream7 = getOrCreateStream(7) // The stream should still have the data that was enqueued @@ -510,25 +1434,26 @@ describe('frame-decoder', () => { // Next read should be done (stream was closed by END frame) const { done: finalDone } = await rawReader.read() expect(finalDone).toBe(true) + await expect(jsonReader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) }) - it('should handle CHUNK creating stream before getOrCreateStream called', async () => { - // CHUNK frame arrives first and creates stream internally, - // then getOrCreateStream returns the same stream with data + it('should preserve chunks when the stream is obtained after its JSON reference', async () => { + const jsonFrame = encodeJSONFrame('{"ref":9}') const chunkFrame1 = encodeChunkFrame(9, new Uint8Array([1, 2])) const chunkFrame2 = encodeChunkFrame(9, new Uint8Array([3, 4])) const endFrame = encodeEndFrame(9) - const jsonFrame = encodeJSONFrame('{"ref":9}') - // Order: CHUNK, CHUNK, END, then JSON (unusual but valid) const combined = new Uint8Array( - chunkFrame1.length + + jsonFrame.length + + chunkFrame1.length + chunkFrame2.length + - endFrame.length + - jsonFrame.length, + endFrame.length, ) let offset = 0 - for (const frame of [chunkFrame1, chunkFrame2, endFrame, jsonFrame]) { + for (const frame of [jsonFrame, chunkFrame1, chunkFrame2, endFrame]) { combined.set(frame, offset) offset += frame.length } @@ -540,17 +1465,14 @@ describe('frame-decoder', () => { }, }) - const { getStream: getOrCreateStream, chunks: jsonChunks } = - createFrameDecoder(input) + const [jsonChunks, getOrCreateStream] = createFrameDecoder(input) - // Drain JSON (processes all frames) const jsonReader = jsonChunks.getReader() - while (true) { - const { done } = await jsonReader.read() - if (done) break - } + await expect(jsonReader.read()).resolves.toEqual({ + done: false, + value: '{"ref":9}', + }) - // Now get the stream - should have all the data const stream9 = getOrCreateStream(9) const reader = stream9.getReader() @@ -562,12 +1484,15 @@ describe('frame-decoder', () => { const { done: finalDone } = await reader.read() expect(finalDone).toBe(true) + await expect(jsonReader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) }) it('should reassemble a chunk payload that spans many small reads', async () => { - // A large binary payload delivered in tiny network reads forces the - // multi-chunk (copy) path; the contiguous fast path must not change the - // reassembled bytes. + // A large binary payload delivered in tiny network reads exercises the + // cursor's exact-length assembly path. const payload = new Uint8Array(300) for (let i = 0; i < payload.length; i++) payload[i] = i % 256 @@ -585,7 +1510,7 @@ describe('frame-decoder', () => { const input = new ReadableStream({ start(controller) { // 7-byte reads: smaller than the 9-byte header and the payload, so - // both header and payload span multiple buffered chunks. + // both header and payload span multiple input chunks. for (let i = 0; i < combined.length; i += 7) { controller.enqueue(combined.subarray(i, i + 7)) } @@ -593,8 +1518,7 @@ describe('frame-decoder', () => { }, }) - const { getStream: getOrCreateStream, chunks: jsonChunks } = - createFrameDecoder(input) + const [jsonChunks, getOrCreateStream] = createFrameDecoder(input) const stream11 = getOrCreateStream(11) const jsonReader = jsonChunks.getReader() @@ -603,18 +1527,19 @@ describe('frame-decoder', () => { const rawReader = stream11.getReader() const received: Array = [] - while (true) { + for (;;) { const { done, value } = await rawReader.read() - if (done) break - if (value) received.push(...value) + if (done) { + break + } + received.push(...value) } expect(received).toEqual(Array.from(payload)) }) it('reassembles a large chunk payload delivered one byte at a time', async () => { - // Forces the header slow path AND many whole-chunk consumptions within a - // single extract, exercising the head-pointer advance + fully-drained - // reset. With the previous bufferList.shift() this path was O(n^2). + // One-byte reads exercise repeated cursor advancement without repeated + // concatenation or rescanning. const payload = new Uint8Array(200) for (let i = 0; i < payload.length; i++) { payload[i] = (i * 7) % 256 @@ -640,8 +1565,7 @@ describe('frame-decoder', () => { }, }) - const { getStream: getOrCreateStream, chunks: jsonChunks } = - createFrameDecoder(input) + const [jsonChunks, getOrCreateStream] = createFrameDecoder(input) const stream21 = getOrCreateStream(21) const jsonReader = jsonChunks.getReader() @@ -650,22 +1574,18 @@ describe('frame-decoder', () => { const rawReader = stream21.getReader() const received: Array = [] - while (true) { + for (;;) { const { done, value } = await rawReader.read() if (done) { break } - if (value) { - received.push(...value) - } + received.push(...value) } expect(received).toEqual(Array.from(payload)) }) it('decodes many frames when reads never align with frame boundaries', async () => { - // 100-byte frames fed in 7-byte reads never align until the very end, so - // consumed chunks accumulate and the head pointer climbs past the - // compaction threshold repeatedly, exercising the splice() prefix drop. + // These 100-byte frames never align with the 7-byte input reads. const FRAME_COUNT = 7 const expected: Array = [] const frames: Array = [] @@ -692,10 +1612,10 @@ describe('frame-decoder', () => { }, }) - const { chunks: jsonChunks } = createFrameDecoder(input) + const [jsonChunks] = createFrameDecoder(input) const reader = jsonChunks.getReader() const received: Array = [] - while (true) { + for (;;) { const { done, value } = await reader.read() if (done) { break diff --git a/packages/start-plugin-core/src/rsbuild/virtual-modules.ts b/packages/start-plugin-core/src/rsbuild/virtual-modules.ts index 591625ce1c..36a3427830 100644 --- a/packages/start-plugin-core/src/rsbuild/virtual-modules.ts +++ b/packages/start-plugin-core/src/rsbuild/virtual-modules.ts @@ -297,6 +297,7 @@ export function registerVirtualModules( serverFnsById: opts.serverFnsById, includeClientReferencedCheck: !isProviderEnvironment(environmentName), useStaticImports: Boolean(opts.rscEnabled && isDev), + memoizeModules: !isDev, }) } diff --git a/packages/start-plugin-core/src/start-compiler/server-fn-resolver-module.ts b/packages/start-plugin-core/src/start-compiler/server-fn-resolver-module.ts index 8f872a48c1..d03bec3341 100644 --- a/packages/start-plugin-core/src/start-compiler/server-fn-resolver-module.ts +++ b/packages/start-plugin-core/src/start-compiler/server-fn-resolver-module.ts @@ -1,59 +1,69 @@ import type { ServerFn } from './types' -interface ResolverManifestEntry { - id: string - functionName: string - extractedFilename: string - isClientReferenced: boolean -} - interface GenerateServerFnResolverModuleOptions { serverFnsById: Record includeClientReferencedCheck: boolean useStaticImports?: boolean + /** + * Keep each imported module on its manifest entry after the first call. + * Only safe when modules cannot be hot-replaced (production builds). + */ + memoizeModules?: boolean } -function getResolverManifestEntries( - serverFnsById: Record, -): Array { - return ( - Object.entries(serverFnsById) - // Sort entries by ID so that the generated manifest has a stable, deterministic order. - // Non-deterministic ordering causes the compiled hash of the same source file to change - // between builds, breaking content-addressed caching and reproducible deployments. - .sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)) - .map(([id, fn]) => ({ - id, - functionName: fn.functionName, - extractedFilename: fn.extractedFilename, - isClientReferenced: fn.isClientReferenced ?? true, - })) - ) -} - -function getClientReferencedCheck( - includeClientReferencedCheck: boolean, +export function generateServerFnResolverModule( + opts: GenerateServerFnResolverModuleOptions, ): string { - if (!includeClientReferencedCheck) { - return '' - } + const staticImports: Array = [] + const manifest = Object.entries(opts.serverFnsById) + // Keep generated source stable for content-addressed caches. + .sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)) + .map(([id, fn], index) => { + const moduleRef = `serverFnModule${index}` + const filename = JSON.stringify(fn.extractedFilename) + if (opts.useStaticImports) { + staticImports.push(`import * as ${moduleRef} from ${filename}`) + } + const moduleAccess = opts.useStaticImports + ? `module: ${moduleRef}` + : `importer: () => import(${filename})` + const clientReferenced = opts.includeClientReferencedCheck + ? `,\n isClientReferenced: ${fn.isClientReferenced ?? true}` + : '' - return ` + return `'${id}': { + functionName: '${fn.functionName}', + ${moduleAccess}${clientReferenced} + }` + }) + .join(',\n ') + + const clientReferencedCheck = opts.includeClientReferencedCheck + ? ` if (access.origin === 'client' && !serverFnInfo.isClientReferenced) { throw new Error('Server function not accessible from client: ' + id) } ` + : '' + // Every import() goes through the ESM loader; a resolved production module + // can be kept on the manifest entry instead. + const resolveModule = opts.memoizeModules + ? 'serverFnInfo.module ??= await serverFnInfo.importer()' + : 'serverFnInfo.module ?? (await serverFnInfo.importer())' + + return ` +${staticImports.join('\n')} +const manifest = { + ${manifest} } -function getResolverBody(): string { - return ` export async function getServerFnById(id, access) { const serverFnInfo = manifest[id] if (!serverFnInfo) { throw new Error('Server function info not found for ' + id) } -__CLIENT_REFERENCED_CHECK__ - const fnModule = serverFnInfo.module ?? (await serverFnInfo.importer()) +${clientReferencedCheck} + const fnModule = ${resolveModule} if (!fnModule) { throw new Error('Server function module not resolved for ' + id) } @@ -63,74 +73,6 @@ __CLIENT_REFERENCED_CHECK__ } return action } -` -} -function getResolverManifestModuleAccess(opts: { - useStaticImports?: boolean - extractedFilename: string - moduleRef: string -}): string { - if (opts.useStaticImports) { - return `module: ${opts.moduleRef}` - } - - return `importer: () => import(${JSON.stringify(opts.extractedFilename)})` -} - -function getResolverManifestEntry(opts: { - entry: ResolverManifestEntry - moduleAccess: string - includeClientReferencedCheck: boolean -}): string { - const clientReferenced = opts.includeClientReferencedCheck - ? `,\n isClientReferenced: ${opts.entry.isClientReferenced}` - : '' - - return `'${opts.entry.id}': { - functionName: '${opts.entry.functionName}', - ${opts.moduleAccess}${clientReferenced} - }` -} - -export function generateServerFnResolverModule( - opts: GenerateServerFnResolverModuleOptions, -): string { - const manifestEntries = getResolverManifestEntries(opts.serverFnsById) - const staticImports: Array = [] - - const manifest = manifestEntries - .map((entry, index) => { - const moduleRef = `serverFnModule${index}` - - if (opts.useStaticImports) { - staticImports.push( - `import * as ${moduleRef} from ${JSON.stringify(entry.extractedFilename)}`, - ) - } - - return getResolverManifestEntry({ - entry, - moduleAccess: getResolverManifestModuleAccess({ - useStaticImports: opts.useStaticImports, - extractedFilename: entry.extractedFilename, - moduleRef, - }), - includeClientReferencedCheck: opts.includeClientReferencedCheck, - }) - }) - .join(',\n ') - - const body = getResolverBody().replace( - '__CLIENT_REFERENCED_CHECK__', - getClientReferencedCheck(opts.includeClientReferencedCheck), - ) - - return ` -${staticImports.join('\n')} -const manifest = { - ${manifest} -} -${body} ` } diff --git a/packages/start-plugin-core/src/vite/start-compiler-plugin/plugin.ts b/packages/start-plugin-core/src/vite/start-compiler-plugin/plugin.ts index 6814740074..1dabf64db8 100644 --- a/packages/start-plugin-core/src/vite/start-compiler-plugin/plugin.ts +++ b/packages/start-plugin-core/src/vite/start-compiler-plugin/plugin.ts @@ -646,6 +646,8 @@ export function startCompilerPlugin( return generateServerFnResolverModule({ serverFnsById, includeClientReferencedCheck: !ssrIsProvider, + // Only production builds reach this branch. + memoizeModules: true, }) }, }), diff --git a/packages/start-plugin-core/tests/server-fn-resolver-module.test.ts b/packages/start-plugin-core/tests/server-fn-resolver-module.test.ts new file mode 100644 index 0000000000..89a24b0844 --- /dev/null +++ b/packages/start-plugin-core/tests/server-fn-resolver-module.test.ts @@ -0,0 +1,71 @@ +import { describe, expect, test } from 'vitest' +import { generateServerFnResolverModule } from '../src/start-compiler/server-fn-resolver-module' + +const serverFnsById = { + fn_a: { + functionName: 'fnA', + functionId: 'fn_a', + extractedFilename: '/app/fn-a.ts', + filename: '/app/fn-a.ts', + isClientReferenced: true, + }, +} + +describe('generateServerFnResolverModule', () => { + test.each([false, true])( + 'resolves public exports and checks client access with static imports: %s', + async (useStaticImports) => { + const entry = { + ...serverFnsById.fn_a, + extractedFilename: `data:text/javascript,${encodeURIComponent( + 'export const fnA = () => "resolved"', + )}`, + } + const source = generateServerFnResolverModule({ + serverFnsById: { + fn_a: entry, + fn_private: { ...entry, isClientReferenced: false }, + }, + includeClientReferencedCheck: true, + memoizeModules: true, + useStaticImports, + }) + const { getServerFnById } = await import( + /* @vite-ignore */ `data:text/javascript,${encodeURIComponent(source)}` + ) + const action = await getServerFnById('fn_a', { origin: 'client' }) + expect(action()).toBe('resolved') + await expect( + getServerFnById('fn_private', { origin: 'client' }), + ).rejects.toThrow('Server function not accessible from client') + await expect( + getServerFnById('fn_private', { origin: 'server' }), + ).resolves.toBe(action) + await expect( + getServerFnById('missing', { origin: 'server' }), + ).rejects.toThrow('Server function info not found') + }, + ) + + test('imports on every call by default', () => { + const source = generateServerFnResolverModule({ + serverFnsById, + includeClientReferencedCheck: false, + }) + expect(source).toContain( + 'serverFnInfo.module ?? (await serverFnInfo.importer())', + ) + expect(source).not.toContain('??=') + }) + + test('keeps the imported module when memoizeModules is set', () => { + const source = generateServerFnResolverModule({ + serverFnsById, + includeClientReferencedCheck: false, + memoizeModules: true, + }) + expect(source).toContain( + 'serverFnInfo.module ??= await serverFnInfo.importer()', + ) + }) +}) diff --git a/packages/start-server-core/INTERNALS.md b/packages/start-server-core/INTERNALS.md new file mode 100644 index 0000000000..b759b33e5a --- /dev/null +++ b/packages/start-server-core/INTERNALS.md @@ -0,0 +1,89 @@ +# Start server response ownership + +This document describes how Start tracks response bodies while server middleware runs. + +## Two ownership layers + +Response body ownership tells Start which body belongs to the current middleware result. + +Router SSR ownership tells Router when it can release request data, serialization state, readers, timers, and renderer work. + +An internal `SsrResponse` value carries Router SSR cleanup data beside a `Response`. Start stores that data while middleware sees the ordinary `Response`. + +Each request must use a separate router instance. Sharing one router between requests is unsupported. + +## Middleware transfers + +Start keeps one ownership record for the current response body. A response without a body does not need an ownership record. + +Ownership transfers automatically in these cases: + +- Middleware returns the same `Response` object. +- Middleware returns another `Response` with the same body object. + +Web Streams do not expose the source of a different body. TypeScript also cannot describe this runtime relationship. + +Middleware must mark a response that has a different derived body: + +```ts +return transferResponseBodyOwnership( + response, + new Response(response.body!.pipeThrough(transform), response), +) +``` + +The first argument must be the current response. The second argument must contain a body derived directly from that response. + +The marker records one direct relationship. It does not connect the streams or manage their lifecycles. + +The derived body must propagate reads, completion, errors, and cancellation to the source body. A normal `pipeThrough()` chain has this behavior. + +Start stores markers in a `WeakMap`. An entry lives exactly as long as its derived response; a stale marker cannot cause a false transfer because ownership never returns to an older source. + +Normal responses do not create marker entries. The map does not keep an unreferenced derived response alive. + +## Replacement and disposal + +An unrelated response replaces the current ownership record. Start disposes the old record before it stores the replacement. + +For a Router SSR response, disposal releases Router SSR state and cancels the original SSR body. + +If middleware returned a different derived body, disposal also cancels that final body. This cancellation propagates through a correct derived stream. + +For a plain response, disposal cancels the current body. + +Body cancellation is best effort. Start does not await it, and a cancellation failure does not block Router cleanup. + +Cleanup paths can request disposal more than once. Router SSR cleanup and native stream cancellation have idempotent effects. + +Every internal `SsrResponse` disposer must also have idempotent effects. + +A result that settles after request cancellation is no longer usable. Start disposes that late result when it arrives. + +## Locks, clones, and branches + +A locked body only proves that code holds a reader or pipe. A lock does not prove ownership or stream ancestry. + +Start cannot cancel a locked body through `body.cancel()`. The code that acquired the reader owns that reader and must cancel or release it. + +`Response.clone()` creates two body branches. It can also change the body object exposed by the original `Response`. + +Start reads the current response body during disposal. It keeps only the original SSR body for Router cleanup. + +Middleware owns every clone or `tee()` branch that it does not return. Middleware must consume or cancel each unused branch. + +## Final handoff + +Redirect conversion and `HEAD` handling dispose any body that they replace or remove. + +Before returning a Router SSR stream, Start checks request cancellation. Start disposes the stream immediately if the request is already aborted. + +Start binds later request cancellation to the disposer. While Router SSR state is live, SSR cleanup removes that listener. Otherwise the one-time listener ends with the request signal. + +The Router stream transform releases Router SSR state after natural completion, stream errors, or consumer cancellation. + +After handoff, the HTTP runtime owns consumption or cancellation of the returned body. + +If Start does not hand off Router SSR ownership, the request cleanup block releases any remaining Router SSR state. + +An abort can race with final handoff. Cleanup is idempotent. Either path can safely request cleanup. diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index 414a2d2711..84af2d4558 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -11,14 +11,14 @@ import { _getRenderedMatches, executeRewriteInput, isDangerousProtocol, + isPromise, isRedirect, } from '@tanstack/router-core' import { attachRouterServerSsrUtils, bindSsrResponseToRequest, - disposeSsrResponseDetached, + disposeSsrResponse, getNormalizedURL, - getOrigin, isSsrResponse, normalizeSsrResponse, replaceSsrResponse, @@ -45,7 +45,6 @@ import type { AnyRequestMiddleware, AnyStartInstanceOptions, RouteMethod, - RouteMethodHandlerFn, RouterEntry, StartEntry, } from '@tanstack/start-client-core' @@ -195,127 +194,172 @@ function throwIfMayNotDefer(): never { throw new Error(ERR_NO_DEFER) } -/** - * Check if a value is a special response (Response or Redirect) - */ -function isSpecialResponse(value: unknown): value is Response { - return value instanceof Response || isRedirect(value) +function getResponseFromResult(result: TODO): TODO { + return isSsrResponse(result) || result instanceof Response + ? result + : result?.response } -/** - * Normalize middleware result to context shape - */ -function handleCtxResult(result: TODO) { - if (isSsrResponse(result) || isSpecialResponse(result)) { - return { response: result } - } - return result +type StreamSsrResponse = Extract + +type ResponseBody = NonNullable +type ResponseWithBody = Response & { readonly body: ResponseBody } + +/** The context object threaded through one middleware pipeline. */ +interface PipelineContext { + request: Request + pathname: string + handlerType: 'serverFn' | 'router' + context: Record + params?: Record + response?: Response + // Middleware may add arbitrary own properties through `next(ctx)`. + [key: string]: unknown } -function disposeLateResponse(result: TODO, signal: AbortSignal): void { - const response = handleCtxResult(result)?.response - if (isSsrResponse(response) || isSpecialResponse(response)) { - disposeSsrResponseDetached(response, signal.reason) +interface MiddlewareResponseOwnership { + response: ResponseWithBody + sourceBody: ResponseBody + streamResponse?: StreamSsrResponse +} + +// Entries are released with their response; the map is never cleared by hand. +const responseBodySources = new WeakMap() + +function disposeResponseResult(result: TODO, reason: unknown): void { + const response = getResponseFromResult(result) + if (isSsrResponse(response) || response instanceof Response) { + disposeSsrResponse(response, reason) } } -function isSignalAborted(signal: AbortSignal): boolean { - return signal.aborted +/** + * Marks `response` as directly derived from the current `source`. + * Middleware must consume or cancel any other `clone()` or `tee()` branches. + */ +export function transferResponseBodyOwnership( + source: Response, + response: TResponse, +): TResponse { + if (!source.body || !response.body) { + throw new Error('Response body ownership requires two response bodies') + } + responseBodySources.set(response, source) + return response +} + +function hasResponseBody(value: unknown): value is ResponseWithBody { + return value instanceof Response && value.body !== null +} + +function inheritsResponseOwnership( + ownership: MiddlewareResponseOwnership, + candidate: unknown, +): candidate is ResponseWithBody { + return ( + hasResponseBody(candidate) && + (candidate.body === ownership.response.body || + responseBodySources.get(candidate) === ownership.response) + ) +} + +function disposeResponseOwnership( + ownership: MiddlewareResponseOwnership, + reason: unknown, +): void { + const { response, sourceBody, streamResponse } = ownership + streamResponse?.dispose(reason) + if (!streamResponse || response.body !== sourceBody) { + void response.body.cancel(reason).catch(() => {}) + } +} + +function getOwnedResponse( + ownership: MiddlewareResponseOwnership, +): HandlerCallbackResult { + const { response, sourceBody, streamResponse } = ownership + if (!streamResponse) { + return response + } + if (streamResponse.response === response && response.body === sourceBody) { + return streamResponse + } + if (response.body === sourceBody) { + return { ...streamResponse, response } + } + return { + ...streamResponse, + response, + dispose(reason): undefined { + disposeResponseOwnership(ownership, reason) + }, + } +} + +function createLateResponseDisposer(signal: AbortSignal) { + return (result: TODO) => disposeResponseResult(result, signal.reason) } /** - * Execute a middleware chain + * Compose middleware around a terminal response handler. With no middleware + * the terminal runs directly. */ async function executeMiddleware( middlewares: Array, - ctx: TODO, + terminal: TODO, + ctx: PipelineContext, signal: AbortSignal, -): Promise<{ ctx: TODO; response: HandlerCallbackResult }> { + terminalNext?: TODO, +): Promise { let index = -1 - let streamResponse: - | Extract - | undefined - let retiredStreamIdentities: WeakSet | undefined - - const isResponseAlias = (candidate: unknown, response: Response) => - candidate === response || - (candidate instanceof Response && - response.body !== null && - candidate.body === response.body) + let responseOwnership: MiddlewareResponseOwnership | undefined + // Once the pipeline returned, the HTTP runtime owns the response. A result + // that settles later (for example the loser of a `Promise.race`) must not + // replace or cancel it. + let settled = false + const disposeAbandonedResult = createLateResponseDisposer(signal) const setResponse = (response: TODO) => { - if (isSsrResponse(response)) { - if (response.serverSsrCleanup === 'stream') { - streamResponse = response + const ssrResponse = isSsrResponse(response) ? response : undefined + const streamResponse = + ssrResponse?.serverSsrCleanup === 'stream' ? ssrResponse : undefined + const exposed: Response | undefined = ssrResponse + ? ssrResponse.response + : response + const current = responseOwnership + + if (settled) { + if (exposed !== ctx.response) { + disposeResponseResult(response, 'late middleware response') } - ctx.response = response.response return } - - ctx.response = response + if (current && current.response === exposed) { + current.streamResponse ??= streamResponse + } else if (current && inheritsResponseOwnership(current, exposed)) { + current.response = exposed + current.streamResponse ??= streamResponse + } else { + if (current) { + disposeResponseOwnership(current, 'middleware response replaced') + } + if (hasResponseBody(exposed)) { + responseOwnership = { + response: exposed, + sourceBody: exposed.body, + streamResponse, + } + } else { + responseOwnership = undefined + } + } + ctx.response = exposed } - const disposeStreamResponse = async (reason: unknown) => { - const response = streamResponse - if (!response) { - return + const reconcileCtxResponse = () => { + if (ctx.response !== responseOwnership?.response) { + setResponse(ctx.response) } - - streamResponse = undefined - retiredStreamIdentities ??= new WeakSet() - retiredStreamIdentities.add(response.response) - if (response.response.body) { - retiredStreamIdentities.add(response.response.body) - } - const currentResponse = ctx.response - if (isResponseAlias(currentResponse, response.response)) { - ctx.response = undefined - } - await response.dispose(reason) - } - - const disposeAbandonedResult = (result: TODO) => { - const exposed = handleCtxResult(result)?.response - const response = isSsrResponse(exposed) ? exposed.response : exposed - if (streamResponse && isResponseAlias(response, streamResponse.response)) { - void disposeStreamResponse(signal.reason).catch(console.error) - return - } - if ( - response instanceof Response && - retiredStreamIdentities && - (retiredStreamIdentities.has(response) || - (response.body !== null && retiredStreamIdentities.has(response.body))) - ) { - return - } - - disposeLateResponse(result, signal) - } - - const getFinalResponse = async (): Promise => { - const response = ctx.response - if (!response) { - throwRouteHandlerError() - } - - if (!streamResponse) { - return response - } - - if (response === streamResponse.response) { - return streamResponse - } - - if ( - streamResponse.response.body !== null && - response.body === streamResponse.response.body - ) { - return { ...streamResponse, response } - } - - await disposeStreamResponse('middleware response replaced') - return response } let nextPromise: Promise | undefined @@ -327,9 +371,7 @@ async function executeMiddleware( } async function runNext(nextCtx?: TODO): Promise { - if (signal.aborted) { - throw signal.reason - } + signal.throwIfAborted() // Merge context if provided using safeObjectMerge for prototype pollution prevention if (nextCtx) { @@ -347,41 +389,74 @@ async function executeMiddleware( } index++ - const middleware = middlewares[index] - if (!middleware) return ctx + const isTerminal = index === middlewares.length + const middleware = + index < middlewares.length + ? middlewares[index] + : isTerminal + ? terminal + : undefined + const middlewareNext = isTerminal && terminalNext ? terminalNext : next + if (!middleware) { + return ctx + } let result: TODO try { - const pending = middleware({ ...ctx, next }) + const pending = middleware({ ...ctx, next: middlewareNext }) // A directly returned next() promise already propagates request aborts. - if (pending === nextPromise) { + if (nextPromise && pending === nextPromise) { nextPromise = undefined - result = await pending - if (isSignalAborted(signal)) { - disposeAbandonedResult(result) + await pending + if (signal.aborted) { throw signal.reason } + return ctx + } else if (!isPromise(pending)) { + result = pending + signal.throwIfAborted() } else { - result = await waitForRequest(pending, signal, disposeAbandonedResult) + result = await waitForRequest( + pending, + signal, + disposeAbandonedResult, + disposeAbandonedResult, + ) } } catch (err) { - if (isSignalAborted(signal)) { + reconcileCtxResponse() + if (signal.aborted) { + if (result !== undefined) { + disposeAbandonedResult(result) + } + if (err !== signal.reason) { + disposeAbandonedResult(err) + } throw signal.reason } - if (isSpecialResponse(err)) { + if (err instanceof Response) { setResponse(err) return ctx } throw err } - const normalized = handleCtxResult(result) - if (normalized) { - if (normalized.response !== undefined) { - setResponse(normalized.response) + if (isTerminal && terminalNext && !result) { + throwRouteHandlerError() + } + + reconcileCtxResponse() + if (result && result !== ctx) { + const response = getResponseFromResult(result) + if (response !== undefined && response !== ctx.response) { + setResponse(response) } - if (normalized.context) { - ctx.context = safeObjectMerge(ctx.context, normalized.context) + if ( + response !== result && + result.context && + result.context !== ctx.context + ) { + ctx.context = safeObjectMerge(ctx.context, result.context) } } @@ -390,43 +465,25 @@ async function executeMiddleware( try { await runNext() - const response = await waitForRequest( - getFinalResponse(), - signal, - disposeAbandonedResult, - ) - if (signal.aborted) { - disposeAbandonedResult(response) - throw signal.reason - } - return { ctx, response } - } catch (err) { - const disposal = disposeStreamResponse(signal.aborted ? signal.reason : err) - if (signal.aborted) { - void disposal.catch(console.error) - } else { - await disposal - } - throw err - } -} - -/** - * Wrap a route handler as middleware - */ -function handlerToMiddleware( - handler: RouteMethodHandlerFn, - mayDefer: boolean = false, -): TODO { - if (mayDefer) { - return handler - } - return async (ctx: TODO) => { - const response = await handler({ ...ctx, next: throwIfMayNotDefer }) + const response = ctx.response if (!response) { throwRouteHandlerError() } - return response + reconcileCtxResponse() + if (signal.aborted) { + throw signal.reason + } + settled = true + return responseOwnership ? getOwnedResponse(responseOwnership) : response + } catch (err) { + settled = true + if (responseOwnership) { + disposeResponseOwnership( + responseOwnership, + signal.aborted ? signal.reason : err, + ) + } + throw err } } @@ -486,29 +543,38 @@ export function createStartHandler( request, requestOpts, ) => { - let router: AnyRouter | null = null as AnyRouter | null - let responseOwnsCleanup = false as boolean + const signal = request.signal + let router: AnyRouter | undefined + let routerPromise: Promise | undefined + let responseOwnsCleanup = false try { - request.signal.throwIfAborted() + signal.throwIfAborted() // normalizing and sanitizing the pathname here for server, so we always deal with the same format during SSR. // during normalization paths like '//posts' are flattened to '/posts'. // in these cases we would prefer to redirect to the new path const { url, handledProtocolRelativeURL } = getNormalizedURL(request.url) const href = url.pathname + url.search + url.hash - const origin = getOrigin(request) + const origin = url.origin if (handledProtocolRelativeURL) { return Response.redirect(url, 308) } - const entries = await waitForRequest(getEntries(), request.signal) - const hasStartInstance = !!entries.startEntry.startInstance - const startOptions: AnyStartInstanceOptions = - (await waitForRequest( - entries.startEntry.startInstance?.getOptions(), - request.signal, - )) || ({} as AnyStartInstanceOptions) + const entries = await waitForRequest(getEntries(), signal) + const isServerFnRequest = + !!SERVER_FN_BASE && url.pathname.startsWith(SERVER_FN_BASE) + const startInstance = entries.startEntry.startInstance + let startOptions: AnyStartInstanceOptions + if (startInstance) { + const pendingStartOptions = startInstance.getOptions() + startOptions = isPromise(pendingStartOptions) + ? await waitForRequest(pendingStartOptions, signal) + : pendingStartOptions + signal.throwIfAborted() + } else { + startOptions = {} as AnyStartInstanceOptions + } const { hasPluginAdapters, pluginSerializationAdapters } = entries.pluginAdapters @@ -521,9 +587,11 @@ export function createStartHandler( const requestStartOptions = { ...startOptions, - requestMiddleware: hasStartInstance + requestMiddleware: startInstance ? startOptions.requestMiddleware - : [defaultCsrfMiddleware], + : isServerFnRequest + ? [defaultCsrfMiddleware] + : undefined, serializationAdapters, } @@ -538,41 +606,57 @@ export function createStartHandler( ) // Memoized router getter - const getRouter = async (): Promise => { - if (router) return router + const getRouter = (): Promise => { + routerPromise ??= (async () => { + signal.throwIfAborted() + const requestRouter = await waitForRequest( + entries.routerEntry.getRouter(), + signal, + ) - router = await waitForRequest( - entries.routerEntry.getRouter(), - request.signal, - ) + let isShell = IS_SHELL_ENV + if (IS_PRERENDERING && !isShell) { + isShell = request.headers.get(HEADERS.TSS_SHELL) === 'true' + } - let isShell = IS_SHELL_ENV - if (IS_PRERENDERING && !isShell) { - isShell = request.headers.get(HEADERS.TSS_SHELL) === 'true' - } + const history = createServerHistory(href) - const history = createServerHistory(href) + requestRouter.update({ + history, + isShell, + isPrerendering: IS_PRERENDERING, + origin: requestRouter.options.origin ?? origin, + // Start-owned options that RouterConstructorOptions omits. + ...{ + defaultSsr: requestStartOptions.defaultSsr, + serializationAdapters: [ + ...requestStartOptions.serializationAdapters, + ...(requestRouter.options.serializationAdapters || []), + ], + }, + basepath: ROUTER_BASEPATH, + }) - router.update({ - history, - isShell, - isPrerendering: IS_PRERENDERING, - origin: router.options.origin ?? origin, - ...{ - defaultSsr: requestStartOptions.defaultSsr, - serializationAdapters: [ - ...requestStartOptions.serializationAdapters, - ...(router.options.serializationAdapters || []), - ], - }, - basepath: ROUTER_BASEPATH, - }) + router = requestRouter + return requestRouter + })() - return router + return routerPromise } - // Check for server function requests first (early exit) - if (SERVER_FN_BASE && url.pathname.startsWith(SERVER_FN_BASE)) { + const handlerType = isServerFnRequest + ? ('serverFn' as const) + : ('router' as const) + const startContext = { + getRouter, + startOptions: requestStartOptions, + request, + executedRequestMiddlewares, + handlerType, + } + let terminal: (ctx: PipelineContext) => unknown + + if (isServerFnRequest) { if ( process.env.NODE_ENV !== 'production' && process.env.TSS_DISABLE_CSRF_MIDDLEWARE_WARNING !== 'true' && @@ -589,16 +673,9 @@ export function createStartHandler( throw new Error('Invalid server action param for serverFnId') } - const serverFnHandler = async ({ context }: TODO) => { - return runWithStartContext( - { - getRouter, - startOptions: requestStartOptions, - contextAfterGlobalMiddlewares: context, - request, - executedRequestMiddlewares, - handlerType: 'serverFn', - }, + terminal = ({ context }) => + runWithStartContext( + { ...startContext, contextAfterGlobalMiddlewares: context }, () => handleServerAction({ request, @@ -606,177 +683,139 @@ export function createStartHandler( serverFnId, }), ) - } + } else { + const executeRouter = async ( + serverContext: TODO, + matchedRoutes?: ReadonlyArray, + ): Promise => { + if ( + !/(^|,)\s*(\*\/\*|text\/html)/.test( + request.headers.get('Accept') || '*/*', + ) + ) { + return normalizeSsrResponse( + Response.json( + { error: 'Only HTML requests are supported here' }, + { status: 406 }, + ), + ) + } - const middlewares = flattenedRequestMiddlewares.map( - (d) => d.options.server, - ) - const { response: middlewareResponse } = await executeMiddleware( - [...middlewares, serverFnHandler], - { - request, - pathname: url.pathname, - handlerType: 'serverFn', - context: createNullProtoObject(requestOpts?.context), - }, - request.signal, - ) - - const result = await handleRedirectResponse( - middlewareResponse, - getRouter, - request.signal, - request.headers.get('x-tsr-serverFn') === 'true', - ) - bindSsrResponseToRequest(router ?? undefined, result, request.signal) - request.signal.throwIfAborted() - responseOwnsCleanup = result.serverSsrCleanup === 'stream' - return result.response - } - - // Router execution function - const executeRouter = async ( - serverContext: TODO, - matchedRoutes?: ReadonlyArray, - ): Promise => { - const acceptHeader = request.headers.get('Accept') || '*/*' - const acceptParts = acceptHeader.split(',') - const supportedMimeTypes = ['*/*', 'text/html'] - - const isSupported = supportedMimeTypes.some((mimeType) => - acceptParts.some((part) => part.trim().startsWith(mimeType)), - ) - - if (!isSupported) { - return normalizeSsrResponse( - Response.json( - { error: 'Only HTML requests are supported here' }, - { status: 500 }, - ), + const manifest = await waitForRequest( + resolveManifestForRequest({ + request, + requestInlineCss: requestOpts?.inlineCss, + getBaseManifest: () => getBaseManifest(matchedRoutes), + }), + signal, ) - } - const manifest = await waitForRequest( - resolveManifestForRequest({ - request, - requestInlineCss: requestOpts?.inlineCss, - getBaseManifest: () => getBaseManifest(matchedRoutes), - }), - request.signal, - ) + const earlyHints = createEarlyHintsForRequest({ + onEarlyHints: requestOpts?.onEarlyHints, + responseLinkHeader: requestOpts?.responseLinkHeader, + }) - const earlyHints = createEarlyHintsForRequest({ - onEarlyHints: requestOpts?.onEarlyHints, - responseLinkHeader: requestOpts?.responseLinkHeader, - }) + earlyHints?.collectStatic({ manifest, matchedRoutes }) - earlyHints?.collectStatic({ manifest, matchedRoutes }) + const routerInstance = await getRouter() - const routerInstance = await getRouter() - - attachRouterServerSsrUtils({ - router: routerInstance, - manifest, - getRequestAssets: () => - getStartContext({ throwIfNotFound: false })?.requestAssets, - }) - - // `additionalContext` is request-scoped and only read from router.options - // during load; avoid a full router.update() and redundant location parse. - routerInstance.options.additionalContext = { serverContext } - await routerInstance.load({ _signal: request.signal }) - request.signal.throwIfAborted() - - if (routerInstance._serverResult?.type === 'redirect') { - return normalizeSsrResponse(routerInstance._serverResult.redirect) - } - - earlyHints?.collectDynamic( - _getRenderedMatches(routerInstance.stores.matches.get()), - ) - - // Pass request-scoped assets to dehydrate for manifest injection - const ctx = getStartContext({ throwIfNotFound: false }) - await waitForRequest( - routerInstance.serverSsr!.dehydrate({ - requestAssets: ctx?.requestAssets, - }), - request.signal, - ) - request.signal.throwIfAborted() - - const responseHeaders = getStartResponseHeaders({ - router: routerInstance, - }) - earlyHints?.appendResponseHeaders(responseHeaders) - request.signal.throwIfAborted() - const response = await waitForRequest( - cb({ - request, + attachRouterServerSsrUtils({ router: routerInstance, - responseHeaders, - }), - request.signal, - (late) => disposeLateResponse(late, request.signal), - ) - return normalizeSsrResponse(response) - } + manifest, + getRequestAssets: () => + getStartContext({ throwIfNotFound: false })?.requestAssets, + }) - // Main request handler - const requestHandlerMiddleware = async ({ context }: TODO) => { - return runWithStartContext( - { - getRouter, - startOptions: requestStartOptions, - contextAfterGlobalMiddlewares: context, - request, - executedRequestMiddlewares, - handlerType: 'router', - }, - async () => { - try { - return await handleServerRoutes({ + // `additionalContext` is request-scoped and only read from router.options + // during load; avoid a full router.update() and redundant location parse. + routerInstance.options.additionalContext = { serverContext } + await routerInstance.load({ _signal: signal }) + signal.throwIfAborted() + + if (routerInstance._serverResult?.type === 'redirect') { + return normalizeSsrResponse(routerInstance._serverResult.redirect) + } + + earlyHints?.collectDynamic( + _getRenderedMatches(routerInstance.stores.matches.get()), + ) + + // Pass request-scoped assets to dehydrate for manifest injection + const ctx = getStartContext({ throwIfNotFound: false }) + await routerInstance.serverSsr!.dehydrate({ + requestAssets: ctx?.requestAssets, + signal, + }) + signal.throwIfAborted() + + const responseHeaders = getStartResponseHeaders({ + router: routerInstance, + }) + earlyHints?.appendResponseHeaders(responseHeaders) + signal.throwIfAborted() + const disposeLate = createLateResponseDisposer(signal) + const response = await waitForRequest( + cb({ + request, + router: routerInstance, + responseHeaders, + }), + signal, + disposeLate, + disposeLate, + ) + return normalizeSsrResponse(response) + } + + terminal = ({ context }) => + runWithStartContext( + { ...startContext, contextAfterGlobalMiddlewares: context }, + () => + handleServerRoutes({ getRouter, request, url, executeRouter, context, executedRequestMiddlewares, - }) - } catch (err) { - if (err instanceof Response) { - return err - } - throw err - } - }, - ) + }), + ) } - const middlewares = flattenedRequestMiddlewares.map( - (d) => d.options.server, - ) - const { response: middlewareResponse } = await executeMiddleware( - [...middlewares, requestHandlerMiddleware], + const middlewareResponse = await executeMiddleware( + flattenedRequestMiddlewares.map((d) => d.options.server), + terminal, { request, pathname: url.pathname, - handlerType: 'router', + handlerType, context: createNullProtoObject(requestOpts?.context), }, - request.signal, + signal, ) - const response = await handleRedirectResponse( - middlewareResponse, - getRouter, - request.signal, - false, - ) - bindSsrResponseToRequest(router ?? undefined, response, request.signal) - request.signal.throwIfAborted() - responseOwnsCleanup = response.serverSsrCleanup === 'stream' - return response.response + let result: SsrResponse + try { + result = await handleRedirectResponse( + middlewareResponse, + getRouter, + signal, + isServerFnRequest && request.headers.get('x-tsr-serverFn') === 'true', + ) + if (request.method === 'HEAD') { + result = stripSsrResponseBody(result, 'HEAD body stripped') + } + } catch (error) { + disposeResponseResult( + middlewareResponse, + signal.aborted ? signal.reason : error, + ) + throw error + } + bindSsrResponseToRequest(router, result, signal) + signal.throwIfAborted() + responseOwnsCleanup = result.serverSsrCleanup === 'stream' + return result.response } finally { if (router?.serverSsr && !responseOwnsCleanup) { // Clean up router SSR state if it was set up but won't be cleaned up by the callback @@ -784,7 +823,8 @@ export function createStartHandler( // Transformed streaming response bodies clean up when consumed/cancelled. router.serverSsr.cleanup() } - router = null + // `routerPromise` stays memoized: a streamed Suspense boundary or a late + // server function may still ask for this request's router. } } @@ -801,12 +841,13 @@ async function handleRedirectResponse( ): Promise { signal.throwIfAborted() const ssrResponse = normalizeSsrResponse(response) - if (!isRedirect(ssrResponse.response)) { + const redirect = ssrResponse.response + if (!isRedirect(redirect)) { return ssrResponse } - const opts = ssrResponse.response.options - const href = ssrResponse.response.headers.get('Location') || opts.href + const opts = redirect.options + const href = redirect.headers.get('Location') || opts.href if ( !href && opts.to && @@ -835,43 +876,34 @@ async function handleRedirectResponse( } signal.throwIfAborted() - let redirect = ssrResponse.response // Unambiguous relative hrefs need no route resolution or protocol policy. // Every scheme falls back to the router to honor its custom allowlist. if (href && !isDangerousProtocol(href, relativeRedirectProtocols)) { - redirect.options.href = href + opts.href = href redirect.headers.set('Location', href) } else { - const router = await waitForRequest(getRouter(), signal) + const router = await getRouter() signal.throwIfAborted() - redirect = router.resolveRedirect(redirect) + // Resolves `redirect` in place. + router.resolveRedirect(redirect) } if (serializeRedirect) { - const redirectOptions = { ...(redirect.options as TODO) } + const redirectOptions = { ...(opts as TODO) } delete redirectOptions.headers const responseHeaders = new Headers(redirect.headers) responseHeaders.set('content-type', 'application/json') - return waitForRequest( - replaceSsrResponse( - ssrResponse, - Response.json( - { - ...redirectOptions, - isSerializedRedirect: true, - }, - { headers: responseHeaders }, - ), - 'redirect response replaced', + return replaceSsrResponse( + ssrResponse, + Response.json( + { ...redirectOptions, isSerializedRedirect: true }, + { headers: responseHeaders }, ), - signal, + 'redirect response replaced', ) } - return waitForRequest( - replaceSsrResponse(ssrResponse, redirect, 'redirect response replaced'), - signal, - ) + return ssrResponse } async function handleServerRoutes({ @@ -905,6 +937,9 @@ async function handleServerRoutes({ // Collect and dedupe route middlewares const routeMiddlewares: Array = [] + let terminalHandler: TODO = (ctx: TODO) => + executeRouter(ctx.context, matchedRoutes) + let terminalNext: TODO // Collect middleware from matched routes, filtering out those already executed // in the request phase @@ -924,7 +959,6 @@ async function handleServerRoutes({ // Add handler middleware if exact match const server = foundRoute?.options.server - let isHeadFallback = false if (server?.handlers && isExactMatch) { const handlers = typeof server.handlers === 'function' @@ -938,14 +972,16 @@ async function handleServerRoutes({ requestMethod === 'HEAD' ? (handlers['HEAD'] ?? handlers['GET'] ?? handlers['ANY']) : (handlers[requestMethod] ?? handlers['ANY']) - isHeadFallback = - requestMethod === 'HEAD' && handler !== undefined && !handlers['HEAD'] - if (handler) { const mayDefer = !!foundRoute.options.component if (typeof handler === 'function') { - routeMiddlewares.push(handlerToMiddleware(handler, mayDefer)) + if (!mayDefer) { + terminalHandler = handler + terminalNext = throwIfMayNotDefer + } else { + routeMiddlewares.push(handler) + } } else { if (handler.middleware?.length) { const handlerMiddlewares = flattenMiddlewares(handler.middleware) @@ -954,18 +990,20 @@ async function handleServerRoutes({ } } if (handler.handler) { - routeMiddlewares.push(handlerToMiddleware(handler.handler, mayDefer)) + if (!mayDefer) { + terminalHandler = handler.handler + terminalNext = throwIfMayNotDefer + } else { + routeMiddlewares.push(handler.handler) + } } } } } - // Final middleware: execute router with matched routes for dev styles - routeMiddlewares.push(((ctx: TODO) => - executeRouter(ctx.context, matchedRoutes)) as TODO) - - const { ctx, response } = await executeMiddleware( + const response = await executeMiddleware( routeMiddlewares, + terminalHandler, { request, context, @@ -974,26 +1012,8 @@ async function handleServerRoutes({ handlerType: 'router', }, request.signal, + terminalNext, ) - // RFC 9110 §9.3.2: HEAD must carry the same header fields as GET but no body. - // Resolve any redirect before stripping so the Location header survives. - if (isHeadFallback) { - if (!ctx.response) { - throwRouteHandlerError() - } - - const resolved = await handleRedirectResponse( - response, - getRouter, - request.signal, - false, - ) - return waitForRequest( - stripSsrResponseBody(resolved, 'HEAD body stripped'), - request.signal, - ) - } - return normalizeSsrResponse(response) } diff --git a/packages/start-server-core/src/frame-protocol.ts b/packages/start-server-core/src/frame-protocol.ts index e96275c0bb..b1f32eb702 100644 --- a/packages/start-server-core/src/frame-protocol.ts +++ b/packages/start-server-core/src/frame-protocol.ts @@ -8,31 +8,41 @@ * - payload: variable length bytes */ -// Re-export constants from shared location -import { FRAME_HEADER_SIZE, FrameType } from '@tanstack/start-client-core' - -export { +import { FRAME_HEADER_SIZE, - FrameType, - TSS_CONTENT_TYPE_FRAMED, - TSS_CONTENT_TYPE_FRAMED_VERSIONED, - TSS_FRAMED_PROTOCOL_VERSION, -} from '@tanstack/start-client-core' + FRAME_TYPE_CHUNK, + FRAME_TYPE_END, + FRAME_TYPE_ERROR, + FRAME_TYPE_JSON, + MAX_FRAME_PAYLOAD_SIZE, +} from '@tanstack/start-client-core/client-rpc' + +type FrameType = + | typeof FRAME_TYPE_JSON + | typeof FRAME_TYPE_CHUNK + | typeof FRAME_TYPE_END + | typeof FRAME_TYPE_ERROR /** Cached TextEncoder for frame encoding */ const textEncoder = new TextEncoder() /** Shared empty payload for END frames - avoids allocation per call */ const EMPTY_PAYLOAD = new Uint8Array(0) +const MAX_ERROR_MESSAGE_CODE_UNITS = 4096 /** * Encodes a single frame with header and payload. */ -export function encodeFrame( +function encodeFrame( type: FrameType, streamId: number, payload: Uint8Array, ): Uint8Array { + if (payload.byteLength > MAX_FRAME_PAYLOAD_SIZE) { + throw new RangeError( + `Frame payload exceeds ${MAX_FRAME_PAYLOAD_SIZE} bytes`, + ) + } const frame = new Uint8Array(FRAME_HEADER_SIZE + payload.length) // Write header bytes directly to avoid DataView allocation per frame // Frame format: [type:1][streamId:4 BE][length:4 BE] @@ -49,37 +59,15 @@ export function encodeFrame( return frame } -/** - * Encodes a JSON frame (type 0, streamId 0). - */ -export function encodeJSONFrame(json: string): Uint8Array { - return encodeFrame(FrameType.JSON, 0, textEncoder.encode(json)) -} - -/** - * Encodes a raw stream chunk frame. - */ -export function encodeChunkFrame( - streamId: number, - chunk: Uint8Array, -): Uint8Array { - return encodeFrame(FrameType.CHUNK, streamId, chunk) -} - -/** - * Encodes a raw stream end frame. - */ -export function encodeEndFrame(streamId: number): Uint8Array { - return encodeFrame(FrameType.END, streamId, EMPTY_PAYLOAD) -} - -/** - * Encodes a raw stream error frame. - */ -export function encodeErrorFrame(streamId: number, error: unknown): Uint8Array { - const message = +/** Encodes an error message payload, truncated to a bounded length. */ +function encodeErrorPayload(error: unknown): Uint8Array { + const originalMessage = error instanceof Error ? error.message : String(error ?? 'Unknown error') - return encodeFrame(FrameType.ERROR, streamId, textEncoder.encode(message)) + const message = + originalMessage.length > MAX_ERROR_MESSAGE_CODE_UNITS + ? `${originalMessage.slice(0, MAX_ERROR_MESSAGE_CODE_UNITS)}…` + : originalMessage + return textEncoder.encode(message) } /** @@ -91,168 +79,280 @@ export interface LateStreamRegistration { stream: ReadableStream } +/** One serialized JSON patch and the raw streams referenced by that patch. */ +export interface MultiplexedStreamRecord { + json: Uint8Array + rawStreams: Array +} + +export interface MultiplexedStreamOptions { + onCancel?: (reason?: unknown) => void + signal?: AbortSignal +} + +type CancellableReader = Pick< + ReadableStreamDefaultReader, + 'cancel' | 'releaseLock' +> + /** - * Creates a multiplexed ReadableStream from JSON stream and raw streams. + * Creates a multiplexed ReadableStream from serialized response records. * - * The JSON stream emits NDJSON lines (from seroval's toCrossJSONStream). - * Raw streams are pumped concurrently, interleaved with JSON frames. - * - * Supports late stream registration for RawStreams discovered after initial - * serialization (e.g., from resolved Promises). - * - * @param jsonStream Stream of JSON strings (each string is one NDJSON line) - * @param rawStreams Map of stream IDs to raw binary streams (known at start) - * @param lateStreamSource Optional stream of late registrations for streams discovered later + * A record's JSON frame is admitted before any raw stream referenced by that + * record starts. Raw streams from admitted records are pumped concurrently. + * The caller bounds the stream count before records reach this function. */ export function createMultiplexedStream( - jsonStream: ReadableStream, - rawStreams: Map>, - lateStreamSource?: ReadableStream, + recordStream: ReadableStream, + options: MultiplexedStreamOptions = {}, ): ReadableStream { - // Shared state for the multiplexed stream let controller: ReadableStreamDefaultController - let cancelled = false - const readers: Array> = [] + let stopped: false | [unknown] = false + let activePumps = 0 + let wakeDemand: (() => void) | undefined + let admission: Promise | undefined + const readers = new Set() + const pendingRawStreams = new Set>() + const abortOutput = () => errorOutput(options.signal?.reason) - // Helper to enqueue a frame, ignoring errors if stream is closed/cancelled - const enqueue = (frame: Uint8Array): boolean => { - if (cancelled) return false - try { - controller.enqueue(frame) - return true - } catch { - return false - } + const wakeAdmission = () => { + const wake = wakeDemand + wakeDemand = undefined + wake?.() } - // Helper to error the output stream (for fatal errors like JSON stream failure) - const errorOutput = (error: unknown): void => { - if (cancelled) return - cancelled = true + const cancelReader = (reader: CancellableReader, reason?: unknown) => { + void reader.cancel(reason).catch(() => {}) + } + + const cancelStream = (stream: ReadableStream, reason?: unknown) => { + void stream.cancel(reason).catch(() => {}) + } + + const stop = (reason?: unknown) => { + if (stopped) { + return false + } + stopped = [reason] + options.signal?.removeEventListener('abort', abortOutput) + wakeAdmission() + for (const reader of readers) { + cancelReader(reader, reason) + } + for (const stream of pendingRawStreams) { + cancelStream(stream, reason) + } + pendingRawStreams.clear() + return true + } + + const errorOutput = (error: unknown) => { + if (!stop(error)) { + return + } try { controller.error(error) } catch { - // Already errored - } - // Cancel all readers to stop other pumps - for (const reader of readers) { - reader.cancel().catch(() => {}) + // The output was already closed by its consumer. } } - // Pumps a raw stream, sending CHUNK frames and END/ERROR on completion + const waitForDemand = async () => { + while (!stopped && (controller.desiredSize ?? 0) <= 0) { + await new Promise((resolve) => { + wakeDemand = resolve + }) + } + return !stopped + } + + // Only the pump at the head of this chain may inspect desiredSize and + // enqueue. Each other pump can retain at most one unencoded source chunk. + // The frame is encoded only once the output has demand for it. + const admitFrame = ( + type: FrameType, + streamId: number, + payload: Uint8Array, + ): boolean | Promise => { + if (stopped) { + return false + } + if (!admission && (controller.desiredSize ?? 0) > 0) { + controller.enqueue(encodeFrame(type, streamId, payload)) + return true + } + + const runAdmission = async () => { + if (!(await waitForDemand())) { + return false + } + controller.enqueue(encodeFrame(type, streamId, payload)) + return true + } + const result = admission ? admission.then(runAdmission) : runAdmission() + const clearAdmission = () => { + if (admission === tail) { + admission = undefined + } + } + const tail = result.then(clearAdmission, clearAdmission) + admission = tail + return result + } + + const maybeClose = () => { + if (activePumps !== 0 || !stop()) { + return + } + try { + controller.close() + } catch { + // The output was already closed by its consumer. + } + } + + const startPump = (pump: () => Promise) => { + activePumps++ + void pump().then( + () => { + activePumps-- + maybeClose() + }, + (error) => { + activePumps-- + errorOutput(error) + }, + ) + } + async function pumpRawStream( streamId: number, stream: ReadableStream, - ): Promise { + ) { const reader = stream.getReader() - readers.push(reader) + readers.add(reader) try { - while (!cancelled) { + while (!stopped) { const { done, value } = await reader.read() - if (done) { - enqueue(encodeEndFrame(streamId)) + // Cancellation can run while the read is suspended. + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + if (stopped) { return } - if (!enqueue(encodeChunkFrame(streamId, value))) return + if (done) { + const frameAdmission = admitFrame( + FRAME_TYPE_END, + streamId, + EMPTY_PAYLOAD, + ) + if (frameAdmission !== true) { + await frameAdmission + } + return + } + if (!(value instanceof Uint8Array)) { + throw new TypeError('RawStream chunks must be Uint8Array') + } + // One frame per read, split only when the chunk exceeds a frame. + let offset = 0 + do { + const chunk = + value.byteLength <= MAX_FRAME_PAYLOAD_SIZE + ? value + : value.subarray(offset, offset + MAX_FRAME_PAYLOAD_SIZE) + const frameAdmission = admitFrame(FRAME_TYPE_CHUNK, streamId, chunk) + if ( + frameAdmission !== true && + (frameAdmission === false || !(await frameAdmission)) + ) { + return + } + offset += MAX_FRAME_PAYLOAD_SIZE + } while (offset < value.byteLength) } } catch (error) { - // Raw stream error - send ERROR frame, don't fail entire response - enqueue(encodeErrorFrame(streamId, error)) + if (!stopped) { + // A raw-stream failure is isolated to that stream. + const frameAdmission = admitFrame( + FRAME_TYPE_ERROR, + streamId, + encodeErrorPayload(error), + ) + if (frameAdmission !== true) { + await frameAdmission + } + } } finally { + readers.delete(reader) reader.releaseLock() } } - // Pumps the JSON stream, sending JSON frames - // JSON stream errors are fatal - they error the entire output - async function pumpJSON(): Promise { - const reader = jsonStream.getReader() - readers.push(reader) + async function pumpRecords() { + const reader = recordStream.getReader() + readers.add(reader) try { - while (!cancelled) { + while (!stopped) { const { done, value } = await reader.read() - if (done) return - if (!enqueue(encodeJSONFrame(value))) return + // Cancellation can run while the read is suspended. + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + if (stopped) { + if (!done) { + for (const registration of value.rawStreams) { + cancelStream(registration.stream, stopped[0]) + } + } + return + } + if (done) { + return + } + for (const registration of value.rawStreams) { + pendingRawStreams.add(registration.stream) + } + const frameAdmission = admitFrame(FRAME_TYPE_JSON, 0, value.json) + if ( + frameAdmission !== true && + (frameAdmission === false || !(await frameAdmission)) + ) { + return + } + for (const registration of value.rawStreams) { + pendingRawStreams.delete(registration.stream) + startPump( + pumpRawStream.bind(undefined, registration.id, registration.stream), + ) + } } } catch (error) { - // JSON stream error is fatal - error the entire output - errorOutput(error) - throw error // Re-throw to signal failure to Promise.all - } finally { - reader.releaseLock() - } - } - - // Pumps late stream registrations, spawning raw stream pumps as they arrive - async function pumpLateStreams(): Promise>> { - if (!lateStreamSource) return [] - - const lateStreamPumps: Array> = [] - const reader = lateStreamSource.getReader() - readers.push(reader) - try { - while (!cancelled) { - const { done, value } = await reader.read() - if (done) break - // Start pumping this late stream and track it - lateStreamPumps.push(pumpRawStream(value.id, value.stream)) + if (!stopped) { + // JSON records describe the response graph, so losing one is fatal. + errorOutput(error) } } finally { + readers.delete(reader) reader.releaseLock() } - return lateStreamPumps } return new ReadableStream({ - async start(ctrl) { + start(ctrl) { controller = ctrl - - // Collect all pump promises - const pumps: Array>>> = [pumpJSON()] - - for (const [streamId, stream] of rawStreams) { - pumps.push(pumpRawStream(streamId, stream)) - } - - // Add late stream pump (returns array of spawned pump promises) - if (lateStreamSource) { - pumps.push(pumpLateStreams()) - } - - try { - // Wait for initial pumps to complete - const results = await Promise.all(pumps) - - // Wait for any late stream pumps that were spawned - const latePumps = results.find(Array.isArray) as - | Array> - | undefined - if (latePumps && latePumps.length > 0) { - await Promise.all(latePumps) - } - - // All pumps done - close the output stream - if (!cancelled) { - try { - controller.close() - } catch { - // Already closed - } - } - } catch { - // Error already handled by errorOutput in pumpJSON - // or was a raw stream error (non-fatal, already sent ERROR frame) + if (options.signal?.aborted) { + cancelStream(recordStream, options.signal.reason) + errorOutput(options.signal.reason) + return } + options.signal?.addEventListener('abort', abortOutput, { once: true }) + startPump(pumpRecords) }, - - cancel() { - cancelled = true - // Cancel all readers to stop pumps quickly - for (const reader of readers) { - reader.cancel().catch(() => {}) + pull() { + wakeAdmission() + }, + cancel(reason) { + if (stop(reason)) { + options.onCancel?.(reason) } - readers.length = 0 }, }) } diff --git a/packages/start-server-core/src/index.tsx b/packages/start-server-core/src/index.tsx index ee818e0cf1..92937ff039 100644 --- a/packages/start-server-core/src/index.tsx +++ b/packages/start-server-core/src/index.tsx @@ -1,4 +1,7 @@ -export { createStartHandler } from './createStartHandler' +export { + createStartHandler, + transferResponseBodyOwnership, +} from './createStartHandler' export type { CreateStartHandlerOptions } from './createStartHandler' export type { diff --git a/packages/start-server-core/src/server-functions-handler.ts b/packages/start-server-core/src/server-functions-handler.ts index e7d961decf..48922e2ab6 100644 --- a/packages/start-server-core/src/server-functions-handler.ts +++ b/packages/start-server-core/src/server-functions-handler.ts @@ -1,24 +1,29 @@ +import { invariant, isNotFound, isRedirect } from '@tanstack/router-core' import { createRawStreamRPCPlugin, - invariant, - isNotFound, - isRedirect, -} from '@tanstack/router-core' + defaultSerovalDeserializerPlugins as routerDefaultSerovalPlugins, +} from '@tanstack/router-core/ssr/server' import { + TSS_CONTENT_TYPE_FRAMED_VERSIONED, TSS_FORMDATA_CONTEXT, X_TSS_RAW_RESPONSE, X_TSS_SERIALIZED, - getDefaultSerovalPlugins, + getSerovalPlugins, safeObjectMerge, } from '@tanstack/start-client-core' +import { + MAX_FRAMED_STREAMS, + MAX_FRAME_PAYLOAD_SIZE, +} from '@tanstack/start-client-core/client-rpc' import { fromJSON, toCrossJSONAsync, toCrossJSONStream } from 'seroval' import { getResponse } from './request-response' import { getServerFnById } from './getServerFnById' -import { - TSS_CONTENT_TYPE_FRAMED_VERSIONED, - createMultiplexedStream, +import { createMultiplexedStream } from './frame-protocol' +import type { + LateStreamRegistration, + MultiplexedStreamOptions, + MultiplexedStreamRecord, } from './frame-protocol' -import type { LateStreamRegistration } from './frame-protocol' import type { Plugin as SerovalPlugin } from 'seroval' // Cache serovalPlugins at module level to avoid repeated calls @@ -32,6 +37,34 @@ const FORM_DATA_CONTENT_TYPES = [ // Maximum payload size for GET requests (1MB) const MAX_PAYLOAD_SIZE = 1_000_000 +const MAX_PENDING_SERIALIZATION_RECORDS = 1024 +const MAX_PENDING_SERIALIZATION_BYTES = 32 * 1024 * 1024 +const textEncoder = new TextEncoder() + +function encodeSerializationRecord(value: unknown) { + return textEncoder.encode(JSON.stringify(value)) +} + +function exceedsPendingSerializationLimit( + record: Uint8Array, + recordCount: number, + pendingBytes: number, +) { + return ( + recordCount >= MAX_PENDING_SERIALIZATION_RECORDS || + pendingBytes + record.byteLength > MAX_PENDING_SERIALIZATION_BYTES + ) +} + +function runSerializationCleanup(dispose: () => void) { + try { + dispose() + } catch {} +} + +function cancelRawStream(stream: ReadableStream, reason?: unknown) { + void stream.cancel(reason).catch(() => {}) +} export const handleServerAction = async ({ request, @@ -42,8 +75,7 @@ export const handleServerAction = async ({ context: any serverFnId: string }) => { - const method = request.method - const methodUpper = method.toUpperCase() + const methodUpper = request.method.toUpperCase() const url = new URL(request.url) const action = await getServerFnById(serverFnId, { origin: 'client' }) @@ -63,359 +95,424 @@ export const handleServerAction = async ({ } const isServerFn = request.headers.get('x-tsr-serverFn') === 'true' - // Initialize serovalPlugins lazily (cached at module level) - if (!serovalPlugins) { - serovalPlugins = getDefaultSerovalPlugins() - } - + serovalPlugins ??= getSerovalPlugins(routerDefaultSerovalPlugins) const contentType = request.headers.get('Content-Type') - function parsePayload(payload: any) { - const parsedPayload = fromJSON(payload, { plugins: serovalPlugins }) - return parsedPayload as any - } - - const response = await (async () => { - try { - let res = await (async () => { - // FormData - if ( - FORM_DATA_CONTENT_TYPES.some( - (type) => contentType && contentType.includes(type), + try { + let res: any + if ( + FORM_DATA_CONTENT_TYPES.some( + (type) => contentType && contentType.includes(type), + ) + ) { + // We don't support GET requests with FormData payloads... that seems impossible + if (methodUpper === 'GET') { + if (process.env.NODE_ENV !== 'production') { + throw new Error( + 'Invariant failed: GET requests with FormData payloads are not supported', ) - ) { - // We don't support GET requests with FormData payloads... that seems impossible - if (methodUpper === 'GET') { - if (process.env.NODE_ENV !== 'production') { - throw new Error( - 'Invariant failed: GET requests with FormData payloads are not supported', - ) - } - - invariant() - } - const formData = await request.formData() - const serializedContext = formData.get(TSS_FORMDATA_CONTEXT) - formData.delete(TSS_FORMDATA_CONTEXT) - - const params = { - context, - data: formData, - method: methodUpper, - } - if (typeof serializedContext === 'string') { - try { - const parsedContext = JSON.parse(serializedContext) - const deserializedContext = fromJSON(parsedContext, { - plugins: serovalPlugins, - }) - if ( - typeof deserializedContext === 'object' && - deserializedContext - ) { - params.context = safeObjectMerge( - deserializedContext as Record, - context, - ) - } - } catch (e) { - // Log warning for debugging but don't expose to client - if (process.env.NODE_ENV === 'development') { - console.warn('Failed to parse FormData context:', e) - } - } - } - - return await action(params) } - // Get requests use the query string - if (methodUpper === 'GET') { - // Get payload directly from searchParams - const payloadParam = url.searchParams.get('payload') - // Reject oversized payloads to prevent DoS - if (payloadParam && payloadParam.length > MAX_PAYLOAD_SIZE) { - throw new Error('Payload too large') - } - // If there's a payload, we should try to parse it - const payload: any = payloadParam - ? parsePayload(JSON.parse(payloadParam)) - : {} - payload.context = safeObjectMerge(payload.context, context) - payload.method = methodUpper - // Send it through! - return await action(payload) - } - - let jsonPayload - if (contentType?.includes('application/json')) { - jsonPayload = await request.json() - } - - const payload = jsonPayload ? parsePayload(jsonPayload) : {} - payload.context = safeObjectMerge(payload.context, context) - payload.method = methodUpper - return await action(payload) - })() - - const unwrapped = res.result || res.error - - if (isNotFound(res)) { - res = isNotFoundResponse(res) + invariant() } + const formData = await request.formData() + const serializedContext = formData.get(TSS_FORMDATA_CONTEXT) + formData.delete(TSS_FORMDATA_CONTEXT) - if (!isServerFn) { - return unwrapped + const params = { + context, + data: formData, + method: methodUpper, } - - if (unwrapped instanceof Response) { - if (isRedirect(unwrapped)) { - return unwrapped - } - unwrapped.headers.set(X_TSS_RAW_RESPONSE, 'true') - return unwrapped - } - - return serializeResult(res) - - function serializeResult(res: unknown): Response { - let nonStreamingBody: any = undefined - - const alsResponse = getResponse() - if (res !== undefined) { - // Collect raw streams encountered during initial synchronous serialization - const rawStreams = new Map>() - - // Track whether we're still in the initial synchronous phase - // After initial phase, new RawStreams go to lateStreamWriter - let initialPhase = true - - // Late stream registration for RawStreams discovered after initial pass - // (e.g., from resolved Promises) - let lateStreamWriter: - | WritableStreamDefaultWriter - | undefined - let lateStreamReadable: - | ReadableStream - | undefined = undefined - const pendingLateStreams: Array = [] - - const rawStreamPlugin = createRawStreamRPCPlugin( - (id: number, stream: ReadableStream) => { - if (initialPhase) { - rawStreams.set(id, stream) - return - } - - if (lateStreamWriter) { - // Late stream - write to the late stream channel - lateStreamWriter.write({ id, stream }).catch(() => { - // Ignore write errors - stream may be closed - }) - return - } - - // Discovered after initial phase but before writer exists. - pendingLateStreams.push({ id, stream }) - }, - ) - - // Build plugins with RawStreamRPCPlugin first (before default SSR plugin) - const plugins = [rawStreamPlugin, ...(serovalPlugins || [])] - - // first run without the stream in case `result` does not need streaming - let done = false as boolean - const callbacks: { - onParse: (value: any) => void - onDone: () => void - onError: (error: any) => void - } = { - onParse: (value) => { - nonStreamingBody = value - }, - onDone: () => { - done = true - }, - onError: (error) => { - throw error - }, - } - toCrossJSONStream(res, { - refs: new Map(), - plugins, - onParse(value) { - callbacks.onParse(value) - }, - onDone() { - callbacks.onDone() - }, - onError: (error) => { - callbacks.onError(error) - }, + if (typeof serializedContext === 'string') { + try { + const parsedContext = JSON.parse(serializedContext) + const deserializedContext = fromJSON(parsedContext, { + plugins: serovalPlugins, }) - - // End of initial synchronous phase - any new RawStreams are "late" - initialPhase = false - - // If any RawStreams are discovered after this point but before the - // late-stream writer exists, we buffer them and flush once the writer - // is ready. This avoids an occasional missed-stream race. - - // If no raw streams and done synchronously, return simple JSON - if (done && rawStreams.size === 0) { - return new Response( - nonStreamingBody ? JSON.stringify(nonStreamingBody) : undefined, - { - status: alsResponse.status, - statusText: alsResponse.statusText, - headers: { - 'Content-Type': 'application/json', - [X_TSS_SERIALIZED]: 'true', - }, - }, + if (typeof deserializedContext === 'object' && deserializedContext) { + params.context = safeObjectMerge( + deserializedContext as Record, + context, ) } - - // Not done synchronously or has raw streams - use framed protocol - // This supports late RawStreams from resolved Promises - const { readable, writable } = - new TransformStream() - lateStreamReadable = readable - lateStreamWriter = writable.getWriter() - - // Flush any late streams that were discovered in the small window - // between end of initial serialization and writer setup. - for (const registration of pendingLateStreams) { - lateStreamWriter.write(registration).catch(() => { - // Ignore write errors - stream may be closed - }) + } catch (e) { + // Log warning for debugging but don't expose to client + if (process.env.NODE_ENV === 'development') { + console.warn('Failed to parse FormData context:', e) } - pendingLateStreams.length = 0 - - // Create a stream of JSON chunks - const jsonStream = new ReadableStream({ - start(controller) { - callbacks.onParse = (value) => { - controller.enqueue(JSON.stringify(value) + '\n') - } - callbacks.onDone = () => { - try { - controller.close() - } catch { - // Already closed - } - // Close late stream writer when JSON serialization is done - // Any RawStreams not yet discovered won't be sent - lateStreamWriter - ?.close() - .catch(() => { - // Ignore close errors - }) - .finally(() => { - lateStreamWriter = undefined - }) - } - - callbacks.onError = (error) => { - controller.error(error) - lateStreamWriter - ?.abort(error) - .catch(() => { - // Ignore abort errors - }) - .finally(() => { - lateStreamWriter = undefined - }) - } - - // Emit initial body if we have one - if (nonStreamingBody !== undefined) { - callbacks.onParse(nonStreamingBody) - } - // If serialization already completed synchronously, close now - // This handles the case where onDone was called during toCrossJSONStream - // before we overwrote callbacks.onDone - if (done) { - callbacks.onDone() - } - }, - cancel() { - lateStreamWriter?.abort().catch(() => {}) - lateStreamWriter = undefined - }, - }) - - // Create multiplexed stream with JSON, initial raw streams, and late streams - const multiplexedStream = createMultiplexedStream( - jsonStream, - rawStreams, - lateStreamReadable, - ) - - return new Response(multiplexedStream, { - status: alsResponse.status, - statusText: alsResponse.statusText, - headers: { - 'Content-Type': TSS_CONTENT_TYPE_FRAMED_VERSIONED, - [X_TSS_SERIALIZED]: 'true', - }, - }) } - - return new Response(undefined, { - status: alsResponse.status, - statusText: alsResponse.statusText, - }) - } - } catch (error: any) { - if (error instanceof Response) { - return error - } - // else if ( - // isPlainObject(error) && - // 'result' in error && - // error.result instanceof Response - // ) { - // return error.result - // } - - // Currently this server-side context has no idea how to - // build final URLs, so we need to defer that to the client. - // The client will check for __redirect and __notFound keys, - // and if they exist, it will handle them appropriately. - - if (isNotFound(error)) { - return isNotFoundResponse(error) } - console.info() - console.info('Server Fn Error!') - console.info() - console.error(error) - console.info() + res = await action(params) + } else if (methodUpper === 'GET') { + // Get payload directly from searchParams + const payloadParam = url.searchParams.get('payload') + // Reject oversized payloads to prevent DoS + if (payloadParam && payloadParam.length > MAX_PAYLOAD_SIZE) { + throw new Error('Payload too large') + } + const payload: any = payloadParam + ? fromJSON(JSON.parse(payloadParam), { plugins: serovalPlugins }) + : {} + payload.context = safeObjectMerge(payload.context, context) + payload.method = methodUpper + res = await action(payload) + } else { + const payload: any = contentType?.includes('application/json') + ? fromJSON(await request.json(), { plugins: serovalPlugins }) + : {} + payload.context = safeObjectMerge(payload.context, context) + payload.method = methodUpper + res = await action(payload) + } - const serializedError = JSON.stringify( - await Promise.resolve( - toCrossJSONAsync(error, { - refs: new Map(), - plugins: serovalPlugins, - }), - ), - ) - const response = getResponse() + const unwrapped = res.result !== undefined ? res.result : res.error + + if (isNotFound(res)) { + res = isNotFoundResponse(res) + } + + if (!isServerFn) { + return unwrapped + } + + if (unwrapped instanceof Response) { + if (isRedirect(unwrapped)) { + return unwrapped + } + unwrapped.headers.set(X_TSS_RAW_RESPONSE, 'true') + return unwrapped + } + + return serializeResult(res, request.signal, serovalPlugins) + } catch (error: any) { + if (error instanceof Response) { + return error + } + + // Currently this server-side context has no idea how to + // build final URLs, so we need to defer that to the client. + // The client will check for __redirect and __notFound keys, + // and if they exist, it will handle them appropriately. + + if (isNotFound(error)) { + return isNotFoundResponse(error) + } + + console.error('Server Fn Error!', error) + + const serializedError = JSON.stringify( + await toCrossJSONAsync(error, { + refs: new Map(), + plugins: serovalPlugins, + }), + ) + const response = getResponse() + const headers = { + 'Content-Type': 'application/json', + [X_TSS_SERIALIZED]: 'true', + } + try { return new Response(serializedError, { status: response.status ?? 500, statusText: response.statusText, + headers, + }) + } catch { + return new Response(serializedError, { + status: 500, + statusText: '', + headers, + }) + } + } +} + +/** + * Serializes a server-function result. A result that Seroval completes + * synchronously without RawStreams becomes plain JSON; everything else is a + * framed response whose records and raw streams are multiplexed in order. + */ +function serializeResult( + res: unknown, + signal: AbortSignal, + plugins: Array>, +): Response { + const alsResponse = getResponse() + const initialRecords: Array = [] + let initialBytes = 0 + const pendingRawStreams: Array = [] + + // Seroval replays synchronously discovered work before returning. Collect + // that first pass so a complete result can skip framing entirely. + let done = false as boolean + let initialParsed = false + let serializationFailure: [unknown] | undefined + let disposeSerialization: (() => void) | undefined + let onParse = (value: any, initial: boolean) => { + if (serializationFailure) { + return + } + initialParsed ||= initial + const record = encodeSerializationRecord(value) + if ( + exceedsPendingSerializationLimit( + record, + initialRecords.length, + initialBytes, + ) + ) { + serializationFailure = [ + new Error( + 'Server function serialization exceeded its pending output limit', + ), + ] + return + } + initialRecords.push(record) + initialBytes += record.byteLength + } + let onDone = () => { + if (initialParsed) { + done = true + } + } + let onError = (error: any) => { + serializationFailure ??= [error] + } + const rawStreamPlugin = createRawStreamRPCPlugin( + (id: number, stream: ReadableStream) => { + if (serializationFailure) { + cancelRawStream(stream, serializationFailure[0]) + return + } + if (id > MAX_FRAMED_STREAMS) { + const error = new Error( + `Too many raw streams in framed response (max ${MAX_FRAMED_STREAMS})`, + ) + cancelRawStream(stream, error) + onError(error) + return + } + pendingRawStreams.push({ id, stream }) + }, + ) + + const dispose = toCrossJSONStream(res, { + refs: new Map(), + plugins: [rawStreamPlugin, ...plugins], + onParse(value, initial) { + onParse(value, initial) + }, + onDone() { + onDone() + }, + onError: (error) => { + onError(error) + }, + }) + if (serializationFailure) { + runSerializationCleanup(dispose) + for (const registration of pendingRawStreams) { + cancelRawStream(registration.stream, serializationFailure[0]) + } + throw serializationFailure[0] + } + if (!done) { + disposeSerialization = dispose + } + + if (done && pendingRawStreams.length === 0 && initialRecords.length === 1) { + // TextEncoder always creates an ArrayBuffer-backed Uint8Array. + return new Response(initialRecords[0]! as BodyInit, { + status: alsResponse.status, + statusText: alsResponse.statusText, + headers: { + 'Content-Type': 'application/json', + [X_TSS_SERIALIZED]: 'true', + }, + }) + } + + if (done && initialRecords.length === 1) { + const json = initialRecords[0]! + if (json.byteLength > MAX_FRAME_PAYLOAD_SIZE) { + const error = new Error( + 'Server function serialization exceeded its pending output limit', + ) + for (const registration of pendingRawStreams) { + cancelRawStream(registration.stream, error) + } + throw error + } + + // Serialization is complete, so this one bounded record needs no writer + // or pending-serialization lifecycle. The mux still controls raw demand. + const rawStreams = pendingRawStreams.splice(0) + initialRecords.length = 0 + return createFramedResponse( + new ReadableStream({ + start(controller) { + controller.enqueue({ json, rawStreams }) + controller.close() + }, + cancel(reason) { + for (const registration of rawStreams) { + cancelRawStream(registration.stream, reason) + } + }, + }), + { signal }, + ) + } + + // Couple every JSON patch to the RawStreams it introduces. The mux admits + // each JSON reference before it starts that stream's chunks. + const { readable, writable } = new TransformStream() + const writer = writable.getWriter() + const recordAbortController = new AbortController() + let pendingBytes = 0 + const pendingRecords = new Set() + + const abortRecordStream = (error: unknown) => { + if (serializationFailure) { + return + } + serializationFailure = [error] + const disposeCurrentSerialization = disposeSerialization + disposeSerialization = undefined + for (const registration of pendingRawStreams.splice(0)) { + cancelRawStream(registration.stream, error) + } + for (const record of pendingRecords) { + for (const registration of record.rawStreams) { + cancelRawStream(registration.stream, error) + } + } + pendingRecords.clear() + recordAbortController.abort(error) + void writer.abort(error).catch(() => {}) + if (disposeCurrentSerialization) { + runSerializationCleanup(disposeCurrentSerialization) + } + } + + const writeRecord = ( + json: Uint8Array, + rawStreams: Array, + ) => { + if (serializationFailure) { + for (const registration of rawStreams) { + cancelRawStream(registration.stream, serializationFailure[0]) + } + return false + } + + if ( + json.byteLength > MAX_FRAME_PAYLOAD_SIZE || + exceedsPendingSerializationLimit(json, pendingRecords.size, pendingBytes) + ) { + const error = new Error( + 'Server function serialization exceeded its pending output limit', + ) + for (const registration of rawStreams) { + cancelRawStream(registration.stream, error) + } + onError(error) + return false + } + + pendingBytes += json.byteLength + const record = { json, rawStreams } + pendingRecords.add(record) + void writer.write(record).then( + () => { + pendingRecords.delete(record) + pendingBytes -= json.byteLength + }, + (error) => { + const stillOwned = pendingRecords.delete(record) + pendingBytes -= json.byteLength + if (stillOwned) { + for (const registration of rawStreams) { + cancelRawStream(registration.stream, error) + } + } + }, + ) + return true + } + + onParse = (value) => { + if (serializationFailure) { + return + } + writeRecord(encodeSerializationRecord(value), pendingRawStreams.splice(0)) + } + onDone = () => { + if (serializationFailure) { + return + } + disposeSerialization = undefined + void writer.close().catch(() => {}) + } + onError = (error) => { + abortRecordStream(error) + } + + // Seroval buffers nested patches during its initial traversal. Their + // RawStream callbacks may precede the root callback, so start every + // synchronously discovered stream only after all initial records. + const initialRawStreams = pendingRawStreams.splice(0) + for (let index = 0; index < initialRecords.length; index++) { + const isLast = index === initialRecords.length - 1 + if (!writeRecord(initialRecords[index]!, isLast ? initialRawStreams : [])) { + // `writeRecord` recorded the failure. Nothing was handed to the client + // yet, so fail the whole call. + if (!isLast) { + for (const registration of initialRawStreams) { + cancelRawStream(registration.stream, serializationFailure![0]) + } + } + initialRecords.length = 0 + throw serializationFailure![0] + } + } + initialRecords.length = 0 + if (done) { + onDone() + } + + void writer.closed.catch((error) => { + abortRecordStream(error) + }) + + return createFramedResponse(readable, { + signal: AbortSignal.any([recordAbortController.signal, signal]), + onCancel: abortRecordStream, + }) + + function createFramedResponse( + records: ReadableStream, + options: MultiplexedStreamOptions, + ) { + const multiplexedStream = createMultiplexedStream(records, options) + try { + return new Response(multiplexedStream, { + status: alsResponse.status, + statusText: alsResponse.statusText, headers: { - 'Content-Type': 'application/json', + 'Content-Type': TSS_CONTENT_TYPE_FRAMED_VERSIONED, [X_TSS_SERIALIZED]: 'true', }, }) + } catch (error) { + cancelRawStream(multiplexedStream, error) + throw error } - })() - - return response + } } function isNotFoundResponse(error: any) { diff --git a/packages/start-server-core/tests/createStartHandler.test.ts b/packages/start-server-core/tests/createStartHandler.test.ts index ad4ed5870a..18bbbcb9f2 100644 --- a/packages/start-server-core/tests/createStartHandler.test.ts +++ b/packages/start-server-core/tests/createStartHandler.test.ts @@ -1,44 +1,48 @@ // @vitest-environment node -import { - afterAll, - afterEach, - describe, - expect, - it, - onTestFinished, - vi, -} from 'vitest' +import { ReadableStream as NodeReadableStream } from 'node:stream/web' +import { afterAll, afterEach, describe, expect, it, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' -import { createMiddleware } from '@tanstack/start-client-core' +import { + createMiddleware, + getRouterInstance, +} from '@tanstack/start-client-core' import { BaseRootRoute, BaseRoute, RouterCore, - redirect, - type AnyRouter, -} from '@tanstack/router-core' -import { createNonReactiveMutableStore, createNonReactiveReadonlyStore, + redirect, } from '@tanstack/router-core' import { attachRouterServerSsrUtils, createSsrStreamResponse, + transformReadableStreamWithRouter, } from '@tanstack/router-core/ssr/server' -import { createStartHandler } from '../src/createStartHandler' +import { + createStartHandler, + transferResponseBodyOwnership, +} from '../src/createStartHandler' import { getStaticHandlerInlineCssDefault, resolveInlineCssForRequest, } from '../src/inlineCss' +import type { AnyRouter } from '@tanstack/router-core' const startMocks = vi.hoisted(() => { + const hadServerFnBase = Object.prototype.hasOwnProperty.call( + process.env, + 'TSS_SERVER_FN_BASE', + ) const previousServerFnBase = process.env.TSS_SERVER_FN_BASE process.env.TSS_SERVER_FN_BASE = '/_serverFn/' return { + hadServerFnBase, previousServerFnBase, requestMiddleware: [] as Array, serverFnResult: undefined as undefined | Response | object, + serverFnHandler: undefined as undefined | (() => unknown), router: undefined as undefined | AnyRouter, routerFactory: undefined as undefined | (() => AnyRouter), } @@ -58,7 +62,10 @@ vi.mock('#tanstack-router-entry', () => ({ })) vi.mock('../src/server-functions-handler', () => ({ - handleServerAction: () => startMocks.serverFnResult, + handleServerAction: () => + startMocks.serverFnHandler + ? startMocks.serverFnHandler() + : startMocks.serverFnResult, })) const getStoreConfig = () => ({ @@ -67,12 +74,13 @@ const getStoreConfig = () => ({ batch: (fn: () => void) => fn(), }) -function makeRouter() { +function makeRouter(routeOptions: Record = {}) { const rootRoute = new BaseRootRoute({}) const indexRoute = new BaseRoute({ getParentRoute: () => rootRoute, path: '/', component: () => null, + ...routeOptions, }) const router = new RouterCore( { @@ -117,29 +125,50 @@ function waitForAbortOrRelease(signal: AbortSignal) { }) } -function makeStreamResponse(router: ReturnType) { +function makeStreamResponse( + router: ReturnType, + onCancel?: (reason?: unknown) => void, +) { attachRouterServerSsrUtils({ router: router as any, manifest: undefined }) const stream = new ReadableStream({ start(controller) { controller.enqueue(new TextEncoder().encode('stream')) }, - cancel() { + cancel(reason) { + onCancel?.(reason) router.serverSsr?.cleanup() }, }) return createSsrStreamResponse(router as any, new Response(stream)) } +function makeCompletingStreamResponse(router: ReturnType) { + attachRouterServerSsrUtils({ router: router as any, manifest: undefined }) + router.serverSsr!.disableHydration() + const source = new NodeReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode('stream')) + controller.close() + }, + }) + const stream = transformReadableStreamWithRouter(router as any, source) + return createSsrStreamResponse( + router as any, + new Response(stream as unknown as BodyInit), + ) +} + afterEach(() => { startMocks.requestMiddleware = [] startMocks.serverFnResult = undefined + startMocks.serverFnHandler = undefined startMocks.router = undefined startMocks.routerFactory = undefined vi.unstubAllEnvs() }) afterAll(() => { - if (startMocks.previousServerFnBase === undefined) { + if (!startMocks.hadServerFnBase) { delete (process.env as Partial).TSS_SERVER_FN_BASE } else { process.env.TSS_SERVER_FN_BASE = startMocks.previousServerFnBase @@ -578,6 +607,48 @@ it('keeps the request URL when server code attempts navigation', async () => { expect(load).toHaveBeenCalledTimes(1) }) +describe('createStartHandler router request Accept handling', () => { + it('returns 406 JSON for router requests that do not accept HTML', async () => { + startMocks.routerFactory = vi.fn(makeRouter) + const render = vi.fn(() => new Response('must not render')) + const handler = createStartHandler(render) + + const response = await handler( + new Request('http://localhost/', { + headers: { accept: 'application/json' }, + }), + {}, + ) + + expect(response.status).toBe(406) + expect(response.headers.get('content-type')).toContain('application/json') + expect(await response.json()).toEqual({ + error: 'Only HTML requests are supported here', + }) + expect(render).not.toHaveBeenCalled() + }) + + it.each(['text/html', '*/*', undefined])( + 'does not return 406 for Accept: %s', + async (accept) => { + startMocks.routerFactory = vi.fn(makeRouter) + const render = vi.fn(() => new Response('ok')) + const handler = createStartHandler(render) + + const response = await handler( + new Request('http://localhost/', { + headers: accept === undefined ? undefined : { accept }, + }), + {}, + ) + + expect(response.status).not.toBe(406) + expect(await response.text()).toBe('ok') + expect(render).toHaveBeenCalledTimes(1) + }, + ) +}) + describe('createStartHandler SSR cleanup ownership', () => { it('preserves serverFn stream cleanup ownership through early return', async () => { startMocks.requestMiddleware = [] @@ -603,6 +674,54 @@ describe('createStartHandler SSR cleanup ownership', () => { expect(router.serverSsr).toBeUndefined() }) + it('does not cancel the returned response when an inner result settles late', async () => { + let resolveInner!: (response: Response) => void + startMocks.serverFnHandler = () => + new Promise((resolve) => { + resolveInner = resolve + }) + const timeoutCancel = vi.fn() + const timeoutResponse = new Response( + new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode('timeout')) + controller.close() + }, + cancel: timeoutCancel, + }), + { status: 504 }, + ) + startMocks.requestMiddleware = [ + createMiddleware().server(({ next }) => + Promise.race([ + next(), + new Promise((resolve) => + setTimeout(() => resolve(timeoutResponse), 5), + ), + ]), + ), + ] + + const handler = createStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + expect(response.status).toBe(504) + + const innerCancel = vi.fn() + resolveInner(new Response(new ReadableStream({ cancel: innerCancel }))) + await new Promise((resolve) => setTimeout(resolve, 20)) + + expect(timeoutCancel).not.toHaveBeenCalled() + expect(innerCancel).toHaveBeenCalledExactlyOnceWith( + 'late middleware response', + ) + expect(await response.text()).toBe('timeout') + }) + it('disposes stream response replaced by middleware result', async () => { const router = makeRouter() startMocks.router = router @@ -691,6 +810,77 @@ describe('createStartHandler SSR cleanup ownership', () => { expect(router.serverSsr).toBeUndefined() }) + it.each(['return', 'mutate', 'throw'] as const)( + 'cancels a plain stream that outer middleware replaces via %s', + async (mode) => { + const router = makeRouter() + startMocks.router = router + const cancel = vi.fn(() => new Promise(() => {})) + startMocks.serverFnResult = new Response(new ReadableStream({ cancel })) + const replacement = new Response('replacement') + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + if (mode === 'return') { + return replacement + } + if (mode === 'throw') { + throw replacement + } + result.response = replacement + return result + }), + ] + + const handler = createStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response).toBe(replacement) + expect(cancel).toHaveBeenCalledOnce() + expect(cancel).toHaveBeenCalledWith('middleware response replaced') + }, + ) + + it('preserves a plain stream when middleware pipes the body', async () => { + const router = makeRouter() + startMocks.router = router + const cancel = vi.fn() + startMocks.serverFnResult = new Response( + new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode('stream')) + controller.close() + }, + cancel, + }), + ) + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + return new Response( + result.response.body!.pipeThrough(new TransformStream()), + result.response, + ) + }), + ] + + const handler = createStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + await expect(response.text()).resolves.toBe('stream') + expect(cancel).not.toHaveBeenCalled() + }) + it('preserves stream ownership when middleware wraps same body', async () => { const router = makeRouter() startMocks.router = router @@ -725,15 +915,301 @@ describe('createStartHandler SSR cleanup ownership', () => { expect(router.serverSsr).toBeUndefined() }) - it('disposes stream response on middleware error after next', async () => { + it('preserves stream ownership when middleware pipes the body', async () => { + const router = makeRouter() + startMocks.router = router + const ssrResponse = makeCompletingStreamResponse(router) + startMocks.serverFnResult = ssrResponse + const dispose = vi.spyOn(ssrResponse as any, 'dispose') + let wrappedResponse: Response | undefined + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + wrappedResponse = transferResponseBodyOwnership( + result.response, + new Response( + result.response.body!.pipeThrough(new TransformStream()), + result.response, + ), + ) + return wrappedResponse + }), + ] + + const handler = createStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response).toBe(wrappedResponse) + expect(dispose).not.toHaveBeenCalled() + await expect(response.text()).resolves.toBe('stream') + expect(router.serverSsr).toBeUndefined() + }) + + it.each([false, true])( + 'cancels a derived body after handoff with a router transform: %s', + async (useRouterTransform) => { + const router = makeRouter() + startMocks.router = router + const sourceCancel = vi.fn() + const source = new ReadableStream({ cancel: sourceCancel }) + let dispose: ReturnType + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + return transferResponseBodyOwnership( + result.response, + new Response( + result.response.body!.pipeThrough(new TransformStream()), + result.response, + ), + ) + }), + ] + const requestController = new AbortController() + const handler = createStartHandler( + ({ router: requestRouter, request }) => { + const responseBody = useRouterTransform + ? transformReadableStreamWithRouter(requestRouter, source, { + signal: request.signal, + }) + : source + const ssrResponse = createSsrStreamResponse( + requestRouter, + new Response(responseBody), + ) + dispose = vi.spyOn(ssrResponse, 'dispose') + return ssrResponse + }, + ) + const response = await handler( + new Request('http://localhost/', { + signal: requestController.signal, + }), + {}, + ) + const derivedCancel = vi.spyOn(response.body!, 'cancel') + const reason = new Error('request disconnected') + + expect(source.locked).toBe(true) + requestController.abort(reason) + + await vi.waitFor(() => { + expect(dispose).toHaveBeenCalledExactlyOnceWith(reason) + expect(derivedCancel).toHaveBeenCalledExactlyOnceWith(reason) + expect(sourceCancel).toHaveBeenCalledExactlyOnceWith(reason) + expect(source.locked).toBe(false) + expect(router.serverSsr).toBeUndefined() + }) + }, + ) + + it('preserves both Response.clone() branches when the clone is assigned', async () => { + const router = makeRouter() + startMocks.router = router + const ssrResponse = makeCompletingStreamResponse(router) + startMocks.serverFnResult = ssrResponse + const dispose = vi.spyOn(ssrResponse as any, 'dispose') + let siblingResponse!: Response + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + siblingResponse = result.response + result.response = transferResponseBodyOwnership( + siblingResponse, + siblingResponse.clone(), + ) + return result + }), + ] + + const handler = createStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(dispose).not.toHaveBeenCalled() + await expect( + Promise.all([response.text(), siblingResponse.text()]), + ).resolves.toEqual(['stream', 'stream']) + expect(router.serverSsr).toBeUndefined() + }) + + it('disposes a piped stream that outer middleware replaces', async () => { + const router = makeRouter() + startMocks.router = router + const ssrResponse = makeCompletingStreamResponse(router) + startMocks.serverFnResult = ssrResponse + const dispose = vi.spyOn(ssrResponse as any, 'dispose') + const replacement = new Response('replacement') + let derivedCancel!: ReturnType + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + await next() + expect(dispose).not.toHaveBeenCalled() + return replacement + }), + createMiddleware().server(async ({ next }) => { + const result = await next() + const response = transferResponseBodyOwnership( + result.response, + new Response( + result.response.body!.pipeThrough(new TransformStream()), + result.response, + ), + ) + derivedCancel = vi.spyOn(response.body!, 'cancel') + return response + }), + ] + + const handler = createStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response).toBe(replacement) + expect(dispose).toHaveBeenCalledOnce() + expect(derivedCancel).toHaveBeenCalledWith('middleware response replaced') + expect(router.serverSsr).toBeUndefined() + }) + + it('refreshes a cloned response before an outer replacement', async () => { + const router = makeRouter() + startMocks.router = router + const ssrResponse = makeCompletingStreamResponse(router) + startMocks.serverFnResult = ssrResponse + const dispose = vi.spyOn(ssrResponse as any, 'dispose') + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => undefined) + const replacement = new Response('replacement') + let ownerBody!: ReadableStream + let cloneCancellation!: Promise + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + await next() + return replacement + }), + createMiddleware().server(async ({ next }) => { + const result = await next() + cloneCancellation = result.response.clone().body!.cancel('not used') + ownerBody = result.response.body! + vi.spyOn(ownerBody, 'cancel') + return result + }), + ] + + try { + const handler = createStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response).toBe(replacement) + await expect(response.text()).resolves.toBe('replacement') + expect(dispose).toHaveBeenCalledOnce() + expect(ownerBody.cancel).toHaveBeenCalledOnce() + await cloneCancellation + expect(router.serverSsr).toBeUndefined() + await Promise.resolve() + await Promise.resolve() + expect(consoleError).not.toHaveBeenCalled() + } finally { + consoleError.mockRestore() + } + }) + + it('disposes a locked stream that middleware replaces with no body', async () => { + const router = makeRouter() + startMocks.router = router + const ssrResponse = makeCompletingStreamResponse(router) + startMocks.serverFnResult = ssrResponse + const dispose = vi.spyOn(ssrResponse as any, 'dispose') + let reader: ReadableStreamDefaultReader | undefined + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + reader = result.response.body!.getReader() + return new Response(null, { status: 204 }) + }), + ] + + const handler = createStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response.status).toBe(204) + expect(response.body).toBeNull() + expect(dispose).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + reader?.releaseLock() + }) + + it('disposes a locked stream replaced by an unrelated body', async () => { const router = makeRouter() startMocks.router = router const ssrResponse = makeStreamResponse(router) startMocks.serverFnResult = ssrResponse const dispose = vi.spyOn(ssrResponse as any, 'dispose') + const replacement = new Response('replacement') + let reader: ReadableStreamDefaultReader | undefined startMocks.requestMiddleware = [ createMiddleware().server(async ({ next }) => { - await next() + const result = await next() + reader = result.response.body!.getReader() + return replacement + }), + ] + + try { + const handler = createStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response).toBe(replacement) + await expect(response.text()).resolves.toBe('replacement') + expect(dispose).toHaveBeenCalledOnce() + expect(dispose).toHaveBeenCalledWith('middleware response replaced') + expect(router.serverSsr).toBeUndefined() + } finally { + await reader?.cancel('test cleanup') + reader?.releaseLock() + } + }) + + it('disposes an in-place replacement on middleware error', async () => { + const router = makeRouter() + startMocks.router = router + const ssrResponse = makeStreamResponse(router) + startMocks.serverFnResult = ssrResponse + const dispose = vi.spyOn(ssrResponse as any, 'dispose') + const cancel = vi.fn() + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + result.response = new Response(new ReadableStream({ cancel })) throw new Error('middleware failed') }), ] @@ -748,6 +1224,7 @@ describe('createStartHandler SSR cleanup ownership', () => { expect(response.status).toBe(500) expect(dispose).toHaveBeenCalledOnce() + expect(cancel).toHaveBeenCalledOnce() expect(router.serverSsr).toBeUndefined() }) @@ -760,7 +1237,8 @@ describe('createStartHandler SSR cleanup ownership', () => { const replacement = new Response('handled', { status: 418 }) startMocks.requestMiddleware = [ createMiddleware().server(async ({ next }) => { - await next() + const result = await next() + result.response = result.response.clone() throw replacement }), ] @@ -778,6 +1256,36 @@ describe('createStartHandler SSR cleanup ownership', () => { expect(router.serverSsr).toBeUndefined() }) + it('disposes a side-cloned stream before an unrelated thrown response', async () => { + const router = makeRouter() + startMocks.router = router + const ssrResponse = makeCompletingStreamResponse(router) + startMocks.serverFnResult = ssrResponse + const dispose = vi.spyOn(ssrResponse as any, 'dispose') + const replacement = new Response('handled', { status: 418 }) + let cloneCancellation!: Promise + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + cloneCancellation = result.response.clone().body!.cancel('not used') + throw replacement + }), + ] + + const handler = createStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response).toBe(replacement) + expect(dispose).toHaveBeenCalledOnce() + await cloneCancellation + expect(router.serverSsr).toBeUndefined() + }) + it('honors in-place response assignment on returned context', async () => { const router = makeRouter() startMocks.router = router @@ -807,6 +1315,519 @@ describe('createStartHandler SSR cleanup ownership', () => { }) }) +describe('createStartHandler router initialization', () => { + it('shares one router between concurrent request-context reads', async () => { + let factoryCalls = 0 + let instances: Array = [] + startMocks.routerFactory = () => { + factoryCalls++ + return makeRouter() + } + startMocks.serverFnHandler = async () => { + instances = await Promise.all([getRouterInstance(), getRouterInstance()]) + return new Response('ok') + } + + const handler = createStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + await expect(response.text()).resolves.toBe('ok') + expect(factoryCalls).toBe(1) + expect(instances[0]).toBe(instances[1]) + }) + + it('shares one router failure between sequential request-context reads', async () => { + const factoryError = new Error('router factory failed') + const errors: Array = [] + let factoryCalls = 0 + startMocks.routerFactory = () => { + factoryCalls++ + throw factoryError + } + startMocks.serverFnHandler = async () => { + for (let attempt = 0; attempt < 2; attempt++) { + try { + await getRouterInstance() + } catch (error) { + errors.push(error) + } + } + return new Response('ok') + } + + const handler = createStartHandler(() => new Response('unused')) + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + await expect(response.text()).resolves.toBe('ok') + expect(factoryCalls).toBe(1) + expect(errors).toEqual([factoryError, factoryError]) + }) + + it('does not start the router factory from a continuation after request abort', async () => { + const requestController = new AbortController() + const reason = new Error('request aborted') + let factoryCalls = 0 + let lateError: unknown + let continueServerFn!: () => void + const serverFnCanContinue = new Promise((resolve) => { + continueServerFn = resolve + }) + let notifyServerFnStarted!: () => void + const serverFnStarted = new Promise((resolve) => { + notifyServerFnStarted = resolve + }) + let notifyLateReadFinished!: () => void + const lateReadFinished = new Promise((resolve) => { + notifyLateReadFinished = resolve + }) + + startMocks.routerFactory = () => { + factoryCalls++ + return makeRouter() + } + startMocks.serverFnHandler = async () => { + notifyServerFnStarted() + await serverFnCanContinue + try { + await getRouterInstance() + } catch (error) { + lateError = error + } + notifyLateReadFinished() + return new Response('late') + } + + const handler = createStartHandler(() => new Response('unused')) + const response = handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + signal: requestController.signal, + }), + {}, + ) + + await serverFnStarted + requestController.abort(reason) + expect((await response).status).toBe(500) + + continueServerFn() + await lateReadFinished + expect(factoryCalls).toBe(0) + expect(lateError).toBe(reason) + }) +}) + +describe('createStartHandler direct server routes', () => { + it('disposes a thrown sole-terminal response when the request aborts after the fast-path check', async () => { + const requestController = new AbortController() + const cancellation = new Error('request disconnected') + const cancel = vi.fn() + const thrownResponse = new Response( + new ReadableStream({ cancel }), + ) + // Abort during the `instanceof Response` check, immediately after the + // fast path's first abort check has passed. + const responsePrototype = new Proxy(Response.prototype, { + getPrototypeOf() { + requestController.abort(cancellation) + return Response.prototype + }, + }) + Object.setPrototypeOf(thrownResponse, responsePrototype) + startMocks.serverFnHandler = () => { + throw thrownResponse + } + const handler = createStartHandler(() => new Response('unused')) + + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + signal: requestController.signal, + }), + {}, + ) + + expect(response.status).toBe(500) + await vi.waitFor(() => { + expect(cancel).toHaveBeenCalledOnce() + expect(cancel).toHaveBeenCalledWith(cancellation) + }) + }) + + it.each([ + ['Response', 'sole-terminal'], + ['SsrResponse', 'sole-terminal'], + ['Response', 'middleware-chain'], + ['SsrResponse', 'middleware-chain'], + ] as const)( + 'does not read context from a direct %s result in the %s path', + async (resultType, executionPath) => { + if (executionPath === 'middleware-chain') { + startMocks.requestMiddleware = [ + createMiddleware().server(({ next }) => next()), + ] + } + const directResponse = new Response(resultType, { status: 202 }) + const directResult = + resultType === 'Response' + ? directResponse + : { response: directResponse, serverSsrCleanup: 'none' as const } + const contextGetter = vi.fn(() => { + throw new Error('direct response context must not be read') + }) + Object.defineProperty(directResult, 'context', { + get: contextGetter, + }) + startMocks.serverFnHandler = () => directResult + const handler = createStartHandler(() => new Response('unused')) + + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + }), + {}, + ) + + expect(response.status).toBe(202) + await expect(response.text()).resolves.toBe(resultType) + expect(contextGetter).not.toHaveBeenCalled() + }, + ) + + it('does not invoke the sole terminal after abort while copying request context', async () => { + const requestController = new AbortController() + const cancellation = new Error('request disconnected') + const serverFnHandler = vi.fn(() => new Response('must not run')) + const requestContext = {} as { abort: boolean } + Object.defineProperty(requestContext, 'abort', { + enumerable: true, + get() { + requestController.abort(cancellation) + return true + }, + }) + startMocks.serverFnHandler = serverFnHandler + const handler = createStartHandler<{ + server: { requestContext: { abort: boolean } } + }>(() => new Response('unused')) + + const response = await handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + signal: requestController.signal, + }), + { context: requestContext }, + ) + + expect(response.status).toBe(500) + expect(serverFnHandler).not.toHaveBeenCalled() + }) + + it('does not invoke a direct handler when its handler factory aborts', async () => { + const requestController = new AbortController() + const cancellation = new Error('request disconnected') + const routeHandler = vi.fn(() => new Response('must not run')) + const handlers = vi.fn(() => { + requestController.abort(cancellation) + return { GET: routeHandler } + }) + const router = makeRouter({ + component: undefined, + server: { handlers }, + }) + startMocks.router = router + const render = vi.fn(() => new Response('must not render')) + const handler = createStartHandler(render) + + const response = await handler( + new Request('http://localhost/', { + signal: requestController.signal, + }), + {}, + ) + + expect(response.status).toBe(500) + expect(handlers).toHaveBeenCalledOnce() + expect(routeHandler).not.toHaveBeenCalled() + expect(render).not.toHaveBeenCalled() + }) + + it('returns an exact non-component handler response without rendering a document', async () => { + const routeHandler = vi.fn(() => new Response('direct', { status: 201 })) + const router = makeRouter({ + component: undefined, + server: { + handlers: { + GET: routeHandler, + }, + }, + }) + startMocks.router = router + const render = vi.fn(() => new Response('must not render')) + const handler = createStartHandler(render) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(201) + await expect(response.text()).resolves.toBe('direct') + expect(routeHandler).toHaveBeenCalledOnce() + expect(render).not.toHaveBeenCalled() + expect(router.serverSsr).toBeUndefined() + }) + + it('preserves request context, params, and pathname for a direct handler', async () => { + const routeHandler = vi.fn( + ({ context, params, pathname, handlerType, request }: any) => + Response.json({ + context, + params, + pathname, + handlerType, + requestUrl: request.url, + }), + ) + const router = makeRouter({ + path: '/items/$itemId', + component: undefined, + server: { + handlers: { + GET: routeHandler, + }, + }, + }) + startMocks.router = router + const render = vi.fn(() => new Response('must not render')) + const handler = createStartHandler<{ + server: { requestContext: { requestValue: string } } + }>(render) + + const response = await handler( + new Request('http://localhost/items/42?source=test'), + { context: { requestValue: 'preserved' } }, + ) + + await expect(response.json()).resolves.toMatchObject({ + context: { requestValue: 'preserved' }, + params: { itemId: '42' }, + pathname: '/items/42', + handlerType: 'router', + requestUrl: 'http://localhost/items/42?source=test', + }) + expect(render).not.toHaveBeenCalled() + }) + + it.each(['route', 'handler'] as const)( + 'runs %s middleware instead of incorrectly taking the direct path', + async (placement) => { + const events: Array = [] + const middleware = createMiddleware().server(async ({ next }) => { + events.push('middleware before') + const result = await next({ + context: { middlewarePlacement: placement }, + }) + events.push('middleware after') + result.response.headers.set('x-middleware', placement) + return result + }) + const routeHandler = vi.fn(({ context }: any) => { + events.push('handler') + return Response.json(context) + }) + const handlers = { + GET: + placement === 'handler' + ? { middleware: [middleware], handler: routeHandler } + : routeHandler, + } + const router = makeRouter({ + component: undefined, + server: { + ...(placement === 'route' ? { middleware: [middleware] } : {}), + handlers, + }, + }) + startMocks.router = router + const render = vi.fn(() => new Response('must not render')) + const handler = createStartHandler(render) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.headers.get('x-middleware')).toBe(placement) + await expect(response.json()).resolves.toMatchObject({ + middlewarePlacement: placement, + }) + expect(events).toEqual([ + 'middleware before', + 'handler', + 'middleware after', + ]) + expect(render).not.toHaveBeenCalled() + }, + ) + + it('rejects a missing direct response before middleware resumes', async () => { + const afterNext = vi.fn() + const middleware = createMiddleware().server(async ({ next }) => { + await next() + afterNext() + return new Response('must not return') + }) + const router = makeRouter({ + component: undefined, + server: { + middleware: [middleware], + handlers: { GET: () => undefined }, + }, + }) + startMocks.router = router + const handler = createStartHandler(() => new Response('must not render')) + + const response = await handler(new Request('http://localhost/'), {}) + + expect(response.status).toBe(500) + expect(afterNext).not.toHaveBeenCalled() + }) + + it('lets a component route handler defer to document rendering with next', async () => { + const routeHandler = vi.fn(({ next }: any) => next()) + const router = makeRouter({ + server: { + handlers: { + GET: routeHandler, + }, + }, + }) + startMocks.router = router + const render = vi.fn(() => new Response('rendered document')) + const handler = createStartHandler(render) + + const response = await handler(new Request('http://localhost/'), {}) + + await expect(response.text()).resolves.toBe('rendered document') + expect(routeHandler).toHaveBeenCalledOnce() + expect(render).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + }) + + it('cancels a direct handler body that resolves after request abort', async () => { + const requestController = new AbortController() + const cancellation = new Error('request disconnected') + let notifyHandlerStarted!: () => void + const handlerStarted = new Promise((resolve) => { + notifyHandlerStarted = resolve + }) + let resolveHandler!: (response: Response) => void + const handlerResult = new Promise((resolve) => { + resolveHandler = resolve + }) + const routeHandler = vi.fn(() => { + notifyHandlerStarted() + return handlerResult + }) + const router = makeRouter({ + component: undefined, + server: { + handlers: { + GET: routeHandler, + }, + }, + }) + startMocks.router = router + const render = vi.fn(() => new Response('must not render')) + const handler = createStartHandler(render) + const response = handler( + new Request('http://localhost/', { + signal: requestController.signal, + }), + {}, + ) + + await handlerStarted + requestController.abort(cancellation) + expect((await response).status).toBe(500) + + const cancel = vi.fn((_reason: unknown) => new Promise(() => {})) + resolveHandler(new Response(new ReadableStream({ cancel }))) + + await vi.waitFor(() => { + expect(cancel).toHaveBeenCalledOnce() + expect(cancel).toHaveBeenCalledWith(cancellation) + }) + expect(render).not.toHaveBeenCalled() + }) +}) + +describe('createStartHandler HEAD fallback', () => { + it('strips and disposes the rendered document body', async () => { + const router = makeRouter() + startMocks.router = router + const cancel = vi.fn() + let cleanupEffects = 0 + + const handler = createStartHandler(({ router: requestRouter }) => { + requestRouter.serverSsr!.onCleanup(() => { + cleanupEffects++ + }) + return createSsrStreamResponse( + requestRouter, + new Response(new ReadableStream({ cancel }), { + headers: { 'x-rendered': 'true' }, + status: 201, + }), + ) + }) + const response = await handler( + new Request('http://localhost/', { method: 'HEAD' }), + {}, + ) + + expect(response.status).toBe(201) + expect(response.headers.get('x-rendered')).toBe('true') + expect(response.body).toBeNull() + expect(cancel).toHaveBeenCalledOnce() + expect(cancel).toHaveBeenCalledWith('HEAD body stripped') + expect(cleanupEffects).toBe(1) + expect(router.serverSsr).toBeUndefined() + }) + + it('cancels a plain streaming GET body before stripping it', async () => { + const cancel = vi.fn() + const router = makeRouter({ + server: { + handlers: { + GET: () => + new Response( + new ReadableStream({ + cancel, + }), + ), + }, + }, + }) + startMocks.router = router + + const handler = createStartHandler(() => new Response('must not render')) + const response = await handler( + new Request('http://localhost/', { method: 'HEAD' }), + {}, + ) + + expect(response.body).toBeNull() + expect(cancel).toHaveBeenCalledOnce() + expect(cancel).toHaveBeenCalledWith('HEAD body stripped') + }) +}) + describe('createStartHandler request cancellation', () => { it.each(['beforeLoad', 'loader'] as const)( 'aborts route %s work and does not render HTML', @@ -864,16 +1885,14 @@ describe('createStartHandler request cancellation', () => { >((resolve) => { resolveRender = resolve }) - let cleanupCalls = 0 + let cleanupEffects = 0 let cancelCalls = 0 let lateStreamResponse!: ReturnType const handler = createStartHandler(({ router: requestRouter }) => { const serverSsr = requestRouter.serverSsr! - const cleanup = serverSsr.cleanup - serverSsr.cleanup = () => { - cleanupCalls++ - cleanup() - } + serverSsr.onCleanup(() => { + cleanupEffects++ + }) lateStreamResponse = createSsrStreamResponse( requestRouter, new Response( @@ -899,13 +1918,13 @@ describe('createStartHandler request cancellation', () => { requestController.abort(new Error('request disconnected')) expect((await response).status).toBe(500) - expect(cleanupCalls).toBe(1) + expect(cleanupEffects).toBe(1) expect(router.serverSsr).toBeUndefined() resolveRender(lateStreamResponse) await Promise.resolve() await Promise.resolve() - expect(cleanupCalls).toBe(1) + expect(cleanupEffects).toBe(1) expect(cancelCalls).toBe(1) expect(router.serverSsr).toBeUndefined() }) @@ -946,80 +1965,28 @@ describe('createStartHandler request cancellation', () => { }) }) - it('cancels a plain response resolved by request middleware later', async () => { - const router = makeRouter() - startMocks.router = router - const requestController = new AbortController() - let notifyMiddlewareStarted!: () => void - const middlewareStarted = new Promise((resolve) => { - notifyMiddlewareStarted = resolve - }) - let resolveMiddleware!: (value: Response) => void - const middlewareResult = new Promise((resolve) => { - resolveMiddleware = resolve - }) - const cancel = vi.fn((_reason: unknown) => new Promise(() => {})) - startMocks.requestMiddleware = [ - createMiddleware().server(() => { - notifyMiddlewareStarted() - return middlewareResult - }), - ] - const handler = createStartHandler(() => new Response('must not render')) - const response = handler( - new Request('http://localhost/', { - signal: requestController.signal, - }), - {}, - ) - - await middlewareStarted - const cancellation = new Error('request disconnected') - requestController.abort(cancellation) - - expect((await response).status).toBe(500) - resolveMiddleware(new Response(new ReadableStream({ cancel }))) - await vi.waitFor(() => { - expect(cancel).toHaveBeenCalledTimes(1) - expect(cancel).toHaveBeenCalledWith(cancellation) - }) - }) - - it.each(['throw', 'reject'] as const)( - 'reports a %s from disposal of a late render response', - async (failureMode) => { + it.each(['resolves', 'rejects'] as const)( + 'cancels a plain response when request middleware %s later', + async (settlement) => { const router = makeRouter() startMocks.router = router const requestController = new AbortController() - const cleanupError = new Error('late stream cleanup failed') - const dispose = vi.fn(() => { - if (failureMode === 'throw') { - throw cleanupError - } - return Promise.reject(cleanupError) + let notifyMiddlewareStarted!: () => void + const middlewareStarted = new Promise((resolve) => { + notifyMiddlewareStarted = resolve }) - const consoleError = vi - .spyOn(console, 'error') - .mockImplementation(() => undefined) - let notifyRenderStarted!: () => void - const renderStarted = new Promise((resolve) => { - notifyRenderStarted = resolve - }) - let resolveRender!: (value: any) => void - const renderResult = new Promise((resolve) => { - resolveRender = resolve - }) - onTestFinished(() => { - consoleError.mockRestore() - }) - onTestFinished(() => { - router.serverSsr?.cleanup() - }) - - const handler = createStartHandler(() => { - notifyRenderStarted() - return renderResult + let settleMiddleware!: (value: Response) => void + const middlewareResult = new Promise((resolve, reject) => { + settleMiddleware = settlement === 'resolves' ? resolve : reject }) + const cancel = vi.fn((_reason: unknown) => new Promise(() => {})) + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + notifyMiddlewareStarted() + return middlewareResult + }), + ] + const handler = createStartHandler(() => new Response('must not render')) const response = handler( new Request('http://localhost/', { signal: requestController.signal, @@ -1027,84 +1994,78 @@ describe('createStartHandler request cancellation', () => { {}, ) - await renderStarted - requestController.abort(new Error('request disconnected')) - expect((await response).status).toBe(500) - - resolveRender({ - response: new Response('stream'), - serverSsrCleanup: 'stream', - dispose, - }) - await vi.waitFor(() => { - expect(consoleError).toHaveBeenCalledWith(cleanupError) - }) - expect(dispose).toHaveBeenCalledOnce() - }, - ) - - it.each(['throw', 'reject'] as const)( - 'reports a stream disposal %s when middleware is aborted', - async (failureMode) => { - const router = makeRouter() - startMocks.router = router - const requestController = new AbortController() - const cleanupError = new Error('custom stream cleanup failed') - const consoleError = vi - .spyOn(console, 'error') - .mockImplementation(() => undefined) - const ssrResponse = makeStreamResponse(router) - const dispose = vi.fn(() => { - if (failureMode === 'throw') { - throw cleanupError - } - return Promise.reject(cleanupError) - }) - ;(ssrResponse as any).dispose = dispose - startMocks.serverFnResult = ssrResponse - let notifyMiddlewareStarted!: () => void - const middlewareStarted = new Promise((resolve) => { - notifyMiddlewareStarted = resolve - }) - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - await next() - notifyMiddlewareStarted() - return new Promise(() => {}) - }), - ] - onTestFinished(() => { - consoleError.mockRestore() - }) - onTestFinished(() => { - router.serverSsr?.cleanup() - }) - - const handler = createStartHandler(() => new Response('unused')) - const response = handler( - new Request('http://localhost/_serverFn/test', { - headers: { 'x-tsr-serverFn': 'true' }, - signal: requestController.signal, - }), - {}, - ) - await middlewareStarted - requestController.abort(new Error('request disconnected')) + const cancellation = new Error('request disconnected') + requestController.abort(cancellation) expect((await response).status).toBe(500) + settleMiddleware(new Response(new ReadableStream({ cancel }))) await vi.waitFor(() => { - expect(consoleError).toHaveBeenCalledWith(cleanupError) + expect(cancel).toHaveBeenCalledTimes(1) + expect(cancel).toHaveBeenCalledWith(cancellation) }) - expect(dispose).toHaveBeenCalledOnce() }, ) - it('disposes a stream when the request aborts after response handoff', async () => { + it('cancels a stream resolved by the render callback later', async () => { + const router = makeRouter() + startMocks.router = router + const requestController = new AbortController() + let notifyRenderStarted!: () => void + const renderStarted = new Promise((resolve) => { + notifyRenderStarted = resolve + }) + let resolveRender!: ( + value: ReturnType, + ) => void + const renderResult = new Promise< + ReturnType + >((resolve) => { + resolveRender = resolve + }) + const cancel = vi.fn((_reason: unknown) => new Promise(() => {})) + let streamResponse!: ReturnType + + const handler = createStartHandler(({ router: requestRouter }) => { + streamResponse = createSsrStreamResponse( + requestRouter, + new Response(new ReadableStream({ cancel })), + ) + notifyRenderStarted() + return renderResult + }) + const response = handler( + new Request('http://localhost/', { + signal: requestController.signal, + }), + {}, + ) + + await renderStarted + const cancellation = new Error('request disconnected') + requestController.abort(cancellation) + expect((await response).status).toBe(500) + + resolveRender(streamResponse) + await vi.waitFor(() => { + expect(cancel).toHaveBeenCalledTimes(1) + expect(cancel).toHaveBeenCalledWith(cancellation) + }) + }) + + it('disposes a side-cloned stream when the request aborts after handoff', async () => { const router = makeRouter() startMocks.router = router const requestController = new AbortController() let cancelCalls = 0 + let siblingResponse!: Response + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + siblingResponse = result.response.clone() + return result + }), + ] const handler = createStartHandler(({ router: requestRouter }) => createSsrStreamResponse( requestRouter, @@ -1127,55 +2088,17 @@ describe('createStartHandler request cancellation', () => { ) expect(response.body).not.toBeNull() expect(router.serverSsr).toBeDefined() + const cancel = vi.spyOn(response.body!, 'cancel') + const reason = new Error('request disconnected') - requestController.abort(new Error('request disconnected')) - await Promise.resolve() + requestController.abort(reason) + void siblingResponse.body!.cancel(reason) - expect(cancelCalls).toBe(1) - expect(router.serverSsr).toBeUndefined() - }) - - it('settles when request middleware ignores cancellation', async () => { - const router = makeRouter() - startMocks.router = router - const requestController = new AbortController() - let notifyMiddlewareStarted!: () => void - const middlewareStarted = new Promise((resolve) => { - notifyMiddlewareStarted = resolve + await vi.waitFor(() => { + expect(cancel).toHaveBeenCalledWith(reason) + expect(cancelCalls).toBe(1) + expect(router.serverSsr).toBeUndefined() }) - const dispose = vi.fn(() => Promise.resolve()) - let releaseMiddleware!: (response: any) => void - const middlewareResult = new Promise((resolve) => { - releaseMiddleware = resolve - }) - startMocks.requestMiddleware = [ - createMiddleware().server(() => { - notifyMiddlewareStarted() - return middlewareResult - }), - ] - const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) - const response = handler( - new Request('http://localhost/', { - signal: requestController.signal, - }), - {}, - ) - - await middlewareStarted - requestController.abort(new Error('request disconnected')) - - expect((await response).status).toBe(500) - expect(render).not.toHaveBeenCalled() - - releaseMiddleware({ - response: new Response('late'), - serverSsrCleanup: 'stream', - dispose, - }) - await vi.waitFor(() => expect(dispose).toHaveBeenCalledOnce()) - expect(render).not.toHaveBeenCalled() }) it('unwinds nested middleware when an inner operation ignores cancellation', async () => { @@ -1256,12 +2179,17 @@ describe('createStartHandler request cancellation', () => { startMocks.router = router const requestController = new AbortController() const reason = new Error('request disconnected') + const cancel = vi.fn() + const ssrResponse = makeStreamResponse(router, cancel) + const dispose = vi.spyOn(ssrResponse as any, 'dispose') startMocks.requestMiddleware = [ createMiddleware().server(({ next }) => next()), - createMiddleware().server(() => { + createMiddleware().server(async ({ next }) => { + const result = await next() requestController.abort(reason) - throw new Response('must not escape', { status: 418 }) + throw result.response }), + createMiddleware().server(() => ssrResponse as any), ] const render = vi.fn(() => new Response('must not render')) const handler = createStartHandler(render) @@ -1274,6 +2202,11 @@ describe('createStartHandler request cancellation', () => { ) expect(response.status).toBe(500) + await vi.waitFor(() => { + expect(dispose).toHaveBeenCalledWith(reason) + expect(cancel).toHaveBeenCalledOnce() + expect(cancel).toHaveBeenCalledWith(reason) + }) expect(render).not.toHaveBeenCalled() }) @@ -1284,9 +2217,9 @@ describe('createStartHandler request cancellation', () => { const reason = new Error('request disconnected') const observedErrors: Array = [] const afterNext = vi.fn() - const ssrResponse = makeStreamResponse(router) + const cancel = vi.fn() + const ssrResponse = makeStreamResponse(router, cancel) const dispose = vi.spyOn(ssrResponse as any, 'dispose') - const cancel = vi.spyOn(ssrResponse.response.body!, 'cancel') startMocks.requestMiddleware = [ createMiddleware().server(async ({ next }) => { try { @@ -1320,7 +2253,6 @@ describe('createStartHandler request cancellation', () => { expect(response.status).toBe(500) await vi.waitFor(() => expect(observedErrors).toEqual([reason])) await vi.waitFor(() => { - expect(dispose).toHaveBeenCalledOnce() expect(dispose).toHaveBeenCalledWith(reason) expect(cancel).toHaveBeenCalledOnce() expect(cancel).toHaveBeenCalledWith(reason) @@ -1329,14 +2261,14 @@ describe('createStartHandler request cancellation', () => { expect(render).not.toHaveBeenCalled() }) - it('disposes a tagged final response once when abort wins handoff', async () => { + it('disposes a tagged final response when abort wins handoff', async () => { const router = makeRouter() startMocks.router = router const requestController = new AbortController() const reason = new Error('request disconnected') - const ssrResponse = makeStreamResponse(router) + const cancel = vi.fn() + const ssrResponse = makeStreamResponse(router, cancel) const dispose = vi.spyOn(ssrResponse as any, 'dispose') - const cancel = vi.spyOn(ssrResponse.response.body!, 'cancel') startMocks.requestMiddleware = [ createMiddleware().server(() => { queueMicrotask(() => { @@ -1357,7 +2289,6 @@ describe('createStartHandler request cancellation', () => { expect(response.status).toBe(500) await vi.waitFor(() => { - expect(dispose).toHaveBeenCalledOnce() expect(dispose).toHaveBeenCalledWith(reason) expect(cancel).toHaveBeenCalledOnce() expect(cancel).toHaveBeenCalledWith(reason) @@ -1366,7 +2297,7 @@ describe('createStartHandler request cancellation', () => { expect(render).not.toHaveBeenCalled() }) - it('ignores a late same-body alias after catch disposes its owner', async () => { + it('keeps late same-body disposal idempotent after abort', async () => { const router = makeRouter() startMocks.router = router const requestController = new AbortController() @@ -1395,14 +2326,15 @@ describe('createStartHandler request cancellation', () => { return wrapped }), ] + const sourceCancel = vi.fn() const response = new Response( new ReadableStream({ start(controller) { controller.enqueue(new TextEncoder().encode('stream')) }, + cancel: sourceCancel, }), ) - const cancel = vi.spyOn(response.body!, 'cancel') let ssrResponse!: ReturnType const render = vi.fn(({ router: requestRouter }) => { ssrResponse = createSsrStreamResponse(requestRouter, response) @@ -1424,10 +2356,68 @@ describe('createStartHandler request cancellation', () => { releaseMiddleware() await lateResultDelivered await vi.waitFor(() => { - expect(dispose).toHaveBeenCalledOnce() expect(dispose).toHaveBeenCalledWith(reason) - expect(cancel).toHaveBeenCalledOnce() - expect(cancel).toHaveBeenCalledWith(reason) + expect(sourceCancel).toHaveBeenCalledOnce() + expect(sourceCancel).toHaveBeenCalledWith(reason) + }) + expect(router.serverSsr).toBeUndefined() + }) + + it('cancels a transferred body that middleware returns after abort', async () => { + const router = makeRouter() + startMocks.router = router + const requestController = new AbortController() + const reason = new Error('request disconnected') + let notifyResponseCaptured!: () => void + const responseCaptured = new Promise((resolve) => { + notifyResponseCaptured = resolve + }) + let releaseMiddleware!: () => void + const middlewareRelease = new Promise((resolve) => { + releaseMiddleware = resolve + }) + let derivedBody!: ReadableStream + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + const result = await next() + const derived = transferResponseBodyOwnership( + result.response, + new Response( + result.response.body!.pipeThrough(new TransformStream()), + result.response, + ), + ) + derivedBody = derived.body! + notifyResponseCaptured() + await middlewareRelease + return derived + }), + ] + const sourceCancel = vi.fn() + const response = new Response( + new ReadableStream({ cancel: sourceCancel }), + ) + const handler = createStartHandler(({ router: requestRouter }) => + createSsrStreamResponse(requestRouter, response), + ) + const result = handler( + new Request('http://localhost/', { + signal: requestController.signal, + }), + {}, + ) + + await responseCaptured + const derivedCancel = vi.spyOn(derivedBody, 'cancel') + requestController.abort(reason) + + expect((await result).status).toBe(500) + expect(sourceCancel).not.toHaveBeenCalled() + releaseMiddleware() + await vi.waitFor(() => { + expect(derivedCancel).toHaveBeenCalledWith(reason) + expect(sourceCancel).toHaveBeenCalledOnce() + expect(sourceCancel).toHaveBeenCalledWith(reason) }) expect(router.serverSsr).toBeUndefined() }) diff --git a/packages/start-server-core/tests/frame-protocol.test.ts b/packages/start-server-core/tests/frame-protocol.test.ts index 380f3a8351..dd9f41cf4e 100644 --- a/packages/start-server-core/tests/frame-protocol.test.ts +++ b/packages/start-server-core/tests/frame-protocol.test.ts @@ -1,137 +1,150 @@ -import { describe, expect, it } from 'vitest' +import { describe, expect, it, vi } from 'vitest' import { FRAME_HEADER_SIZE, - FrameType, - createMultiplexedStream, - encodeChunkFrame, - encodeEndFrame, - encodeErrorFrame, - encodeFrame, - encodeJSONFrame, + FRAME_TYPE_CHUNK, + FRAME_TYPE_END, + FRAME_TYPE_ERROR, + FRAME_TYPE_JSON, + MAX_FRAME_PAYLOAD_SIZE, +} from '@tanstack/start-client-core/client-rpc' +import { createMultiplexedStream } from '../src/frame-protocol' +import type { + LateStreamRegistration, + MultiplexedStreamRecord, } from '../src/frame-protocol' +function createRecord( + json: string, + rawStreams: Array = [], +): MultiplexedStreamRecord { + return { json: new TextEncoder().encode(json), rawStreams } +} + +function createRecordStream( + records: Array, +): ReadableStream { + return new ReadableStream({ + start(controller) { + for (const record of records) { + controller.enqueue(record) + } + controller.close() + }, + }) +} + +async function readFrames(stream: ReadableStream) { + const reader = stream.getReader() + const frames: Array = [] + for (;;) { + const { done, value } = await reader.read() + if (done) { + return frames + } + frames.push(value) + } +} + describe('frame-protocol', () => { - describe('encodeFrame', () => { - it('should encode frame with header and payload', () => { + describe('frame encoding', () => { + it('should encode JSON, chunk, and end frames', async () => { const payload = new Uint8Array([1, 2, 3, 4]) - const frame = encodeFrame(FrameType.CHUNK, 42, payload) + const rawStream = new ReadableStream({ + start(controller) { + controller.enqueue(payload) + controller.close() + }, + }) + const frames = await readFrames( + createMultiplexedStream( + createRecordStream([ + createRecord('{"result":"ok"}', [{ id: 42, stream: rawStream }]), + ]), + ), + ) - expect(frame.length).toBe(FRAME_HEADER_SIZE + payload.length) + expect(frames).toHaveLength(3) + const jsonView = new DataView(frames[0]!.buffer, frames[0]!.byteOffset) + expect(jsonView.getUint8(0)).toBe(FRAME_TYPE_JSON) + expect(jsonView.getUint32(1, false)).toBe(0) - // Check header - const view = new DataView(frame.buffer) - expect(view.getUint8(0)).toBe(FrameType.CHUNK) - expect(view.getUint32(1, false)).toBe(42) // streamId big-endian - expect(view.getUint32(5, false)).toBe(4) // length big-endian + const chunkView = new DataView(frames[1]!.buffer, frames[1]!.byteOffset) + expect(frames[1]!.length).toBe(FRAME_HEADER_SIZE + payload.length) + expect(chunkView.getUint8(0)).toBe(FRAME_TYPE_CHUNK) + expect(chunkView.getUint32(1, false)).toBe(42) + expect(chunkView.getUint32(5, false)).toBe(payload.length) + expect(frames[1]!.slice(FRAME_HEADER_SIZE)).toEqual(payload) - // Check payload - expect(frame.slice(FRAME_HEADER_SIZE)).toEqual(payload) + const endView = new DataView(frames[2]!.buffer, frames[2]!.byteOffset) + expect(frames[2]!.length).toBe(FRAME_HEADER_SIZE) + expect(endView.getUint8(0)).toBe(FRAME_TYPE_END) + expect(endView.getUint32(1, false)).toBe(42) + expect(endView.getUint32(5, false)).toBe(0) }) - it('should handle empty payload', () => { - const frame = encodeFrame(FrameType.END, 1, new Uint8Array(0)) - - expect(frame.length).toBe(FRAME_HEADER_SIZE) - - const view = new DataView(frame.buffer) - expect(view.getUint8(0)).toBe(FrameType.END) - expect(view.getUint32(5, false)).toBe(0) // length is 0 - }) - }) - - describe('encodeJSONFrame', () => { - it('should encode JSON string as frame type 0 with streamId 0', () => { - const json = '{"hello":"world"}' - const frame = encodeJSONFrame(json) - - const view = new DataView(frame.buffer) - expect(view.getUint8(0)).toBe(FrameType.JSON) - expect(view.getUint32(1, false)).toBe(0) // streamId always 0 for JSON - - const encoder = new TextEncoder() - const expectedPayload = encoder.encode(json) - expect(view.getUint32(5, false)).toBe(expectedPayload.length) - - const payload = frame.slice(FRAME_HEADER_SIZE) - expect(new TextDecoder().decode(payload)).toBe(json) - }) - }) - - describe('encodeChunkFrame', () => { - it('should encode binary chunk with frame type CHUNK', () => { - const chunk = new Uint8Array([0xff, 0xfe, 0xfd]) - const frame = encodeChunkFrame(123, chunk) - - const view = new DataView(frame.buffer) - expect(view.getUint8(0)).toBe(FrameType.CHUNK) - expect(view.getUint32(1, false)).toBe(123) - expect(view.getUint32(5, false)).toBe(3) - - expect(frame.slice(FRAME_HEADER_SIZE)).toEqual(chunk) - }) - }) - - describe('encodeEndFrame', () => { - it('should encode end frame with empty payload', () => { - const frame = encodeEndFrame(456) - - expect(frame.length).toBe(FRAME_HEADER_SIZE) - - const view = new DataView(frame.buffer) - expect(view.getUint8(0)).toBe(FrameType.END) - expect(view.getUint32(1, false)).toBe(456) - expect(view.getUint32(5, false)).toBe(0) - }) - }) - - describe('encodeErrorFrame', () => { - it('should encode Error message', () => { - const frame = encodeErrorFrame(789, new Error('Something went wrong')) - - const view = new DataView(frame.buffer) - expect(view.getUint8(0)).toBe(FrameType.ERROR) + it.each([ + [new Error('Something went wrong'), 'Something went wrong'], + ['string error', 'string error'], + [undefined, 'Unknown error'], + ])('should encode raw stream error payload %j', async (error, message) => { + const errorStream = new ReadableStream({ + start(controller) { + controller.error(error) + }, + }) + const frames = await readFrames( + createMultiplexedStream( + createRecordStream([ + createRecord('{}', [{ id: 789, stream: errorStream }]), + ]), + ), + ) + const frame = frames.find((value) => value[0] === FRAME_TYPE_ERROR)! + const view = new DataView(frame.buffer, frame.byteOffset) + expect(view.getUint8(0)).toBe(FRAME_TYPE_ERROR) expect(view.getUint32(1, false)).toBe(789) - - const payload = frame.slice(FRAME_HEADER_SIZE) - expect(new TextDecoder().decode(payload)).toBe('Something went wrong') + expect(new TextDecoder().decode(frame.slice(FRAME_HEADER_SIZE))).toBe( + message, + ) }) - it('should handle non-Error values', () => { - const frame = encodeErrorFrame(1, 'string error') - + it('should bound oversized raw-stream error messages', async () => { + const errorStream = new ReadableStream({ + start(controller) { + controller.error(new Error('x'.repeat(MAX_FRAME_PAYLOAD_SIZE + 1))) + }, + }) + const frames = await readFrames( + createMultiplexedStream( + createRecordStream([ + createRecord('{}', [{ id: 1, stream: errorStream }]), + ]), + ), + ) + const frame = frames.find((value) => value[0] === FRAME_TYPE_ERROR)! const payload = frame.slice(FRAME_HEADER_SIZE) - expect(new TextDecoder().decode(payload)).toBe('string error') - }) - - it('should handle undefined error', () => { - const frame = encodeErrorFrame(1, undefined) - - const payload = frame.slice(FRAME_HEADER_SIZE) - expect(new TextDecoder().decode(payload)).toBe('Unknown error') + expect(payload.byteLength).toBeLessThan(MAX_FRAME_PAYLOAD_SIZE) + expect(new TextDecoder().decode(payload)).toMatch(/…$/) }) }) describe('createMultiplexedStream', () => { it('should multiplex JSON stream only', async () => { - const jsonStream = new ReadableStream({ - start(controller) { - controller.enqueue('{"data":1}') - controller.enqueue('{"data":2}') - controller.close() - }, - }) - const multiplexed = createMultiplexedStream( - jsonStream, - new Map(), // no raw streams + createRecordStream([ + createRecord('{"data":1}'), + createRecord('{"data":2}'), + ]), ) const reader = multiplexed.getReader() const chunks: Array = [] - while (true) { + for (;;) { const { done, value } = await reader.read() - if (done) break + if (done) { + break + } chunks.push(value) } @@ -140,18 +153,11 @@ describe('frame-protocol', () => { // Both should be JSON frames for (const chunk of chunks) { const view = new DataView(chunk.buffer, chunk.byteOffset) - expect(view.getUint8(0)).toBe(FrameType.JSON) + expect(view.getUint8(0)).toBe(FRAME_TYPE_JSON) } }) it('should multiplex JSON and raw streams', async () => { - const jsonStream = new ReadableStream({ - start(controller) { - controller.enqueue('{"result":"ok"}') - controller.close() - }, - }) - const rawStream = new ReadableStream({ start(controller) { controller.enqueue(new Uint8Array([1, 2, 3])) @@ -159,17 +165,20 @@ describe('frame-protocol', () => { }, }) - const rawStreams = new Map>() - rawStreams.set(5, rawStream) - - const multiplexed = createMultiplexedStream(jsonStream, rawStreams) + const multiplexed = createMultiplexedStream( + createRecordStream([ + createRecord('{"result":"ok"}', [{ id: 5, stream: rawStream }]), + ]), + ) const reader = multiplexed.getReader() const chunks: Array = [] - while (true) { + for (;;) { const { done, value } = await reader.read() - if (done) break + if (done) { + break + } chunks.push(value) } @@ -181,51 +190,349 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types).toContain(FrameType.JSON) - expect(types).toContain(FrameType.CHUNK) - expect(types).toContain(FrameType.END) + expect(types).toEqual([FRAME_TYPE_JSON, FRAME_TYPE_CHUNK, FRAME_TYPE_END]) + }) + + it('splits raw chunks at the wire payload limit', async () => { + const payload = new Uint8Array(MAX_FRAME_PAYLOAD_SIZE + 1) + const rawStream = new ReadableStream({ + start(controller) { + controller.enqueue(payload) + controller.close() + }, + }) + const multiplexed = createMultiplexedStream( + createRecordStream([ + createRecord('{"ref":1}', [{ id: 1, stream: rawStream }]), + ]), + ) + const reader = multiplexed.getReader() + const frames: Array = [] + for (;;) { + const { done, value } = await reader.read() + if (done) { + break + } + frames.push(value) + } + + expect(frames.map((frame) => frame[0])).toEqual([ + FRAME_TYPE_JSON, + FRAME_TYPE_CHUNK, + FRAME_TYPE_CHUNK, + FRAME_TYPE_END, + ]) + expect(frames[1]!.byteLength - FRAME_HEADER_SIZE).toBe( + MAX_FRAME_PAYLOAD_SIZE, + ) + expect(frames[2]!.byteLength - FRAME_HEADER_SIZE).toBe(1) + }) + + it('bounds upstream reads and copies chunks only when output has demand', async () => { + const first = new Uint8Array([1]) + const second = new Uint8Array([2]) + const chunks = [first, second] + let pullCount = 0 + let chunkIndex = 0 + const rawStream = new ReadableStream( + { + pull(controller) { + pullCount++ + const chunk = chunks[chunkIndex++] + if (chunk) { + controller.enqueue(chunk) + } else { + controller.close() + } + }, + }, + { highWaterMark: 0 }, + ) + const multiplexed = createMultiplexedStream( + createRecordStream([ + createRecord('{"ref":1}', [{ id: 1, stream: rawStream }]), + ]), + ) + + // Let every currently runnable pump microtask settle without consuming + // the output. One chunk is queued and one is held unencoded by its pump. + await new Promise((resolve) => setTimeout(resolve, 0)) + expect(pullCount).toBe(1) + + // The second frame must copy its payload only after the first frame is + // consumed and output capacity becomes available. + second[0] = 9 + const reader = multiplexed.getReader() + const jsonFrame = (await reader.read()).value! + expect(new DataView(jsonFrame.buffer).getUint8(0)).toBe(FRAME_TYPE_JSON) + await new Promise((resolve) => setTimeout(resolve, 0)) + expect(pullCount).toBe(2) + const firstFrame = (await reader.read()).value! + const secondFrame = (await reader.read()).value! + expect(firstFrame.slice(FRAME_HEADER_SIZE)).toEqual(new Uint8Array([1])) + expect(secondFrame.slice(FRAME_HEADER_SIZE)).toEqual(new Uint8Array([9])) + + const endFrame = (await reader.read()).value! + expect(new DataView(endFrame.buffer).getUint8(0)).toBe(FRAME_TYPE_END) + await expect(reader.read()).resolves.toEqual({ + done: true, + value: undefined, + }) + }) + + it('bounds concurrent pumps while a late record waits for output demand', async () => { + const sources = Array.from({ length: 5 }, (_, index) => { + const chunks: Array = [] + const cancel = vi.fn() + const stream = new ReadableStream( + { + pull(controller) { + const chunk = new Uint8Array([index + 1, 1]) + chunks.push(chunk) + controller.enqueue(chunk) + }, + cancel, + }, + { highWaterMark: 0 }, + ) + return { id: index + 1, stream, chunks, cancel } + }) + const multiplexed = createMultiplexedStream( + createRecordStream([ + createRecord('{"refs":[1,2,3,4]}', sources.slice(0, 4)), + createRecord('{"ref":5}', [sources[4]!]), + ]), + ) + const reader = multiplexed.getReader() + + // The first JSON frame fills the output. Each active pump holds one + // unencoded chunk; the late stream waits for its own JSON admission. + await new Promise((resolve) => setTimeout(resolve, 0)) + expect(sources.map(({ chunks }) => chunks.length)).toEqual([ + 1, 1, 1, 1, 0, + ]) + expect((await reader.read()).value![0]).toBe(FRAME_TYPE_JSON) + await new Promise((resolve) => setTimeout(resolve, 0)) + expect(sources.map(({ chunks }) => chunks.length)).toEqual([ + 2, 1, 1, 1, 0, + ]) + + // Only the first raw frame has been copied into the output queue. + for (const source of sources.slice(0, 4)) { + source.chunks[0]![1] = 9 + } + for (let streamId = 1; streamId <= 4; streamId++) { + const frame = (await reader.read()).value! + expect(frame[0]).toBe(FRAME_TYPE_CHUNK) + expect(frame.slice(FRAME_HEADER_SIZE)).toEqual( + new Uint8Array([streamId, streamId === 1 ? 1 : 9]), + ) + } + expect((await reader.read()).value![0]).toBe(FRAME_TYPE_JSON) + await new Promise((resolve) => setTimeout(resolve, 0)) + expect(sources[4]!.chunks).toHaveLength(1) + + const reason = new Error('client disconnected') + await reader.cancel(reason) + await new Promise((resolve) => setTimeout(resolve, 0)) + for (const { stream, cancel } of sources) { + expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) + expect(stream.locked).toBe(false) + } + }) + + it.each(['cancel', 'abort'] as const)( + 'releases active and unadmitted raw streams on %s while output is full', + async (mode) => { + const reason = new Error('request ended') + const abortController = new AbortController() + const sources = Array.from({ length: 3 }, (_, index) => { + const cancel = vi.fn(() => new Promise(() => {})) + const pull = vi.fn( + (controller: ReadableStreamDefaultController) => { + controller.enqueue(new Uint8Array([index])) + }, + ) + const stream = new ReadableStream( + { pull, cancel }, + { highWaterMark: 0 }, + ) + return { id: index + 1, stream, pull, cancel } + }) + const recordCancel = vi.fn(() => new Promise(() => {})) + const records = new ReadableStream({ + start(controller) { + controller.enqueue( + createRecord('{"refs":[1,2]}', sources.slice(0, 2)), + ) + controller.enqueue(createRecord('{"ref":3}', [sources[2]!])) + }, + cancel: recordCancel, + }) + const reader = createMultiplexedStream(records, { + signal: abortController.signal, + }).getReader() + + await new Promise((resolve) => setTimeout(resolve, 0)) + expect(sources.map(({ pull }) => pull.mock.calls.length)).toEqual([ + 1, 1, 0, + ]) + if (mode === 'abort') { + abortController.abort(reason) + await expect(reader.read()).rejects.toBe(reason) + } else { + await reader.cancel(reason) + } + await new Promise((resolve) => setTimeout(resolve, 0)) + + expect(recordCancel).toHaveBeenCalledExactlyOnceWith(reason) + expect(records.locked).toBe(false) + for (const { stream, cancel } of sources) { + expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) + expect(stream.locked).toBe(false) + } + expect(sources.map(({ pull }) => pull.mock.calls.length)).toEqual([ + 1, 1, 0, + ]) + }, + ) + + it('does not let a ready frame overtake one waiting for demand', async () => { + let secondController: ReadableStreamDefaultController + const firstRawStream = new ReadableStream({ + start(controller) { + controller.enqueue(new Uint8Array([1])) + controller.close() + }, + }) + const secondRawStream = new ReadableStream({ + start(controller) { + secondController = controller + }, + }) + const multiplexed = createMultiplexedStream( + createRecordStream([ + createRecord('{"refs":[1,2]}', [ + { id: 1, stream: firstRawStream }, + { id: 2, stream: secondRawStream }, + ]), + ]), + ) + const reader = multiplexed.getReader() + + // The JSON frame fills the output queue. The first raw frame then waits + // for demand while the second raw-stream read remains pending. + await new Promise((resolve) => setTimeout(resolve, 0)) + secondController!.enqueue(new Uint8Array([2])) + secondController!.close() + + // Fulfilling the second read is already queued when consuming the JSON + // creates demand. It must not bypass the first frame's admission. + const jsonFrame = (await reader.read()).value! + expect(jsonFrame[0]).toBe(FRAME_TYPE_JSON) + const firstFrame = (await reader.read()).value! + const secondFrame = (await reader.read()).value! + expect(firstFrame[0]).toBe(FRAME_TYPE_CHUNK) + expect(secondFrame[0]).toBe(FRAME_TYPE_CHUNK) + expect( + new DataView(firstFrame.buffer, firstFrame.byteOffset).getUint32( + 1, + false, + ), + ).toBe(1) + expect( + new DataView(secondFrame.buffer, secondFrame.byteOffset).getUint32( + 1, + false, + ), + ).toBe(2) + + await reader.cancel() }) it('should handle cancel without errors', async () => { - // Create slow streams that won't complete before cancel - let jsonCancelled = false + let recordStreamCancelled = false let rawCancelled = false - const jsonStream = new ReadableStream({ - async start(controller) { - await new Promise((r) => setTimeout(r, 100)) - controller.enqueue('{}\n') - controller.close() - }, - cancel() { - jsonCancelled = true - }, - }) - const rawStream = new ReadableStream({ - async start(controller) { - await new Promise((r) => setTimeout(r, 100)) - controller.enqueue(new Uint8Array([1, 2, 3])) - controller.close() + pull() { + return new Promise(() => {}) }, cancel() { rawCancelled = true + return new Promise(() => {}) }, }) - const rawStreams = new Map>() - rawStreams.set(1, rawStream) + const recordStream = new ReadableStream({ + start(controller) { + controller.enqueue(createRecord('{}', [{ id: 1, stream: rawStream }])) + }, + cancel() { + recordStreamCancelled = true + return new Promise(() => {}) + }, + }) - const multiplexed = createMultiplexedStream(jsonStream, rawStreams) + const multiplexed = createMultiplexedStream(recordStream) const reader = multiplexed.getReader() - // Cancel immediately before streams complete - // Should not throw ERR_INVALID_STATE + await reader.read() + + // Output cancellation must not adopt a user cancellation promise that + // is allowed to remain pending forever. await reader.cancel() - // Underlying reader.cancel should propagate to sources - expect(jsonCancelled).toBe(true) + expect(recordStreamCancelled).toBe(true) expect(rawCancelled).toBe(true) + expect(recordStream.locked).toBe(false) + expect(rawStream.locked).toBe(false) + }) + + it('cancels raw streams from a record fulfilled as the request aborts', async () => { + const reason = new Error('request aborted') + let cancelReason: unknown + let cancelCount = 0 + const rawStream = new ReadableStream({ + cancel(value) { + cancelCount++ + cancelReason = value + }, + }) + const abortController = new AbortController() + const multiplexed = createMultiplexedStream( + createRecordStream([ + createRecord('{}', [{ id: 1, stream: rawStream }]), + ]), + { signal: abortController.signal }, + ) + + // The record read is already fulfilled, but its pump has not resumed. + abortController.abort(reason) + + await expect(multiplexed.getReader().read()).rejects.toBe(reason) + expect(cancelCount).toBe(1) + expect(cancelReason).toBe(reason) + expect(rawStream.locked).toBe(false) + }) + + it('cancels a stream source for an already-aborted request', async () => { + const reason = new Error('request already aborted') + const cancel = vi.fn() + const recordStream = new ReadableStream({ + cancel, + }) + const abortController = new AbortController() + abortController.abort(reason) + + const multiplexed = createMultiplexedStream(recordStream, { + signal: abortController.signal, + }) + + await expect(multiplexed.getReader().read()).rejects.toBe(reason) + expect(cancel).toHaveBeenCalledOnce() + expect(cancel).toHaveBeenCalledWith(reason) + expect(recordStream.locked).toBe(false) }) it('should interleave multiple raw streams correctly', async () => { @@ -235,13 +542,6 @@ describe('frame-protocol', () => { const gate1 = new Promise((r) => (resolve1 = r)) const gate2 = new Promise((r) => (resolve2 = r)) - const jsonStream = new ReadableStream({ - start(controller) { - controller.enqueue('{"streams":[1,2]}') - controller.close() - }, - }) - const rawStream1 = new ReadableStream({ async start(controller) { controller.enqueue(new Uint8Array([0x11])) @@ -260,19 +560,25 @@ describe('frame-protocol', () => { }, }) - const rawStreams = new Map>() - rawStreams.set(1, rawStream1) - rawStreams.set(2, rawStream2) - - const multiplexed = createMultiplexedStream(jsonStream, rawStreams) + const multiplexed = createMultiplexedStream( + createRecordStream([ + createRecord('{"streams":[1,2]}', [ + { id: 1, stream: rawStream1 }, + { id: 2, stream: rawStream2 }, + ]), + ]), + ) const reader = multiplexed.getReader() const chunks: Array = [] // Read first batch (JSON + first chunks from both streams) for (let i = 0; i < 3; i++) { - const { value } = await reader.read() - if (value) chunks.push(value) + const next = await reader.read() + if (next.done) { + break + } + chunks.push(next.value) } // Release gates to let streams continue @@ -280,9 +586,11 @@ describe('frame-protocol', () => { resolve2!() // Read remaining chunks - while (true) { + for (;;) { const { done, value } = await reader.read() - if (done) break + if (done) { + break + } chunks.push(value) } @@ -295,63 +603,50 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types.filter((t) => t === FrameType.JSON).length).toBe(1) - expect(types.filter((t) => t === FrameType.CHUNK).length).toBe(4) - expect(types.filter((t) => t === FrameType.END).length).toBe(2) + expect(types.filter((t) => t === FRAME_TYPE_JSON).length).toBe(1) + expect(types.filter((t) => t === FRAME_TYPE_CHUNK).length).toBe(4) + expect(types.filter((t) => t === FRAME_TYPE_END).length).toBe(2) }) it('should handle late stream registration', async () => { - const jsonStream = new ReadableStream({ - start(controller) { - controller.enqueue('{"ref":99}') - controller.close() - }, - }) - - // Late stream source that emits a registration after a delay - // (ensures framed protocol doesn't miss late-stream messages) + // The record containing the late reference is emitted after a delay. let resolveGate: () => void const gate = new Promise((r) => (resolveGate = r)) - const lateStreamSource = new ReadableStream<{ - id: number - stream: ReadableStream - }>({ + const recordStream = new ReadableStream({ async start(controller) { await gate - controller.enqueue({ - id: 99, - stream: new ReadableStream({ - start(c) { - c.enqueue(new Uint8Array([0xaa, 0xbb])) - c.close() + controller.enqueue( + createRecord('{"ref":99}', [ + { + id: 99, + stream: new ReadableStream({ + start(c) { + c.enqueue(new Uint8Array([0xaa, 0xbb])) + c.close() + }, + }), }, - }), - }) + ]), + ) controller.close() }, }) - const multiplexed = createMultiplexedStream( - jsonStream, - new Map(), - lateStreamSource, - ) + const multiplexed = createMultiplexedStream(recordStream) const reader = multiplexed.getReader() const chunks: Array = [] - // Read JSON frame first - const { value: jsonChunk } = await reader.read() - if (jsonChunk) chunks.push(jsonChunk) - // Release gate to let late stream arrive resolveGate!() // Read remaining frames - while (true) { + for (;;) { const { done, value } = await reader.read() - if (done) break + if (done) { + break + } chunks.push(value) } @@ -363,7 +658,7 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types).toEqual([FrameType.JSON, FrameType.CHUNK, FrameType.END]) + expect(types).toEqual([FRAME_TYPE_JSON, FRAME_TYPE_CHUNK, FRAME_TYPE_END]) // Verify late stream data const chunkFrame = chunks[1]! @@ -378,49 +673,41 @@ describe('frame-protocol', () => { let startJson: () => void const jsonGate = new Promise((r) => (startJson = r)) - const jsonStream = new ReadableStream({ + const recordStream = new ReadableStream({ async start(controller) { await jsonGate - controller.enqueue('{"ref":1}') - controller.close() - }, - }) - - // Late stream registers immediately (before JSON starts) - const lateStreamSource = new ReadableStream<{ - id: number - stream: ReadableStream - }>({ - start(controller) { - controller.enqueue({ - id: 1, - stream: new ReadableStream({ - start(c) { - c.enqueue(new Uint8Array([0x01])) - c.close() + controller.enqueue( + createRecord('{"ref":1}', [ + { + id: 1, + stream: new ReadableStream({ + start(c) { + c.enqueue(new Uint8Array([0x01])) + c.close() + }, + }), }, - }), - }) + ]), + ) controller.close() }, }) - const multiplexed = createMultiplexedStream( - jsonStream, - new Map(), - lateStreamSource, - ) + const multiplexed = createMultiplexedStream(recordStream) const reader = multiplexed.getReader() const chunks: Array = [] - // Allow late stream to run before JSON + // The stream exists before its delayed JSON record, but the mux must not + // start it until after that record is admitted. await Promise.resolve() startJson!() - while (true) { + for (;;) { const { done, value } = await reader.read() - if (done) break + if (done) { + break + } chunks.push(value) } @@ -429,27 +716,13 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - // Order is not strictly guaranteed, but all frames must be present. - expect(types.filter((t) => t === FrameType.JSON).length).toBe(1) - expect(types.filter((t) => t === FrameType.CHUNK).length).toBe(1) - expect(types.filter((t) => t === FrameType.END).length).toBe(1) + expect(types).toEqual([FRAME_TYPE_JSON, FRAME_TYPE_CHUNK, FRAME_TYPE_END]) }) it('should handle multiple late stream registrations', async () => { - const jsonStream = new ReadableStream({ - start(controller) { - controller.enqueue('{}') - controller.close() - }, - }) - - const lateStreamSource = new ReadableStream<{ - id: number - stream: ReadableStream - }>({ - start(controller) { - // Register two streams - controller.enqueue({ + const recordStream = createRecordStream([ + createRecord('{}', [ + { id: 10, stream: new ReadableStream({ start(c) { @@ -457,8 +730,8 @@ describe('frame-protocol', () => { c.close() }, }), - }) - controller.enqueue({ + }, + { id: 20, stream: new ReadableStream({ start(c) { @@ -466,23 +739,20 @@ describe('frame-protocol', () => { c.close() }, }), - }) - controller.close() - }, - }) + }, + ]), + ]) - const multiplexed = createMultiplexedStream( - jsonStream, - new Map(), - lateStreamSource, - ) + const multiplexed = createMultiplexedStream(recordStream) const reader = multiplexed.getReader() const chunks: Array = [] - while (true) { + for (;;) { const { done, value } = await reader.read() - if (done) break + if (done) { + break + } chunks.push(value) } @@ -495,24 +765,15 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types.filter((t) => t === FrameType.JSON).length).toBe(1) - expect(types.filter((t) => t === FrameType.CHUNK).length).toBe(2) - expect(types.filter((t) => t === FrameType.END).length).toBe(2) + expect(types.filter((t) => t === FRAME_TYPE_JSON).length).toBe(1) + expect(types.filter((t) => t === FRAME_TYPE_CHUNK).length).toBe(2) + expect(types.filter((t) => t === FRAME_TYPE_END).length).toBe(2) }) it('should interleave initial and late streams', async () => { let resolveJson: () => void const jsonGate = new Promise((r) => (resolveJson = r)) - const jsonStream = new ReadableStream({ - async start(controller) { - controller.enqueue('{"first":true}') - await jsonGate - controller.enqueue('{"second":true}') - controller.close() - }, - }) - // Initial raw stream const initialRaw = new ReadableStream({ start(controller) { @@ -521,51 +782,52 @@ describe('frame-protocol', () => { }, }) - const rawStreams = new Map>() - rawStreams.set(1, initialRaw) - - // Late stream arrives after first JSON - const lateStreamSource = new ReadableStream<{ - id: number - stream: ReadableStream - }>({ - start(controller) { - controller.enqueue({ - id: 2, - stream: new ReadableStream({ - start(c) { - c.enqueue(new Uint8Array([2])) - c.close() + const recordStream = new ReadableStream({ + async start(controller) { + controller.enqueue( + createRecord('{"first":true}', [{ id: 1, stream: initialRaw }]), + ) + await jsonGate + controller.enqueue( + createRecord('{"second":true}', [ + { + id: 2, + stream: new ReadableStream({ + start(c) { + c.enqueue(new Uint8Array([2])) + c.close() + }, + }), }, - }), - }) + ]), + ) controller.close() }, }) - const multiplexed = createMultiplexedStream( - jsonStream, - rawStreams, - lateStreamSource, - ) + const multiplexed = createMultiplexedStream(recordStream) const reader = multiplexed.getReader() const chunks: Array = [] - // Read a few frames - for (let i = 0; i < 4; i++) { + // Read the first record and its stream. + for (let i = 0; i < 3; i++) { const { value, done } = await reader.read() - if (done) break - if (value) chunks.push(value) + if (done) { + break + } + chunks.push(value) } // Release JSON to complete resolveJson!() // Read remaining - while (true) { + for (;;) { const { done, value } = await reader.read() - if (done) break + if (done) { + break + } chunks.push(value) } @@ -577,36 +839,32 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types.filter((t) => t === FrameType.JSON).length).toBe(2) - expect(types.filter((t) => t === FrameType.CHUNK).length).toBe(2) - expect(types.filter((t) => t === FrameType.END).length).toBe(2) + expect(types.filter((t) => t === FRAME_TYPE_JSON).length).toBe(2) + expect(types.filter((t) => t === FRAME_TYPE_CHUNK).length).toBe(2) + expect(types.filter((t) => t === FRAME_TYPE_END).length).toBe(2) }) it('should handle raw stream error', async () => { - const jsonStream = new ReadableStream({ - start(controller) { - controller.enqueue('{}') - controller.close() - }, - }) - const errorStream = new ReadableStream({ start(controller) { controller.error(new Error('Stream failed')) }, }) - const rawStreams = new Map>() - rawStreams.set(10, errorStream) - - const multiplexed = createMultiplexedStream(jsonStream, rawStreams) + const multiplexed = createMultiplexedStream( + createRecordStream([ + createRecord('{}', [{ id: 10, stream: errorStream }]), + ]), + ) const reader = multiplexed.getReader() const chunks: Array = [] - while (true) { + for (;;) { const { done, value } = await reader.read() - if (done) break + if (done) { + break + } chunks.push(value) } @@ -616,13 +874,13 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types).toContain(FrameType.JSON) - expect(types).toContain(FrameType.ERROR) + expect(types).toContain(FRAME_TYPE_JSON) + expect(types).toContain(FRAME_TYPE_ERROR) // Find ERROR frame and check content const errorFrame = chunks.find((chunk) => { const view = new DataView(chunk.buffer, chunk.byteOffset) - return view.getUint8(0) === FrameType.ERROR + return view.getUint8(0) === FRAME_TYPE_ERROR }) expect(errorFrame).toBeDefined() @@ -631,11 +889,10 @@ describe('frame-protocol', () => { }) it('should propagate JSON stream error to output (fatal)', async () => { - let errorController: ReadableStreamDefaultController - const jsonStream = new ReadableStream({ + let errorController: ReadableStreamDefaultController + const recordStream = new ReadableStream({ start(controller) { errorController = controller - controller.enqueue('{"first":true}') }, }) @@ -648,17 +905,18 @@ describe('frame-protocol', () => { }, }) - const rawStreams = new Map>() - rawStreams.set(1, rawStream) + errorController!.enqueue( + createRecord('{"first":true}', [{ id: 1, stream: rawStream }]), + ) - const multiplexed = createMultiplexedStream(jsonStream, rawStreams) + const multiplexed = createMultiplexedStream(recordStream) const reader = multiplexed.getReader() // Should be able to read first JSON frame const { value: firstChunk } = await reader.read() expect(firstChunk).toBeDefined() const view = new DataView(firstChunk!.buffer, firstChunk!.byteOffset) - expect(view.getUint8(0)).toBe(FrameType.JSON) + expect(view.getUint8(0)).toBe(FRAME_TYPE_JSON) // Now error the JSON stream errorController!.error(new Error('JSON serialization failed')) @@ -669,13 +927,6 @@ describe('frame-protocol', () => { it('should not hang when raw stream never ends', async () => { // This tests the fix for hanging requests - const jsonStream = new ReadableStream({ - start(controller) { - controller.enqueue('{}') - controller.close() - }, - }) - let rawStreamCancelled = false const neverEndingStream = new ReadableStream({ start(controller) { @@ -687,10 +938,11 @@ describe('frame-protocol', () => { }, }) - const rawStreams = new Map>() - rawStreams.set(1, neverEndingStream) - - const multiplexed = createMultiplexedStream(jsonStream, rawStreams) + const multiplexed = createMultiplexedStream( + createRecordStream([ + createRecord('{}', [{ id: 1, stream: neverEndingStream }]), + ]), + ) const reader = multiplexed.getReader() // Read first two frames (JSON and CHUNK) diff --git a/packages/start-server-core/tests/server-functions-handler.test.ts b/packages/start-server-core/tests/server-functions-handler.test.ts new file mode 100644 index 0000000000..011a222caa --- /dev/null +++ b/packages/start-server-core/tests/server-functions-handler.test.ts @@ -0,0 +1,555 @@ +// @vitest-environment node + +import { beforeEach, expect, test, vi } from 'vitest' +import { createStream, fromCrossJSON } from 'seroval' +import { + TSS_CONTENT_TYPE_FRAMED_VERSIONED, + X_TSS_SERIALIZED, +} from '@tanstack/start-client-core' +import { + FRAME_HEADER_SIZE, + FRAME_TYPE_CHUNK, + FRAME_TYPE_JSON, + MAX_FRAMED_STREAMS, +} from '@tanstack/start-client-core/client-rpc' +import { RawStream } from '@tanstack/router-core' +import { defaultSerovalDeserializerPlugins } from '@tanstack/router-core/ssr/server' +import { handleServerAction } from '../src/server-functions-handler' +import type * as StartClientCore from '@tanstack/start-client-core' + +const mocks = vi.hoisted(() => ({ + action: vi.fn(), + response: { status: 200, statusText: 'OK' }, +})) + +vi.mock('../src/getServerFnById', () => ({ + getServerFnById: () => mocks.action, +})) + +vi.mock('../src/request-response', () => ({ + getResponse: () => mocks.response, +})) + +vi.mock('@tanstack/start-client-core', async (importOriginal) => { + const actual = await importOriginal() + const { defaultSerovalDeserializerPlugins } = + await import('@tanstack/router-core/ssr/server') + return { + ...actual, + getSerovalPlugins: () => defaultSerovalDeserializerPlugins, + } +}) + +beforeEach(() => { + mocks.action.mockReset() + mocks.response.status = 200 + mocks.response.statusText = 'OK' +}) + +async function readFrames(response: Response) { + const frames: Array<{ type: number; payload: Uint8Array }> = [] + const reader = response.body!.getReader() + for (;;) { + const { done, value } = await reader.read() + if (done) { + return frames + } + frames.push({ + type: value[0]!, + payload: value.slice(FRAME_HEADER_SIZE), + }) + } +} + +function expectRawReferenceBeforeChunk( + frames: Array<{ type: number; payload: Uint8Array }>, +) { + const chunkIndex = frames.findIndex( + (frame) => frame.type === FRAME_TYPE_CHUNK, + ) + const referenceIndex = frames.findIndex( + (frame) => + frame.type === FRAME_TYPE_JSON && + new TextDecoder().decode(frame.payload).includes('tss/RawStream'), + ) + expect(referenceIndex).toBeGreaterThanOrEqual(0) + expect(chunkIndex).toBeGreaterThan(referenceIndex) +} + +test.each([false, 0, '', null])( + 'preserves the direct server-function result %j', + async (result) => { + mocks.action.mockResolvedValue({ result }) + + await expect( + handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + }), + context: {}, + serverFnId: 'test', + }), + ).resolves.toBe(result) + }, +) + +test('serializes a complete direct JSON record without LF', async () => { + mocks.action.mockResolvedValue({ result: { value: 'complete' } }) + + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + }), + context: {}, + serverFnId: 'test', + }) + + const encoded = await response.text() + const parsed = JSON.parse(encoded) + expect(encoded).toBe(JSON.stringify(parsed)) + expect(encoded).not.toContain('\n') +}) + +test('cancelling a framed response disposes its serializer', async () => { + const cancel = vi.fn() + const source = new ReadableStream({ + cancel, + }) + mocks.action.mockResolvedValue({ result: source }) + + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + }), + context: {}, + serverFnId: 'test', + }) + + expect(source.locked).toBe(true) + await response.body!.cancel('client disconnected') + expect(cancel).toHaveBeenCalledOnce() + expect(source.locked).toBe(false) +}) + +test('aborting the request disposes a handed-off framed response', async () => { + const abortController = new AbortController() + const reason = new Error('request aborted') + const cancel = vi.fn() + const source = new ReadableStream({ cancel }) + mocks.action.mockResolvedValue({ result: new RawStream(source) }) + + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + signal: abortController.signal, + }), + context: {}, + serverFnId: 'test', + }) + + await vi.waitFor(() => { + expect(source.locked).toBe(true) + }) + abortController.abort(reason) + await vi.waitFor(() => { + expect(cancel).toHaveBeenCalledOnce() + expect(cancel).toHaveBeenCalledWith(reason) + expect(source.locked).toBe(false) + }) + await expect(response.body!.getReader().read()).rejects.toBe(reason) +}) + +test('cancels synchronous RawStreams without pulling when the request is already aborted', async () => { + const abortController = new AbortController() + const reason = new Error('request already aborted') + abortController.abort(reason) + const sources = Array.from({ length: 3 }, () => { + const cancel = vi.fn(() => new Promise(() => {})) + const pull = vi.fn() + const stream = new ReadableStream( + { pull, cancel }, + { highWaterMark: 0 }, + ) + return { stream, pull, cancel } + }) + mocks.action.mockResolvedValue({ + result: sources.map(({ stream }) => new RawStream(stream)), + }) + + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + signal: abortController.signal, + }), + context: {}, + serverFnId: 'test', + }) + + await expect(response.body!.getReader().read()).rejects.toBe(reason) + await new Promise((resolve) => setTimeout(resolve, 0)) + for (const { stream, pull, cancel } of sources) { + expect(pull).not.toHaveBeenCalled() + expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) + expect(stream.locked).toBe(false) + } +}) + +test('bounds and cancels synchronous RawStreams when their response remains unread', async () => { + const sources = Array.from({ length: 3 }, () => { + const cancel = vi.fn() + const pull = vi.fn( + (controller: ReadableStreamDefaultController) => { + controller.enqueue(new Uint8Array(64 * 1024)) + }, + ) + const stream = new ReadableStream( + { pull, cancel }, + { highWaterMark: 0 }, + ) + return { stream, pull, cancel } + }) + mocks.action.mockResolvedValue({ + result: sources.map(({ stream }) => new RawStream(stream)), + }) + + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + }), + context: {}, + serverFnId: 'test', + }) + + await new Promise((resolve) => setTimeout(resolve, 0)) + expect(sources.map(({ pull }) => pull.mock.calls.length)).toEqual([1, 1, 1]) + const reason = new Error('client disconnected') + await response.body!.cancel(reason) + await new Promise((resolve) => setTimeout(resolve, 0)) + for (const { stream, pull, cancel } of sources) { + expect(pull).toHaveBeenCalledOnce() + expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) + expect(stream.locked).toBe(false) + } +}) + +test('a synchronous serialization failure cancels registered raw streams', async () => { + const cancel = vi.fn() + const source = new ReadableStream({ cancel }) + mocks.action.mockResolvedValue({ + result: { + raw: new RawStream(source), + unsupported: () => {}, + }, + }) + const consoleInfo = vi.spyOn(console, 'info').mockImplementation(() => {}) + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + + try { + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + }), + context: {}, + serverFnId: 'test', + }) + + expect(cancel).toHaveBeenCalledOnce() + expect(cancel).toHaveBeenCalledWith(expect.any(Error)) + expect(source.locked).toBe(false) + expect(response.headers.get(X_TSS_SERIALIZED)).toBe('true') + expect(response.headers.get('content-type')).toBe('application/json') + expect( + fromCrossJSON(await response.json(), { + plugins: defaultSerovalDeserializerPlugins, + }), + ).toBeInstanceOf(Error) + } finally { + consoleInfo.mockRestore() + consoleError.mockRestore() + } +}) + +test('admits replayed nested RawStream references before their chunks', async () => { + const source = new ReadableStream({ + start(controller) { + controller.enqueue(new Uint8Array([1])) + controller.close() + }, + }) + const replayed = createStream() + replayed.next(new RawStream(source)) + replayed.return(undefined) + mocks.action.mockResolvedValue({ result: { replayed } }) + + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + }), + context: {}, + serverFnId: 'test', + }) + + expectRawReferenceBeforeChunk(await readFrames(response)) +}) + +test('frames every record from a synchronously replayed Seroval stream', async () => { + const replayed = createStream() + replayed.next(1) + replayed.return(undefined) + mocks.action.mockResolvedValue({ result: { replayed } }) + + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + }), + context: {}, + serverFnId: 'test', + }) + + expect(response.headers.get('content-type')).toBe( + TSS_CONTENT_TYPE_FRAMED_VERSIONED, + ) + const frames = await readFrames(response) + expect(frames.every((frame) => frame.type === FRAME_TYPE_JSON)).toBe(true) + expect(frames.length).toBeGreaterThan(1) + + const refs = new Map() + let result: any + for (let index = 0; index < frames.length; index++) { + const encoded = new TextDecoder().decode(frames[index]!.payload) + const parsed = JSON.parse(encoded) + expect(encoded).toBe(JSON.stringify(parsed)) + expect(encoded).not.toContain('\n') + const value = fromCrossJSON(parsed, { + refs, + plugins: defaultSerovalDeserializerPlugins, + }) + if (index === 0) { + result = value + } + } + + const events: Array<[string, unknown]> = [] + result.result.replayed.on({ + next(value: unknown) { + events.push(['next', value]) + }, + throw(error: unknown) { + events.push(['throw', error]) + }, + return(value: unknown) { + events.push(['return', value]) + }, + }) + expect(events).toEqual([ + ['next', 1], + ['return', undefined], + ]) +}) + +test('keeps work discovered after a transient synchronous completion', async () => { + const replayed = createStream() + replayed.return(undefined) + let resolveLate!: (value: RawStream) => void + const late = new Promise((resolve) => { + resolveLate = resolve + }) + mocks.action.mockResolvedValue({ result: { replayed, late } }) + + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + }), + context: {}, + serverFnId: 'test', + }) + resolveLate( + new RawStream( + new ReadableStream({ + start(controller) { + controller.enqueue(new Uint8Array([1])) + controller.close() + }, + }), + ), + ) + + expectRawReferenceBeforeChunk(await readFrames(response)) +}) + +test('bounds synchronously replayed Seroval records before framing', async () => { + const replayed = createStream() + for (let index = 0; index < 1025; index++) { + replayed.next(index) + } + replayed.return(undefined) + mocks.action.mockResolvedValue({ result: { replayed } }) + const consoleInfo = vi.spyOn(console, 'info').mockImplementation(() => {}) + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + + try { + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + }), + context: {}, + serverFnId: 'test', + }) + + const error = fromCrossJSON(await response.json(), { + plugins: defaultSerovalDeserializerPlugins, + }) + expect(error).toBeInstanceOf(Error) + expect((error as Error).message).toContain('pending output limit') + } finally { + consoleInfo.mockRestore() + consoleError.mockRestore() + } +}) + +test('admits late RawStream references before their chunks', async () => { + let resolveRawStream!: (value: RawStream) => void + const lateRawStream = new Promise((resolve) => { + resolveRawStream = resolve + }) + mocks.action.mockResolvedValue({ result: { lateRawStream } }) + + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + }), + context: {}, + serverFnId: 'test', + }) + resolveRawStream( + new RawStream( + new ReadableStream({ + start(controller) { + controller.enqueue(new Uint8Array([2])) + controller.close() + }, + }), + ), + ) + + expectRawReferenceBeforeChunk(await readFrames(response)) +}) + +test('rejects a non-ASCII JSON record larger than the wire limit', async () => { + const cancel = vi.fn() + const source = new ReadableStream({ cancel }) + // h3 leaves the status unset until a handler sets one. + mocks.response.status = undefined as unknown as number + mocks.action.mockResolvedValue({ + result: { + // UTF-16 length is within the old limit, but UTF-8 is over 16 MiB. + value: 'é'.repeat(8 * 1024 * 1024), + raw: new RawStream(source), + }, + }) + + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + }), + context: {}, + serverFnId: 'test', + }) + + expect(cancel).toHaveBeenCalledOnce() + expect(source.locked).toBe(false) + // Nothing reached the client yet, so the whole call fails. + expect(response.status).toBe(500) + expect(response.headers.get('content-type')).toBe('application/json') + expect(await response.text()).toContain('pending output limit') +}) + +test.each(['RawStream', 'ReadableStream'])( + 'cancels %s serialization when Response construction rejects it', + async (kind) => { + const cancel = vi.fn() + const source = new ReadableStream({ cancel }) + mocks.response.status = 204 + mocks.response.statusText = 'No Content' + mocks.action.mockResolvedValue({ + result: kind === 'RawStream' ? new RawStream(source) : source, + }) + const consoleInfo = vi.spyOn(console, 'info').mockImplementation(() => {}) + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + + try { + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + }), + context: {}, + serverFnId: 'test', + }) + + expect(response.status).toBe(500) + expect(response.statusText).toBe('') + expect(cancel).toHaveBeenCalledOnce() + expect(source.locked).toBe(false) + } finally { + consoleInfo.mockRestore() + consoleError.mockRestore() + } + }, +) + +test('rejects excess RawStreams before starting their readers', async () => { + let pullCount = 0 + let cancelCount = 0 + const sources = Array.from( + { length: MAX_FRAMED_STREAMS + 1 }, + () => + new ReadableStream( + { + pull() { + pullCount++ + }, + cancel() { + cancelCount++ + }, + }, + { highWaterMark: 0 }, + ), + ) + mocks.action.mockResolvedValue({ + result: sources.map((source) => new RawStream(source)), + }) + const consoleInfo = vi.spyOn(console, 'info').mockImplementation(() => {}) + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + + try { + const response = await handleServerAction({ + request: new Request('http://localhost/_serverFn/test', { + method: 'POST', + headers: { 'x-tsr-serverFn': 'true' }, + }), + context: {}, + serverFnId: 'test', + }) + + expect(response.headers.get('content-type')).toBe('application/json') + expect(pullCount).toBe(0) + expect(cancelCount).toBe(MAX_FRAMED_STREAMS + 1) + expect(sources.every((source) => !source.locked)).toBe(true) + } finally { + consoleInfo.mockRestore() + consoleError.mockRestore() + } +}) diff --git a/packages/start-static-server-functions/src/staticFunctionMiddleware.ts b/packages/start-static-server-functions/src/staticFunctionMiddleware.ts index e6681fce1d..ff20ab1ba2 100644 --- a/packages/start-static-server-functions/src/staticFunctionMiddleware.ts +++ b/packages/start-static-server-functions/src/staticFunctionMiddleware.ts @@ -2,7 +2,9 @@ import fs from 'node:fs/promises' import path from 'node:path' import { createMiddleware, + defaultSerovalDeserializerPlugins, getDefaultSerovalPlugins, + getSerovalPlugins, } from '@tanstack/start-client-core' import { fromJSON, toJSONAsync } from 'seroval' @@ -69,9 +71,6 @@ const jsonToFilenameSafeString = (json: any) => { .replace(/\s+/g, '_') // Optionally replace whitespace with underscores } -const staticClientCache = - typeof document !== 'undefined' ? new Map() : null - async function addItemToCache({ functionId, data, @@ -81,27 +80,25 @@ async function addItemToCache({ data: any response: StaticCachedResult }): Promise { - { - const hash = jsonToFilenameSafeString(data) - const url = await getStaticCacheUrl({ functionId, hash }) - const clientUrl = process.env.TSS_CLIENT_OUTPUT_DIR! - const filePath = path.join(clientUrl, url) + const hash = jsonToFilenameSafeString(data) + const url = await getStaticCacheUrl({ functionId, hash }) + const clientUrl = process.env.TSS_CLIENT_OUTPUT_DIR! + const filePath = path.join(clientUrl, url) - // Ensure the directory exists - await fs.mkdir(path.dirname(filePath), { recursive: true }) + // Ensure the directory exists + await fs.mkdir(path.dirname(filePath), { recursive: true }) - // Store the result with fs - const stringifiedResult = JSON.stringify( - await toJSONAsync( - { - result: response.result, - context: response.context.sendContext, - }, - { plugins: getDefaultSerovalPlugins() }, - ), - ) - await fs.writeFile(filePath, stringifiedResult, 'utf-8') - } + // Store the result with fs + const stringifiedResult = JSON.stringify( + await toJSONAsync( + { + result: response.result, + context: response.context.sendContext, + }, + { plugins: getDefaultSerovalPlugins() }, + ), + ) + await fs.writeFile(filePath, stringifiedResult, 'utf-8') } const fetchItem = async ({ @@ -114,15 +111,16 @@ const fetchItem = async ({ const hash = jsonToFilenameSafeString(data) const url = await getStaticCacheUrl({ functionId, hash }) - let result: any = staticClientCache?.get(url) - - result = await fetch(url, { + return fetch(url, { method: 'GET', }) .then((r) => r.json()) - .then((d) => fromJSON(d, { plugins: getDefaultSerovalPlugins() })) - - return result + .then((d) => + fromJSON(d, { + // Cached responses may carry RawStream nodes. + plugins: getSerovalPlugins(defaultSerovalDeserializerPlugins), + }), + ) } export const staticFunctionMiddleware = createMiddleware({ type: 'function' }) diff --git a/packages/vue-router-ssr-query/package.json b/packages/vue-router-ssr-query/package.json index ff50d275fa..96eea78624 100644 --- a/packages/vue-router-ssr-query/package.json +++ b/packages/vue-router-ssr-query/package.json @@ -75,7 +75,7 @@ "peerDependencies": { "@tanstack/query-core": ">=5.102.0", "@tanstack/vue-query": ">=5.102.0", - "@tanstack/vue-router": ">=1.127.0", + "@tanstack/vue-router": ">=1.170.30", "vue": "^3.3.0" } } diff --git a/packages/vue-router-ssr-query/src/index.tsx b/packages/vue-router-ssr-query/src/index.tsx index c9b666acad..42a97b7df1 100644 --- a/packages/vue-router-ssr-query/src/index.tsx +++ b/packages/vue-router-ssr-query/src/index.tsx @@ -31,6 +31,13 @@ export function setupRouterSsrQueryIntegration( if (OGWrap) { return Vue.h(OGWrap, null, () => children) } + + // Returning the slot array creates an implicit Vue Fragment around the + // document. Preserve its sole VNode so `` remains the outer root. + if (children?.length === 1) { + return children[0] + } + return children } }, diff --git a/packages/vue-router/src/Scripts.tsx b/packages/vue-router/src/Scripts.tsx index 04318c875e..729441d28c 100644 --- a/packages/vue-router/src/Scripts.tsx +++ b/packages/vue-router/src/Scripts.tsx @@ -1,44 +1,28 @@ import * as Vue from 'vue' -import { _getAssetMatches } from '@tanstack/router-core' +import { + composeSsrBodyScripts, + getSsrBodyScriptParts, +} from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' import { useSelector } from '@tanstack/vue-store' import { Asset } from './Asset' import { useRouter } from './useRouter' import type { RouterManagedTag } from '@tanstack/router-core' +/** + * During streaming SSR, `` marks where late hydration scripts may + * begin to be inserted. + */ export const Scripts = Vue.defineComponent({ name: 'Scripts', setup() { const router = useRouter() const nonce = router.options.ssr?.nonce - const matches = useSelector(router.stores.matches, _getAssetMatches) + const matches = useSelector(router.stores.matches, (value) => value) - const scripts = Vue.computed(() => { - const userScripts: Array = [] - const assetScripts: Array = [] - const manifest = router.ssr?.manifest - for (const match of matches.value) { - for (const script of match.scripts ?? []) { - if (!script) { - continue - } - const { children, ...attrs } = script - userScripts.push({ - tag: 'script', - attrs: { ...attrs, nonce }, - children, - }) - } - for (const asset of manifest?.routes[match.routeId]?.scripts ?? []) { - assetScripts.push({ - tag: 'script', - attrs: { ...asset.attrs, nonce }, - children: asset.children, - }) - } - } - return [userScripts, assetScripts] as const - }) + const scripts = Vue.computed(() => + getSsrBodyScriptParts(matches.value, router.ssr?.manifest, nonce), + ) const mounted = Vue.ref(false) Vue.onMounted(() => { @@ -53,20 +37,21 @@ export const Scripts = Vue.defineComponent({ function renderScripts( router: ReturnType, - [scripts, assetScripts]: readonly [ - Array, - Array, - ], + scriptParts: ReturnType, mounted: boolean, nonce?: string, ) { const allScripts: Array = [] + let streamBoundary: RouterManagedTag | undefined + const [scripts, assetScripts] = scriptParts if ((isServer ?? router.isServer) && router.serverSsr) { - const serverBufferedScript = router.serverSsr.takeBufferedScripts() - if (serverBufferedScript) { - allScripts.push(serverBufferedScript) - } + const initialHydrationScripts = + router.serverSsr.takeInitialHydrationScriptTags() + allScripts.push( + ...composeSsrBodyScripts(scriptParts, initialHydrationScripts), + ) + return renderScriptTags(allScripts) } else if (router.ssr && !mounted) { allScripts.push({ tag: 'script', @@ -74,15 +59,14 @@ function renderScripts( children: '', } satisfies RouterManagedTag) - allScripts.push({ + streamBoundary = { tag: 'script', attrs: { nonce, - id: '$tsr-stream-barrier', 'data-allow-mismatch': true, }, children: '', - } satisfies RouterManagedTag) + } satisfies RouterManagedTag for (const asset of assetScripts) { allScripts.push({ @@ -98,10 +82,18 @@ function renderScripts( allScripts.push(...scripts) - if (mounted || ((isServer ?? router.isServer) && router.serverSsr)) { + if (mounted) { allScripts.push(...assetScripts) } + if (streamBoundary) { + allScripts.push(streamBoundary) + } + + return renderScriptTags(allScripts) +} + +function renderScriptTags(allScripts: Array) { return ( <> {allScripts.map((asset, i) => ( diff --git a/packages/vue-router/src/index.tsx b/packages/vue-router/src/index.tsx index ebc8f46aba..f63a763e25 100644 --- a/packages/vue-router/src/index.tsx +++ b/packages/vue-router/src/index.tsx @@ -197,7 +197,6 @@ export type { RegisteredRouter, RouterContextOptions, ControllablePromise, - InjectedHtmlEntry, RouterOptions, RouterState, ListenerFn, diff --git a/packages/vue-router/src/ssr/defaultStreamHandler.tsx b/packages/vue-router/src/ssr/defaultStreamHandler.tsx index 5c663c8f5b..574a1edb66 100644 --- a/packages/vue-router/src/ssr/defaultStreamHandler.tsx +++ b/packages/vue-router/src/ssr/defaultStreamHandler.tsx @@ -3,8 +3,8 @@ import { renderRouterToStream } from './renderRouterToStream' import { RouterServer } from './RouterServer' export const defaultStreamHandler = defineHandlerCallback( - async ({ request, router, responseHeaders }) => - await renderRouterToStream({ + ({ request, router, responseHeaders }) => + renderRouterToStream({ request, router, responseHeaders, diff --git a/packages/vue-router/src/ssr/renderRouterToStream.tsx b/packages/vue-router/src/ssr/renderRouterToStream.tsx index d352c52497..c48354546e 100644 --- a/packages/vue-router/src/ssr/renderRouterToStream.tsx +++ b/packages/vue-router/src/ssr/renderRouterToStream.tsx @@ -1,66 +1,25 @@ -import { ReadableStream as NodeReadableStream } from 'node:stream/web' import * as Vue from 'vue' -import { pipeToWebWritable, renderToString } from 'vue/server-renderer' +import { renderToString, renderToWebStream } from 'vue/server-renderer' import { isbot } from 'isbot' import { createSsrStreamResponse, + getSsrStatus, + transformHtmlStringWithRouter, transformReadableStreamWithRouter, + waitForRequest, } from '@tanstack/router-core/ssr/server' import type { AnyRouter } from '@tanstack/router-core' import type { Component } from 'vue' -const isAbortError = (request: Request, error: unknown) => - (request.signal.aborted && error === request.signal.reason) || - (error instanceof Error && error.name === 'AbortError') || - (error as any)?.code === 'ABORT_ERR' +const DOCTYPE = new TextEncoder().encode('') -function prependDoctype( - readable: globalThis.ReadableStream, -): NodeReadableStream { - const encoder = new TextEncoder() - let sentDoctype = false - let reader: ReadableStreamDefaultReader | undefined - const releaseReader = () => { - try { - reader?.releaseLock() - } catch { - // ignore - } - reader = undefined +/** The router transport needs `` as the outer root, not a fragment. */ +export function warnUnlessHtmlRoot(html: string) { + if (process.env.NODE_ENV !== 'production' && !html.startsWith(' as its outer element. A fragment or array root breaks streamed hydration scripts.', + ) } - - return new NodeReadableStream({ - start() { - reader = readable.getReader() - }, - async pull(controller) { - if (!sentDoctype) { - sentDoctype = true - controller.enqueue(encoder.encode('')) - return - } - try { - const { done, value } = await reader!.read() - if (done) { - controller.close() - releaseReader() - return - } - controller.enqueue(value) - } catch (err) { - controller.error(err) - releaseReader() - } - }, - async cancel(reason) { - try { - await reader?.cancel(reason) - } catch { - // ignore - } - releaseReader() - }, - }) } export const renderRouterToStream = async ({ @@ -74,157 +33,47 @@ export const renderRouterToStream = async ({ responseHeaders: Headers App: Component }) => { - const app = Vue.createSSRApp(App, { router }) + const signal = request.signal + if (signal.aborted) { + router.serverSsr?.cleanup() + throw signal.reason + } - if (isbot(request.headers.get('User-Agent'))) { - try { - let cleanupAbortListener: (() => void) | undefined - const abortPromise = new Promise((_, reject) => { - if (request.signal.aborted) { - reject(request.signal.reason) - return - } - const onRequestAbort = () => reject(request.signal.reason) - request.signal.addEventListener('abort', onRequestAbort, { once: true }) - cleanupAbortListener = () => { - request.signal.removeEventListener('abort', onRequestAbort) - } + try { + const app = Vue.createSSRApp(App, { router }) + + if (isbot(request.headers.get('User-Agent'))) { + let fullHtml = await waitForRequest(renderToString(app), signal) + warnUnlessHtmlRoot(fullHtml) + fullHtml = await transformHtmlStringWithRouter(router, fullHtml, { + signal, }) - - let fullHtml = await Promise.race([ - renderToString(app), - abortPromise, - ]).finally(() => cleanupAbortListener?.()) - - router.serverSsr!.setRenderFinished() - const injectedHtml = router.serverSsr!.takeBufferedHtml() - if (injectedHtml) { - fullHtml = fullHtml.replace(``, () => `${injectedHtml}`) - } - - const htmlOpenIndex = fullHtml.indexOf('') - - if (htmlOpenIndex !== -1 && htmlCloseIndex !== -1) { - fullHtml = fullHtml.slice(htmlOpenIndex, htmlCloseIndex + 7) - } else if (htmlOpenIndex !== -1) { - fullHtml = fullHtml.slice(htmlOpenIndex) - } - - return new Response(`${fullHtml}`, { - status: - router._serverResult?.type === 'render' - ? router._serverResult.status - : 200, + return new Response(fullHtml, { + status: getSsrStatus(router), headers: responseHeaders, }) - } finally { - router.serverSsr?.cleanup() - } - } - - const { writable, readable } = new TransformStream() - const innerWriter = writable.getWriter() - let writerDone = false - const releaseWriter = () => { - try { - innerWriter.releaseLock() - } catch { - // already released / errored - } - } - const abortVuePipe = (reason?: unknown) => { - if (writerDone) { - return } - writerDone = true - void innerWriter - .abort(reason) - .catch(() => {}) - .finally(releaseWriter) - } - const handleWriterError = (err: unknown) => { - if (isAbortError(request, err)) { - return - } - - throw err - } - const handleWriteError = (err: unknown) => { - if (writerDone || isAbortError(request, err)) { - return - } - - throw err - } - - const vueWritable = new WritableStream({ - write(chunk) { - if (writerDone) { - return - } - - return innerWriter.write(chunk).catch(handleWriteError) - }, - close() { - if (writerDone) { - return - } - - writerDone = true - return innerWriter.close().catch(handleWriterError).finally(releaseWriter) - }, - abort(reason) { - if (writerDone) { - return - } - - writerDone = true - return innerWriter - .abort(reason) - .catch(handleWriterError) - .finally(releaseWriter) - }, - }) - - // `pipeToWebWritable` returns void (see @vue/server-renderer). Pass a - // proxy writable so request aborts can abort the real TransformStream - // writer even while Vue holds a lock on the proxy writable. - try { - pipeToWebWritable(app, {}, vueWritable) - } catch (err) { - console.error('Error in Vue pipeToWebWritable:', err) - // Setup failed before any pipe was wired; abort writable so the - // readable side errors instead of hanging until the lifetime timeout. - abortVuePipe(err) - } - - if (request.signal.aborted) { - abortVuePipe(request.signal.reason) - } else { - const onRequestAbort = () => abortVuePipe(request.signal.reason) - request.signal.addEventListener('abort', onRequestAbort, { once: true }) - router.serverSsr?.onCleanup(() => { - request.signal.removeEventListener('abort', onRequestAbort) + const readable = renderToWebStream(app).pipeThrough( + new TransformStream({ + start(controller) { + controller.enqueue(DOCTYPE) + }, + }), + ) + const responseStream = transformReadableStreamWithRouter(router, readable, { + signal, }) + + return createSsrStreamResponse( + router, + new Response(responseStream, { + status: getSsrStatus(router), + headers: responseHeaders, + }), + ) + } catch (error) { + router.serverSsr?.cleanup() + throw error } - - const doctypedStream = prependDoctype(readable) - const responseStream = transformReadableStreamWithRouter( - router, - doctypedStream, - { signal: request.signal, onAbort: abortVuePipe }, - ) - - return createSsrStreamResponse( - router, - new Response(responseStream as any, { - status: - router._serverResult?.type === 'render' - ? router._serverResult.status - : 200, - headers: responseHeaders, - }), - ) } diff --git a/packages/vue-router/src/ssr/renderRouterToString.tsx b/packages/vue-router/src/ssr/renderRouterToString.tsx index 723aa0b91e..38681de5d8 100644 --- a/packages/vue-router/src/ssr/renderRouterToString.tsx +++ b/packages/vue-router/src/ssr/renderRouterToString.tsx @@ -1,5 +1,7 @@ import * as Vue from 'vue' import { renderToString as vueRenderToString } from 'vue/server-renderer' +import { renderSsrHtmlResponse } from '@tanstack/router-core/ssr/server' +import { warnUnlessHtmlRoot } from './renderRouterToStream' import type { AnyRouter } from '@tanstack/router-core' import type { Component } from 'vue' @@ -12,31 +14,14 @@ export const renderRouterToString = async ({ responseHeaders: Headers App: Component }) => { - try { - const app = Vue.createSSRApp(App, { router }) - - let html = await vueRenderToString(app) - router.serverSsr!.setRenderFinished() - - const injectedHtml = router.serverSsr!.takeBufferedHtml() - if (injectedHtml) { - html = html.replace(``, () => `${injectedHtml}`) - } - - return new Response(`${html}`, { - status: - router._serverResult?.type === 'render' - ? router._serverResult.status - : 200, - headers: responseHeaders, - }) - } catch (error) { - console.error('Render to string error:', error) - return new Response('Internal Server Error', { - status: 500, - headers: responseHeaders, - }) - } finally { - router.serverSsr?.cleanup() - } + return renderSsrHtmlResponse({ + router, + responseHeaders, + render: async () => { + const app = Vue.createSSRApp(App, { router }) + const rendered = await vueRenderToString(app) + warnUnlessHtmlRoot(rendered) + return rendered + }, + }) } diff --git a/packages/vue-router/tests/renderRouterToStream.test.tsx b/packages/vue-router/tests/renderRouterToStream.test.tsx index 60bfa9a8af..656e8a54b5 100644 --- a/packages/vue-router/tests/renderRouterToStream.test.tsx +++ b/packages/vue-router/tests/renderRouterToStream.test.tsx @@ -4,12 +4,30 @@ import { normalizeSsrResponse, } from '@tanstack/router-core/ssr/server' import { createMemoryHistory, createRootRoute, createRouter } from '../src' +import type { RouterManagedTag } from '@tanstack/router-core' +import type * as RouterSsrServer from '@tanstack/router-core/ssr/server' import type * as VueServerRenderer from 'vue/server-renderer' const rendererMocks = vi.hoisted(() => ({ - pipeToWebWritable: vi.fn(), + renderToWebStream: vi.fn(), renderToString: vi.fn(), })) +const routerTransformMocks = vi.hoisted(() => ({ + readableOptions: vi.fn(), +})) + +vi.mock('@tanstack/router-core/ssr/server', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + transformReadableStreamWithRouter: ( + ...args: Parameters + ) => { + routerTransformMocks.readableOptions(args[2]) + return actual.transformReadableStreamWithRouter(...args) + }, + } +}) vi.mock('vue/server-renderer', async () => { const actual = await vi.importActual( @@ -17,11 +35,15 @@ vi.mock('vue/server-renderer', async () => { ) return { ...actual, - pipeToWebWritable: rendererMocks.pipeToWebWritable, + renderToWebStream: rendererMocks.renderToWebStream, renderToString: rendererMocks.renderToString, } }) +const actualVueServerRenderer = await vi.importActual( + 'vue/server-renderer', +) + // Imported after mock so the wrapper picks up the mocked binding. const { renderRouterToStream } = await import('../src/ssr/renderRouterToStream') @@ -32,8 +54,9 @@ function unwrapResponse( } afterEach(() => { - rendererMocks.pipeToWebWritable.mockReset() + rendererMocks.renderToWebStream.mockReset() rendererMocks.renderToString.mockReset() + routerTransformMocks.readableOptions.mockReset() vi.restoreAllMocks() }) @@ -61,14 +84,40 @@ function drainBody(response: Response) { })().catch(() => true) } +function createManualVueStream() { + let controller!: ReadableStreamDefaultController + const cancel = vi.fn() + const stream = new ReadableStream({ + start(nextController) { + controller = nextController + }, + cancel, + }) + return { stream, controller, cancel } +} + +function renderScript(tag: RouterManagedTag) { + const attrs = tag.attrs ?? {} + const id = attrs.id ? ` id="${attrs.id}"` : '' + const nonce = attrs.nonce ? ` nonce="${attrs.nonce}"` : '' + const streamPart = + 'data-tsr-stream-part' in attrs ? ' data-tsr-stream-part=""' : '' + return `${tag.children ?? ''}` +} + describe('renderRouterToStream - sync setup failures', () => { - test('bot string response injects final scripts and cleans up', async () => { - rendererMocks.renderToString.mockResolvedValueOnce( - '
bot
', - ) + test('bot string response preserves hydration scripts and cleans up', async () => { const router = await buildRouter() await router.serverSsr!.dehydrate() const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') + const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags()! + expect(initialScripts.boundary.attrs).not.toHaveProperty('id') + const renderedScripts = [...initialScripts.before, initialScripts.boundary] + .map(renderScript) + .join('') + rendererMocks.renderToString.mockResolvedValueOnce( + `
bot
${renderedScripts}`, + ) const response = unwrapResponse( await renderRouterToStream({ @@ -83,83 +132,279 @@ describe('renderRouterToStream - sync setup failures', () => { const html = await response.text() expect(html).toContain('$_TSR.e()') + expect(html).toContain(initialScripts.boundary.children) expect(html.indexOf('$_TSR.e()')).toBeLessThan(html.indexOf('')) expect(cleanup).toHaveBeenCalledOnce() expect(router.serverSsr).toBeUndefined() }) - test('pipeToWebWritable sync throw terminates response stream', async () => { - rendererMocks.pipeToWebWritable.mockImplementationOnce(() => { - throw new Error('forced-sync-setup-throw') + test('request abort stops a bot wait and removes its temporary listener', async () => { + rendererMocks.renderToString.mockImplementationOnce( + () => new Promise(() => {}), + ) + const router = await buildRouter() + const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') + const abortController = new AbortController() + const request = new Request('http://localhost/', { + headers: { 'User-Agent': 'Googlebot' }, + signal: abortController.signal, }) + const addEventListener = vi.spyOn(request.signal, 'addEventListener') + const reason = new Error('bot-request-gone') + + const responsePromise = renderRouterToStream({ + request, + router, + responseHeaders: new Headers(), + App: { template: '
' } as any, + }) + await Promise.resolve() + abortController.abort(reason) + + await expect(responsePromise).rejects.toBe(reason) + // The shared abort waiter registers once; `{ once: true }` retires it. + expect( + addEventListener.mock.calls.filter(([type]) => type === 'abort'), + ).toHaveLength(1) + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + }) + + test('an already-aborted bot request does not start string rendering', async () => { + const router = await buildRouter() + const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') + const abortController = new AbortController() + const reason = new Error('bot-already-gone') + abortController.abort(reason) + + await expect( + renderRouterToStream({ + request: new Request('http://localhost/', { + headers: { 'User-Agent': 'Googlebot' }, + signal: abortController.signal, + }), + router, + responseHeaders: new Headers(), + App: { template: '
' } as any, + }), + ).rejects.toBe(reason) + + expect(rendererMocks.renderToString).not.toHaveBeenCalled() + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + }) + + test('prepends one doctype without wrapping the renderer stream', async () => { + const router = await buildRouter() + await router.serverSsr!.dehydrate() + const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags()! + const renderedScripts = [...initialScripts.before, initialScripts.boundary] + .map(renderScript) + .join('') + const appHtml = `
app
${renderedScripts}` + rendererMocks.renderToWebStream.mockReturnValueOnce( + new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode(appHtml)) + controller.close() + }, + }), + ) + + const response = unwrapResponse( + await renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + App: { template: '
' } as any, + }), + ) + const html = await response.text() + + expect(html).toBe(`${appHtml}`) + expect(html.match(//g)).toHaveLength(1) + expect(router.serverSsr).toBeUndefined() + }) + + test('already-aborted requests do not start the Vue producer', async () => { + const router = await buildRouter() + const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') + const abortController = new AbortController() + const reason = new Error('already-gone') + abortController.abort(reason) + + await expect( + renderRouterToStream({ + request: new Request('http://localhost/', { + signal: abortController.signal, + }), + router, + responseHeaders: new Headers(), + App: { template: '
' } as any, + }), + ).rejects.toBe(reason) + + expect(rendererMocks.renderToWebStream).not.toHaveBeenCalled() + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + }) + + test('an abort during producer setup rejects before a response', async () => { + const abortController = new AbortController() + const reason = new Error('reentrant-abort') + rendererMocks.renderToWebStream.mockImplementationOnce( + actualVueServerRenderer.renderToWebStream, + ) const router = await buildRouter() + await expect( + renderRouterToStream({ + request: new Request('http://localhost/', { + signal: abortController.signal, + }), + router, + responseHeaders: new Headers(), + App: { + setup() { + abortController.abort(reason) + return () => null + }, + }, + }), + ).rejects.toBe(reason) + + expect(router.serverSsr).toBeUndefined() + }) + + test('real synchronous renderer failure rejects before creating a response', async () => { + const setupError = new Error('real-vue-setup-failure') + rendererMocks.renderToWebStream.mockImplementationOnce( + actualVueServerRenderer.renderToWebStream, + ) + const router = await buildRouter() + const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') + const originalServerSsr = router.serverSsr! + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + try { + await expect( + renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + App: { + setup() { + throw setupError + }, + }, + }), + ).rejects.toBe(setupError) + + expect(routerTransformMocks.readableOptions).not.toHaveBeenCalled() + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + } finally { + errorSpy.mockRestore() + warnSpy.mockRestore() + originalServerSsr.cleanup() + } + }) + + test('request abort drops later Vue writes and terminates the response', async () => { + const vue = createManualVueStream() + rendererMocks.renderToWebStream.mockReturnValueOnce(vue.stream) + + const router = await buildRouter() + const abortController = new AbortController() + const request = new Request('http://localhost/', { + signal: abortController.signal, + }) + const addEventListener = vi.spyOn(request.signal, 'addEventListener') + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const response = unwrapResponse( + await renderRouterToStream({ + request, + router, + responseHeaders: new Headers(), + App: { template: '
' } as any, + }), + ) + + expect( + addEventListener.mock.calls.filter(([type]) => type === 'abort'), + ).toHaveLength(1) + const reason = new Error('client-gone') + abortController.abort(reason) + expect(response.body).not.toBeNull() + + expect(await drainBody(response)).toBe(true) + expect(vue.cancel).toHaveBeenCalledWith(reason) + expect(() => + vue.controller.enqueue(new TextEncoder().encode('
')), + ).toThrow() + } finally { + errorSpy.mockRestore() + router.serverSsr?.cleanup() + } + }) + + test('downstream cancellation stops Vue writes and cleans up once', async () => { + const vue = createManualVueStream() + rendererMocks.renderToWebStream.mockReturnValueOnce(vue.stream) + + const router = await buildRouter() + const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') + const response = unwrapResponse( + await renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + App: { template: '
' } as any, + }), + ) + + await response.body!.cancel('consumer-gone') + expect(vue.cancel).toHaveBeenCalledWith('consumer-gone') + expect(() => + vue.controller.enqueue(new TextEncoder().encode('
')), + ).toThrow() + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() + }) + + test('a renderer buffer failure errors the response body', async () => { + const renderError = new Error('vue-buffer-failed') + rendererMocks.renderToWebStream.mockImplementationOnce( + actualVueServerRenderer.renderToWebStream, + ) + const router = await buildRouter() + const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') + router.serverSsr!.disableHydration() + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) try { const response = unwrapResponse( await renderRouterToStream({ request: new Request('http://localhost/'), router, responseHeaders: new Headers(), - App: { template: '
' } as any, + App: { + ssrRender(_context: unknown, push: (value: unknown) => void) { + push('partial') + push(Promise.reject(renderError)) + }, + } as any, }), ) - const terminated = await Promise.race([ - drainBody(response), - new Promise((resolve) => setTimeout(() => resolve(false), 2000)), - ]) - - expect(terminated).toBe(true) - } finally { - errorSpy.mockRestore() - router.serverSsr?.cleanup() - } - }) - - test('request abort drops later Vue writes and terminates the response', async () => { - let vueWriter: WritableStreamDefaultWriter | undefined - rendererMocks.pipeToWebWritable.mockImplementationOnce( - ( - _app: unknown, - _context: unknown, - writable: WritableStream, - ) => { - vueWriter = writable.getWriter() - }, - ) - - const router = await buildRouter() - const abortController = new AbortController() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - try { - const response = unwrapResponse( - await renderRouterToStream({ - request: new Request('http://localhost/', { - signal: abortController.signal, - }), - router, - responseHeaders: new Headers(), - App: { template: '
' } as any, - }), - ) - - expect(vueWriter).toBeDefined() - abortController.abort(new Error('client-gone')) - - await expect( - vueWriter!.write(new TextEncoder().encode('
')), - ).resolves.toBeUndefined() - expect(response.body).not.toBeNull() - - const terminated = await Promise.race([ - drainBody(response), - new Promise((resolve) => setTimeout(() => resolve(false), 2000)), - ]) - - expect(terminated).toBe(true) + await expect(response.text()).rejects.toBe(renderError) + expect(cleanup).toHaveBeenCalledOnce() + expect(router.serverSsr).toBeUndefined() } finally { errorSpy.mockRestore() + warnSpy.mockRestore() router.serverSsr?.cleanup() } }) diff --git a/packages/vue-router/tests/ssr-test-utils.ts b/packages/vue-router/tests/ssr-test-utils.ts index 7d8c5c80f3..91770af4dc 100644 --- a/packages/vue-router/tests/ssr-test-utils.ts +++ b/packages/vue-router/tests/ssr-test-utils.ts @@ -11,8 +11,8 @@ export async function dehydrateToBootstrap( await router.load() await router.serverSsr!.dehydrate() - const script = router.serverSsr!.takeBufferedScripts() - if (typeof script?.children !== 'string') { + const scripts = router.serverSsr!.takeInitialHydrationScriptTags() + if (!scripts?.before.length) { throw new Error( 'Expected server dehydration to produce a bootstrap script', ) @@ -30,7 +30,9 @@ export async function dehydrateToBootstrap( }, } context.self = context - runInNewContext(script.children, context) + for (const script of scripts.before) { + runInNewContext(script.children!, context) + } if (!context.$_TSR) { throw new Error('Expected bootstrap script to initialize $_TSR') diff --git a/packages/vue-start-server/src/defaultStreamHandler.tsx b/packages/vue-start-server/src/defaultStreamHandler.tsx index 2eb8c09f82..c02aeb8c6c 100644 --- a/packages/vue-start-server/src/defaultStreamHandler.tsx +++ b/packages/vue-start-server/src/defaultStreamHandler.tsx @@ -5,8 +5,8 @@ import { import { StartServer } from './StartServer' export const defaultStreamHandler = defineHandlerCallback( - async ({ request, router, responseHeaders }) => - await renderRouterToStream({ + ({ request, router, responseHeaders }) => + renderRouterToStream({ request, router, responseHeaders, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5320b3268a..a759613fc6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3903,6 +3903,9 @@ importers: '@typescript/native': specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 + '@vitejs/plugin-react': + specifier: ^6.0.1 + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -5730,6 +5733,49 @@ importers: specifier: ^2.11.11 version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + e2e/solid-start/streaming-ssr: + dependencies: + '@tanstack/solid-query': + specifier: ^5.102.0 + version: 5.102.0(solid-js@1.9.12) + '@tanstack/solid-router': + specifier: workspace:^ + version: link:../../../packages/solid-router + '@tanstack/solid-router-ssr-query': + specifier: workspace:* + version: link:../../../packages/solid-router-ssr-query + '@tanstack/solid-start': + specifier: workspace:* + version: link:../../../packages/solid-start + solid-js: + specifier: 1.9.12 + version: 1.9.12 + devDependencies: + '@playwright/test': + specifier: ^1.63.0 + version: 1.63.0 + '@tanstack/router-e2e-utils': + specifier: workspace:^ + version: link:../../e2e-utils + '@types/node': + specifier: 25.0.9 + version: 25.0.9 + '@typescript/native': + specifier: npm:typescript@^7.0.2 + version: typescript@7.0.2 + srvx: + specifier: ^0.11.9 + version: 0.11.15 + typescript: + specifier: npm:@typescript/typescript6@^6.0.2 + version: '@typescript/typescript6@6.0.2' + vite: + 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.9.0) + vite-plugin-solid: + specifier: ^2.11.11 + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + e2e/solid-start/virtual-routes: dependencies: '@tanstack/solid-router': @@ -7597,6 +7643,49 @@ 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.9.0) + e2e/vue-start/streaming-ssr: + dependencies: + '@tanstack/vue-query': + specifier: ^5.102.0 + version: 5.102.0(vue@3.5.25(@typescript/typescript6@6.0.2)) + '@tanstack/vue-router': + specifier: workspace:* + version: link:../../../packages/vue-router + '@tanstack/vue-router-ssr-query': + specifier: workspace:* + version: link:../../../packages/vue-router-ssr-query + '@tanstack/vue-start': + specifier: workspace:* + version: link:../../../packages/vue-start + vue: + specifier: ^3.5.16 + version: 3.5.25(@typescript/typescript6@6.0.2) + devDependencies: + '@playwright/test': + specifier: ^1.63.0 + version: 1.63.0 + '@tanstack/router-e2e-utils': + specifier: workspace:^ + version: link:../../e2e-utils + '@types/node': + specifier: 25.0.9 + version: 25.0.9 + '@typescript/native': + specifier: npm:typescript@^7.0.2 + version: typescript@7.0.2 + '@vitejs/plugin-vue-jsx': + specifier: ^5.1.5 + version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + srvx: + specifier: ^0.11.9 + version: 0.11.15 + typescript: + specifier: npm:@typescript/typescript6@^6.0.2 + version: '@typescript/typescript6@6.0.2' + vite: + 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.9.0) + e2e/vue-start/virtual-routes: dependencies: '@tanstack/virtual-file-routes': @@ -23026,18 +23115,10 @@ packages: resolution: {integrity: sha512-LOtTn+JgJvX8WfBVJtF08TGrdjuFzGJc4mkP8EdDI8ADbvO7kiexYep1o8dwnt0okb0jYclCDXF13xU7Ge4zSw==} engines: {node: '>=18.0.0'} - '@whatwg-node/fetch@0.10.11': - resolution: {integrity: sha512-eR8SYtf9Nem1Tnl0IWrY33qJ5wCtIWlt3Fs3c6V4aAaTFLtkEQErXu3SSZg/XCHrj9hXSJ8/8t+CdMk5Qec/ZA==} - engines: {node: '>=18.0.0'} - '@whatwg-node/fetch@0.10.13': resolution: {integrity: sha512-b4PhJ+zYj4357zwk4TTuF2nEe0vVtOrwdsrNo5hL+u1ojXNhh1FgJ6pg1jzDlwlT4oBdzfSwaBwMCtFCsIWg8Q==} engines: {node: '>=18.0.0'} - '@whatwg-node/node-fetch@0.8.1': - resolution: {integrity: sha512-cQmQEo7IsI0EPX9VrwygXVzrVlX43Jb7/DBZSmpnC7xH4xkyOnn/HykHpTaQk7TUs7zh59A5uTGqx3p2Ouzffw==} - engines: {node: '>=18.0.0'} - '@whatwg-node/node-fetch@0.8.6': resolution: {integrity: sha512-BDMdYFcerLQkwA2RTldxOqRCs6ZQD1S7UgP3pUdGUkcbgTrP/V5ko77ZkCww9DHmC4lpoYuwigGfQYj285gMvA==} engines: {node: '>=18.0.0'} @@ -38257,25 +38338,11 @@ snapshots: '@whatwg-node/promise-helpers': 1.3.2 tslib: 2.8.1 - '@whatwg-node/fetch@0.10.11': - dependencies: - '@whatwg-node/node-fetch': 0.8.1 - urlpattern-polyfill: 10.1.0 - optional: true - '@whatwg-node/fetch@0.10.13': dependencies: '@whatwg-node/node-fetch': 0.8.6 urlpattern-polyfill: 10.1.0 - '@whatwg-node/node-fetch@0.8.1': - dependencies: - '@fastify/busboy': 3.1.1 - '@whatwg-node/disposablestack': 0.0.6 - '@whatwg-node/promise-helpers': 1.3.2 - tslib: 2.8.1 - optional: true - '@whatwg-node/node-fetch@0.8.6': dependencies: '@fastify/busboy': 3.1.1 @@ -38291,7 +38358,7 @@ snapshots: dependencies: '@envelop/instrumentation': 1.0.0 '@whatwg-node/disposablestack': 0.0.6 - '@whatwg-node/fetch': 0.10.11 + '@whatwg-node/fetch': 0.10.13 '@whatwg-node/promise-helpers': 1.3.2 tslib: 2.8.1 optional: true diff --git a/tsconfig.json b/tsconfig.json index f3765b8ed3..7228771323 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,7 +10,7 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "isolatedModules": true, - "lib": ["DOM", "DOM.Iterable", "ES2022"], + "lib": ["DOM", "DOM.Iterable", "DOM.AsyncIterable", "ES2022"], "module": "ESNext", "moduleResolution": "Bundler", "noEmit": true, From de023a753312f54231184f5b63bc640db540272d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2026 23:07:33 +0200 Subject: [PATCH 043/175] ci: Version Packages (#8429) ci: changeset release Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/deep-equal-array-identity.md | 5 - .changeset/deep-equal-positional-flags.md | 8 -- .changeset/quiet-ssr-hotspots.md | 6 -- .changeset/resolve-path-positional.md | 8 -- .changeset/steady-streams-flow.md | 35 ------ .changeset/update-parse-once.md | 7 -- .changeset/use-link-props-wrapper.md | 5 - .changeset/whole-coins-sin.md | 5 - .../package.json | 4 +- .../react/authenticated-routes/package.json | 4 +- .../basic-default-search-params/package.json | 2 +- .../react/basic-devtools-panel/package.json | 2 +- examples/react/basic-file-based/package.json | 4 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-react-query-file-based/package.json | 4 +- examples/react/basic-react-query/package.json | 2 +- .../react/basic-ssr-file-based/package.json | 4 +- .../package.json | 4 +- .../basic-virtual-file-based/package.json | 4 +- .../package.json | 4 +- examples/react/basic/package.json | 2 +- examples/react/deferred-data/package.json | 2 +- examples/react/i18n-paraglide/package.json | 4 +- .../kitchen-sink-file-based/package.json | 4 +- .../package.json | 4 +- .../kitchen-sink-react-query/package.json | 2 +- examples/react/kitchen-sink/package.json | 2 +- examples/react/large-file-based/package.json | 4 +- examples/react/location-masking/package.json | 2 +- .../react/navigation-blocking/package.json | 2 +- .../package.json | 4 +- .../react/quickstart-file-based/package.json | 4 +- .../quickstart-rspack-file-based/package.json | 4 +- .../package.json | 4 +- examples/react/quickstart/package.json | 2 +- .../router-monorepo-react-query/package.json | 4 +- .../packages/router/package.json | 4 +- .../router-monorepo-simple-lazy/package.json | 4 +- .../packages/router/package.json | 4 +- .../react/router-monorepo-simple/package.json | 4 +- .../packages/router/package.json | 4 +- .../react/scroll-restoration/package.json | 2 +- .../search-validator-adapters/package.json | 4 +- examples/react/start-bare/package.json | 4 +- examples/react/start-basic-auth/package.json | 4 +- .../react/start-basic-authjs/package.json | 4 +- .../react/start-basic-cloudflare/package.json | 4 +- .../start-basic-react-query/package.json | 6 +- .../react/start-basic-rsbuild/package.json | 4 +- .../react/start-basic-static/package.json | 6 +- examples/react/start-basic/package.json | 4 +- examples/react/start-bun/package.json | 8 +- examples/react/start-clerk-basic/package.json | 4 +- .../react/start-convex-trellaux/package.json | 6 +- examples/react/start-counter/package.json | 4 +- .../react/start-i18n-paraglide/package.json | 4 +- examples/react/start-large/package.json | 4 +- examples/react/start-material-ui/package.json | 4 +- .../react/start-next-migration/package.json | 4 +- examples/react/start-rscs/package.json | 4 +- .../package.json | 4 +- .../react/start-supabase-basic/package.json | 4 +- examples/react/start-tailwind-v4/package.json | 4 +- examples/react/start-trellaux/package.json | 6 +- examples/react/start-workos/package.json | 4 +- examples/react/view-transitions/package.json | 4 +- .../react/with-framer-motion/package.json | 2 +- .../react/with-trpc-react-query/package.json | 4 +- examples/react/with-trpc/package.json | 4 +- .../package.json | 4 +- .../solid/authenticated-routes/package.json | 4 +- .../basic-default-search-params/package.json | 2 +- .../solid/basic-devtools-panel/package.json | 2 +- examples/solid/basic-file-based/package.json | 4 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-solid-query-file-based/package.json | 4 +- examples/solid/basic-solid-query/package.json | 4 +- .../solid/basic-ssr-file-based/package.json | 4 +- .../package.json | 4 +- .../basic-virtual-file-based/package.json | 4 +- .../package.json | 4 +- examples/solid/basic/package.json | 2 +- examples/solid/deferred-data/package.json | 2 +- examples/solid/i18n-paraglide/package.json | 4 +- .../kitchen-sink-file-based/package.json | 4 +- .../package.json | 4 +- .../kitchen-sink-solid-query/package.json | 2 +- examples/solid/kitchen-sink/package.json | 2 +- examples/solid/large-file-based/package.json | 4 +- examples/solid/location-masking/package.json | 2 +- .../solid/navigation-blocking/package.json | 2 +- .../package.json | 4 +- .../solid/quickstart-file-based/package.json | 4 +- .../quickstart-rspack-file-based/package.json | 4 +- .../package.json | 4 +- examples/solid/quickstart/package.json | 2 +- .../router-monorepo-simple-lazy/package.json | 4 +- .../packages/router/package.json | 4 +- .../solid/router-monorepo-simple/package.json | 4 +- .../packages/router/package.json | 4 +- .../router-monorepo-solid-query/package.json | 4 +- .../packages/router/package.json | 4 +- .../solid/scroll-restoration/package.json | 2 +- .../search-validator-adapters/package.json | 4 +- examples/solid/start-basic-auth/package.json | 4 +- .../solid/start-basic-authjs/package.json | 4 +- .../solid/start-basic-cloudflare/package.json | 4 +- .../solid/start-basic-netlify/package.json | 4 +- examples/solid/start-basic-nitro/package.json | 4 +- .../start-basic-solid-query/package.json | 6 +- .../solid/start-basic-static/package.json | 6 +- examples/solid/start-basic/package.json | 4 +- examples/solid/start-bun/package.json | 8 +- .../start-convex-better-auth/package.json | 4 +- examples/solid/start-counter/package.json | 4 +- .../solid/start-i18n-paraglide/package.json | 4 +- examples/solid/start-large/package.json | 4 +- .../package.json | 4 +- .../solid/start-supabase-basic/package.json | 4 +- examples/solid/start-tailwind-v4/package.json | 4 +- examples/solid/view-transitions/package.json | 4 +- .../solid/with-framer-motion/package.json | 2 +- examples/solid/with-trpc/package.json | 4 +- .../vue/basic-file-based-jsx/package.json | 4 +- .../vue/basic-file-based-sfc/package.json | 4 +- examples/vue/basic/package.json | 2 +- packages/react-router-ssr-query/CHANGELOG.md | 27 +++++ packages/react-router-ssr-query/package.json | 2 +- packages/react-router/CHANGELOG.md | 33 ++++++ packages/react-router/package.json | 2 +- packages/react-start-client/CHANGELOG.md | 9 ++ packages/react-start-client/package.json | 2 +- packages/react-start-rsc/CHANGELOG.md | 11 ++ packages/react-start-rsc/package.json | 2 +- packages/react-start-server/CHANGELOG.md | 9 ++ packages/react-start-server/package.json | 2 +- packages/react-start/CHANGELOG.md | 13 +++ packages/react-start/package.json | 2 +- packages/router-cli/CHANGELOG.md | 7 ++ packages/router-cli/package.json | 2 +- packages/router-core/CHANGELOG.md | 38 +++++++ packages/router-core/package.json | 2 +- packages/router-generator/CHANGELOG.md | 7 ++ packages/router-generator/package.json | 2 +- packages/router-plugin/CHANGELOG.md | 9 ++ packages/router-plugin/package.json | 2 +- packages/router-ssr-query-core/CHANGELOG.md | 24 +++++ packages/router-ssr-query-core/package.json | 2 +- packages/router-vite-plugin/CHANGELOG.md | 7 ++ packages/router-vite-plugin/package.json | 2 +- packages/solid-router-ssr-query/CHANGELOG.md | 27 +++++ packages/solid-router-ssr-query/package.json | 2 +- packages/solid-router/CHANGELOG.md | 31 ++++++ packages/solid-router/package.json | 2 +- packages/solid-start-client/CHANGELOG.md | 9 ++ packages/solid-start-client/package.json | 2 +- packages/solid-start-server/CHANGELOG.md | 29 +++++ packages/solid-start-server/package.json | 2 +- packages/solid-start/CHANGELOG.md | 12 +++ packages/solid-start/package.json | 2 +- packages/start-client-core/CHANGELOG.md | 28 +++++ packages/start-client-core/package.json | 2 +- packages/start-plugin-core/CHANGELOG.md | 12 +++ packages/start-plugin-core/package.json | 2 +- packages/start-server-core/CHANGELOG.md | 29 +++++ packages/start-server-core/package.json | 2 +- .../CHANGELOG.md | 29 +++++ .../package.json | 2 +- packages/start-storage-context/CHANGELOG.md | 7 ++ packages/start-storage-context/package.json | 2 +- packages/vue-router-ssr-query/CHANGELOG.md | 27 +++++ packages/vue-router-ssr-query/package.json | 2 +- packages/vue-router/CHANGELOG.md | 31 ++++++ packages/vue-router/package.json | 2 +- packages/vue-start-client/CHANGELOG.md | 9 ++ packages/vue-start-client/package.json | 2 +- packages/vue-start-server/CHANGELOG.md | 29 +++++ packages/vue-start-server/package.json | 2 +- packages/vue-start/CHANGELOG.md | 12 +++ packages/vue-start/package.json | 2 +- pnpm-lock.yaml | 102 +++++++++--------- 181 files changed, 813 insertions(+), 377 deletions(-) delete mode 100644 .changeset/deep-equal-array-identity.md delete mode 100644 .changeset/deep-equal-positional-flags.md delete mode 100644 .changeset/quiet-ssr-hotspots.md delete mode 100644 .changeset/resolve-path-positional.md delete mode 100644 .changeset/steady-streams-flow.md delete mode 100644 .changeset/update-parse-once.md delete mode 100644 .changeset/use-link-props-wrapper.md delete mode 100644 .changeset/whole-coins-sin.md diff --git a/.changeset/deep-equal-array-identity.md b/.changeset/deep-equal-array-identity.md deleted file mode 100644 index 66034c77bc..0000000000 --- a/.changeset/deep-equal-array-identity.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Speed up `deepEqual`: identical array elements no longer recurse, the exact comparison keeps a single key counter, and the redundant `typeof` early exit is gone. Equal numeric arrays compare ~70% faster and record comparisons 5–12% faster in the mixed-mode workloads that Link option stabilization and active-state checks produce, with a slightly smaller bundle. Behavior, including key enumeration and getter read order, is unchanged. diff --git a/.changeset/deep-equal-positional-flags.md b/.changeset/deep-equal-positional-flags.md deleted file mode 100644 index 42df0bc798..0000000000 --- a/.changeset/deep-equal-positional-flags.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/react-router': patch -'@tanstack/solid-router': patch -'@tanstack/vue-router': patch ---- - -`deepEqual` now takes its flags as positional arguments — `deepEqual(a, b, partial?, explicitUndefined?)` — instead of an options object. The router's hot callers (Link option stabilization and active-state checks, `matchRoute`) no longer allocate an options object per comparison, and the comparator reads two booleans instead of a polymorphic object. `explicitUndefined` replaces `ignoreUndefined: false`. `deepEqual` is an internal helper; it stays exported for compatibility of two-argument calls. diff --git a/.changeset/quiet-ssr-hotspots.md b/.changeset/quiet-ssr-hotspots.md deleted file mode 100644 index aa2278fb19..0000000000 --- a/.changeset/quiet-ssr-hotspots.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/start-plugin-core': patch ---- - -Reduce per-request SSR overhead: abort settled route matches with one shared `AbortError`-shaped reason instead of building a stack-capturing `DOMException` per match, skip `JSON.parse` for search values that cannot start JSON, wait on request signals with one listener per wait, and keep resolved server-function modules in production builds instead of re-importing them on every call. diff --git a/.changeset/resolve-path-positional.md b/.changeset/resolve-path-positional.md deleted file mode 100644 index 018d4f93b2..0000000000 --- a/.changeset/resolve-path-positional.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/react-router': patch -'@tanstack/solid-router': patch -'@tanstack/vue-router': patch ---- - -`resolvePath` (internal helper) now takes positional arguments — `resolvePath(base, to, trailingSlash?, cache?)` — so `buildLocation` and `matchRoute` no longer allocate an options object per path resolution. diff --git a/.changeset/steady-streams-flow.md b/.changeset/steady-streams-flow.md deleted file mode 100644 index de779b8c95..0000000000 --- a/.changeset/steady-streams-flow.md +++ /dev/null @@ -1,35 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/router-ssr-query-core': patch -'@tanstack/react-router': patch -'@tanstack/react-router-ssr-query': patch -'@tanstack/solid-router': patch -'@tanstack/solid-router-ssr-query': patch -'@tanstack/solid-start-server': patch -'@tanstack/start-client-core': patch -'@tanstack/start-server-core': patch -'@tanstack/start-static-server-functions': patch -'@tanstack/vue-router': patch -'@tanstack/vue-router-ssr-query': patch -'@tanstack/vue-start-server': patch ---- - -Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. - -Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. - -Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. - -The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. - -The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. - -Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. - -Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. - -Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. - -Static server functions decode cached `RawStream` values with the client deserializer plugins. - -SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. diff --git a/.changeset/update-parse-once.md b/.changeset/update-parse-once.md deleted file mode 100644 index b3623a8d59..0000000000 --- a/.changeset/update-parse-once.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Parse the location once when `router.update()` changes the basepath or rewrite, collect `invalidate()` match ids in a single pass, and specialize internal basepath composition without arrays or loops. Preserve basepath case sensitivity when creating and updating the router. - -Rebuild server route trees when `caseSensitive` changes and reuse the server cache only when the route tree and case sensitivity both match. diff --git a/.changeset/use-link-props-wrapper.md b/.changeset/use-link-props-wrapper.md deleted file mode 100644 index e166709285..0000000000 --- a/.changeset/use-link-props-wrapper.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/react-router': patch ---- - -`useLinkProps` no longer calls through an internal wrapper. The host element `Link` renders on is an `@internal` overload parameter that is stripped from the published declarations, so the public `useLinkProps(options, forwardedRef?)` signature is unchanged. diff --git a/.changeset/whole-coins-sin.md b/.changeset/whole-coins-sin.md deleted file mode 100644 index af28b8b0d5..0000000000 --- a/.changeset/whole-coins-sin.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Parse masked locations without mutating shared state and simplify input rewrite handling. diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 68e38ba66b..d976b0c7e3 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "firebase": "^11.4.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 569842fa38..c077be36b0 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index d73063a93a..51fc7c86b3 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index bd7ae35825..50c655a05e 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.67.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index be8b5980bc..2e02ffbb3b 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index b64f9b35ab..8979c76193 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 91cbf7662e..f25afc6a8e 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index bf89a84839..8a588013ca 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.json index cb35a5c5d3..dea344cf1a 100644 --- a/examples/react/basic-ssr-file-based/package.json +++ b/examples/react/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/react-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.39", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/react/basic-ssr-streaming-file-based/package.json b/examples/react/basic-ssr-streaming-file-based/package.json index d0ad562dbe..d7224d70a2 100644 --- a/examples/react/basic-ssr-streaming-file-based/package.json +++ b/examples/react/basic-ssr-streaming-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/react-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.39", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 71c68a1ab8..3f8c3643b7 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 68e51a59dd..9c782eb325 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index b848b3d9bd..ee017a9a77 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 77464ff729..0d496b77d4 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/i18n-paraglide/package.json b/examples/react/i18n-paraglide/package.json index 3d8418ca8d..b99e11aadb 100644 --- a/examples/react/i18n-paraglide/package.json +++ b/examples/react/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/react-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index b78d2d1729..a1b4bb4106 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 34458e391a..635a9de0c7 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index c171b649cb..0c160fbeef 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 741e2610b9..8cce0bff68 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index d11bbc45d4..d4a658c4a0 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -13,9 +13,9 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 14ede14d3b..6df24fc7d2 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -12,7 +12,7 @@ "@radix-ui/react-dialog": "^1.1.6", "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 423d750909..474d2cdb73 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 63a9b19515..c9fdf9e717 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index d7631039b8..300ed4563a 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 0d1d117380..196602eed6 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "postcss": "^8.5.1", "react": "^19.0.0", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index a0f5bbde8c..593537bda4 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.15.33", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 7d5979feb0..f072fe41f2 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index d027be47a4..63efa0911e 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 29d158f1ee..f44675b9a8 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -11,8 +11,8 @@ "@router-mono-react-query/post-query": "workspace:*", "@tanstack/history": "^1.162.4", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.36", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/react-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 4c1b45f0c6..e1e66f2bad 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 8a5aa19de5..f70831c7ce 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.36", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/react-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 28d5c554cb..997278f85a 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index ab5c4ab110..350f7769d4 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.36", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/react-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 3b214fd937..496af5938b 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-virtual": "^3.13.0", "react": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 509fd19a1d..072d8d0a49 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 7387f2f81c..49ac42324b 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "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 3ebdfea8fb..bf647cfae1 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index 2f8d5c5a53..a706679fe8 100644 --- a/examples/react/start-basic-authjs/package.json +++ b/examples/react/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "react": "^19.0.0", "react-dom": "^19.0.0", "start-authjs": "^1.0.0", diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index 23cc832a27..50216ee6d9 100644 --- a/examples/react/start-basic-cloudflare/package.json +++ b/examples/react/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index e49dc35098..0e89d3d820 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -13,10 +13,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-router-ssr-query": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-router-ssr-query": "^1.167.3", + "@tanstack/react-start": "^1.168.55", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json index af408e6903..110ff9afc8 100644 --- a/examples/react/start-basic-rsbuild/package.json +++ b/examples/react/start-basic-rsbuild/package.json @@ -10,9 +10,9 @@ "start": "srvx --prod -s ../client dist/server/index.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "react": "^19.2.3", "react-dom": "^19.2.3", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index aa98bad5a5..09d74178d3 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", - "@tanstack/start-static-server-functions": "^1.167.35", + "@tanstack/react-start": "^1.168.55", + "@tanstack/start-static-server-functions": "^1.167.36", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 4e73291b60..d34e1f4415 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index 76b524debe..52b6dcdd5e 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-router-ssr-query": "^1.167.2", - "@tanstack/react-start": "^1.168.54", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/react-router-ssr-query": "^1.167.3", + "@tanstack/react-start": "^1.168.55", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 8c17e2a7f3..04df3b876d 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "^0.27.14", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 6ce30a0a58..bd34498a08 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -15,10 +15,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-router-ssr-query": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-router-ssr-query": "^1.167.3", + "@tanstack/react-start": "^1.168.55", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 5aa90e9340..7425d04b37 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "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 1368d0c89c..1b84dad2f5 100644 --- a/examples/react/start-i18n-paraglide/package.json +++ b/examples/react/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "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 4f3ea23814..1fd425cb01 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "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 f7c6bcceaf..2519d69e85 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,9 +15,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json index 259503e488..55c038e758 100644 --- a/examples/react/start-next-migration/package.json +++ b/examples/react/start-next-migration/package.json @@ -12,8 +12,8 @@ "test:e2e": "playwright test" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-router": "^1.170.37", + "@tanstack/react-start": "^1.168.55", "iron-session": "^9.0.0", "next": "16.3.4", "react": "^19.2.3", diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index 8169d7156f..0a5813f84d 100644 --- a/examples/react/start-rscs/package.json +++ b/examples/react/start-rscs/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "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 79f8acc4ff..b0a4bdfb16 100644 --- a/examples/react/start-streaming-data-from-server-functions/package.json +++ b/examples/react/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "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 4774854ae3..3196e076ee 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 4988843252..bece25d69c 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "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 7d3769d0a2..80d5b68ce2 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-router-ssr-query": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-router-ssr-query": "^1.167.3", + "@tanstack/react-start": "^1.168.55", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index e52ab1509a..ed91c64852 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.3.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.54", + "@tanstack/react-start": "^1.168.55", "@workos/authkit-tanstack-react-start": "^0.5.0", "react": "^19.0.0", "react-dom": "^19.0.0" diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 5c134c716b..3880efb395 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 0c3d192e7e..f18f16dd73 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", "framer-motion": "^11.18.2", "react": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index f01809847a..3a1dc75350 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "@trpc/tanstack-react-query": "^11.4.3", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index f1716612f9..6950dd2b5a 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.36", + "@tanstack/react-router": "^1.170.37", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "express": "^5.2.1", diff --git a/examples/solid/authenticated-routes-firebase/package.json b/examples/solid/authenticated-routes-firebase/package.json index 5f728a8f27..248d9f1f6c 100644 --- a/examples/solid/authenticated-routes-firebase/package.json +++ b/examples/solid/authenticated-routes-firebase/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.38", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "firebase": "^11.4.0", "redaxios": "^0.5.1", diff --git a/examples/solid/authenticated-routes/package.json b/examples/solid/authenticated-routes/package.json index bf8cb4500b..bc798c35b7 100644 --- a/examples/solid/authenticated-routes/package.json +++ b/examples/solid/authenticated-routes/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.38", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-default-search-params/package.json b/examples/solid/basic-default-search-params/package.json index c762662f3d..1ff4349784 100644 --- a/examples/solid/basic-default-search-params/package.json +++ b/examples/solid/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 5bbe9c4674..6fe2974650 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index f6b4e7f45c..c3ad2654be 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -18,7 +18,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 0c1d038e2f..5d669e1887 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 2ca4738e8b..dd7e935fe0 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -13,7 +13,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -21,7 +21,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 9842bc5dff..5148891f58 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -12,14 +12,14 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-ssr-file-based/package.json b/examples/solid/basic-ssr-file-based/package.json index ebcc7a1723..951a86b424 100644 --- a/examples/solid/basic-ssr-file-based/package.json +++ b/examples/solid/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/solid-router": "^1.170.34", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.39", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json index 95393e6326..29d3a0cf75 100644 --- a/examples/solid/basic-ssr-streaming-file-based/package.json +++ b/examples/solid/basic-ssr-streaming-file-based/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "compression": "^1.8.0", "express": "^5.2.1", @@ -24,7 +24,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@types/express": "^5.0.6", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/solid/basic-virtual-file-based/package.json b/examples/solid/basic-virtual-file-based/package.json index 843ac32384..a5074f6ee7 100644 --- a/examples/solid/basic-virtual-file-based/package.json +++ b/examples/solid/basic-virtual-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.38", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", diff --git a/examples/solid/basic-virtual-inside-file-based/package.json b/examples/solid/basic-virtual-inside-file-based/package.json index 1796b70bdb..682faff9b6 100644 --- a/examples/solid/basic-virtual-inside-file-based/package.json +++ b/examples/solid/basic-virtual-inside-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.38", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index 4733f57433..8e997be24f 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/deferred-data/package.json b/examples/solid/deferred-data/package.json index d3d8f8f4f6..6d8a8ef585 100644 --- a/examples/solid/deferred-data/package.json +++ b/examples/solid/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json index e36ed66b71..eb1e332dd4 100644 --- a/examples/solid/i18n-paraglide/package.json +++ b/examples/solid/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.39", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 713bbcc7fa..ab975c0496 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/kitchen-sink-solid-query-file-based/package.json b/examples/solid/kitchen-sink-solid-query-file-based/package.json index 1f929f1049..922c80aaf1 100644 --- a/examples/solid/kitchen-sink-solid-query-file-based/package.json +++ b/examples/solid/kitchen-sink-solid-query-file-based/package.json @@ -10,10 +10,10 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json index b0fcb6fe35..9d422070af 100644 --- a/examples/solid/kitchen-sink-solid-query/package.json +++ b/examples/solid/kitchen-sink-solid-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/kitchen-sink/package.json b/examples/solid/kitchen-sink/package.json index 6a06f227ac..0267a92960 100644 --- a/examples/solid/kitchen-sink/package.json +++ b/examples/solid/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/large-file-based/package.json b/examples/solid/large-file-based/package.json index b1c9550c40..58c0ae94a3 100644 --- a/examples/solid/large-file-based/package.json +++ b/examples/solid/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/location-masking/package.json b/examples/solid/location-masking/package.json index 7995e04508..d1c6c15830 100644 --- a/examples/solid/location-masking/package.json +++ b/examples/solid/location-masking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/navigation-blocking/package.json b/examples/solid/navigation-blocking/package.json index 6bc9780ccc..c0e7e9a89a 100644 --- a/examples/solid/navigation-blocking/package.json +++ b/examples/solid/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json index a99060555a..a5ed7115d3 100644 --- a/examples/solid/quickstart-esbuild-file-based/package.json +++ b/examples/solid/quickstart-esbuild-file-based/package.json @@ -9,8 +9,8 @@ "start": "dev" }, "dependencies": { - "@tanstack/router-plugin": "^1.168.38", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index f9987e3dd4..86041cbd45 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -18,7 +18,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/quickstart-rspack-file-based/package.json b/examples/solid/quickstart-rspack-file-based/package.json index a1b5fe1ef8..014157825e 100644 --- a/examples/solid/quickstart-rspack-file-based/package.json +++ b/examples/solid/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "postcss": "^8.5.1", "solid-js": "^1.9.10", @@ -19,7 +19,7 @@ "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2" } diff --git a/examples/solid/quickstart-webpack-file-based/package.json b/examples/solid/quickstart-webpack-file-based/package.json index 9d0b4a7c73..af11a0388b 100644 --- a/examples/solid/quickstart-webpack-file-based/package.json +++ b/examples/solid/quickstart-webpack-file-based/package.json @@ -7,7 +7,7 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" @@ -15,7 +15,7 @@ "devDependencies": { "@babel/core": "^7.28.5", "@babel/preset-typescript": "^7.27.1", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "babel-loader": "^10.0.0", "babel-preset-solid": "^1.9.10", "css-loader": "^7.1.2", diff --git a/examples/solid/quickstart/package.json b/examples/solid/quickstart/package.json index 9b17a249d7..429892a2a4 100644 --- a/examples/solid/quickstart/package.json +++ b/examples/solid/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/router-monorepo-simple-lazy/package.json b/examples/solid/router-monorepo-simple-lazy/package.json index b1018b7c4b..a85b4823e9 100644 --- a/examples/solid/router-monorepo-simple-lazy/package.json +++ b/examples/solid/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json index e4c43a7f66..5595aeeabd 100644 --- a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/solid-router": "^1.170.34", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.39", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json index 43d5b66462..9a52e8ba47 100644 --- a/examples/solid/router-monorepo-simple/package.json +++ b/examples/solid/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple/packages/router/package.json b/examples/solid/router-monorepo-simple/packages/router/package.json index 4643ad139f..08b70f2437 100644 --- a/examples/solid/router-monorepo-simple/packages/router/package.json +++ b/examples/solid/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/solid-router": "^1.170.34", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.39", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json index 2fc254c18a..41b5b11469 100644 --- a/examples/solid/router-monorepo-solid-query/package.json +++ b/examples/solid/router-monorepo-solid-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-solid-query/packages/router/package.json b/examples/solid/router-monorepo-solid-query/packages/router/package.json index a08cc35674..6249d242a1 100644 --- a/examples/solid/router-monorepo-solid-query/packages/router/package.json +++ b/examples/solid/router-monorepo-solid-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.162.4", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.34", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.39", "@router-solid-mono-solid-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^4.4.3", diff --git a/examples/solid/scroll-restoration/package.json b/examples/solid/scroll-restoration/package.json index 54decafbf6..b6b923a92b 100644 --- a/examples/solid/scroll-restoration/package.json +++ b/examples/solid/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-virtual": "^3.13.0", "solid-js": "^1.9.10", diff --git a/examples/solid/search-validator-adapters/package.json b/examples/solid/search-validator-adapters/package.json index 106e8d3783..01627ff2f0 100644 --- a/examples/solid/search-validator-adapters/package.json +++ b/examples/solid/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/router-plugin": "^1.168.39", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json index aa7e3998e0..e4899af3ad 100644 --- a/examples/solid/start-basic-auth/package.json +++ b/examples/solid/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index e6a4f1a0e8..10c984ce1f 100644 --- a/examples/solid/start-basic-authjs/package.json +++ b/examples/solid/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "solid-js": "^1.9.10", "start-authjs": "^1.0.0", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json index 7d3bba186e..ae322a0626 100644 --- a/examples/solid/start-basic-cloudflare/package.json +++ b/examples/solid/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json index 960ee02716..b9111c4252 100644 --- a/examples/solid/start-basic-netlify/package.json +++ b/examples/solid/start-basic-netlify/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json index c91ef0bfe1..84eeb8b1e7 100644 --- a/examples/solid/start-basic-nitro/package.json +++ b/examples/solid/start-basic-nitro/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json index c72911dfc8..92fdf2db09 100644 --- a/examples/solid/start-basic-solid-query/package.json +++ b/examples/solid/start-basic-solid-query/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-router-ssr-query": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-router-ssr-query": "^1.167.3", + "@tanstack/solid-start": "^1.168.53", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 06bab8a845..8d681b2aea 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", - "@tanstack/start-static-server-functions": "^1.167.35", + "@tanstack/solid-start": "^1.168.53", + "@tanstack/start-static-server-functions": "^1.167.36", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index ae0e3daf6e..469ceb5296 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index 3cc8e583db..de4bfcf1ce 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-router-ssr-query": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", - "@tanstack/router-plugin": "^1.168.38", + "@tanstack/solid-router-ssr-query": "^1.167.3", + "@tanstack/solid-start": "^1.168.53", + "@tanstack/router-plugin": "^1.168.39", "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 ec8a5998ca..4ce1705e4b 100644 --- a/examples/solid/start-convex-better-auth/package.json +++ b/examples/solid/start-convex-better-auth/package.json @@ -13,9 +13,9 @@ "dependencies": { "@convex-dev/better-auth": "^0.9.7", "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "better-auth": "^1.6.19", "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 ff92f0130a..4e312bdb53 100644 --- a/examples/solid/start-counter/package.json +++ b/examples/solid/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "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 27517b36df..58592d830a 100644 --- a/examples/solid/start-i18n-paraglide/package.json +++ b/examples/solid/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index bab05bec5e..f066269435 100644 --- a/examples/solid/start-large/package.json +++ b/examples/solid/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "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 84a0ea1118..b93827a6cf 100644 --- a/examples/solid/start-streaming-data-from-server-functions/package.json +++ b/examples/solid/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "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 f520d8d742..5d6a3b51be 100644 --- a/examples/solid/start-supabase-basic/package.json +++ b/examples/solid/start-supabase-basic/package.json @@ -14,9 +14,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "solid-js": "^1.9.9", "redaxios": "^0.5.1" }, diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json index d7b080de6d..f21ec17eb4 100644 --- a/examples/solid/start-tailwind-v4/package.json +++ b/examples/solid/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.52", + "@tanstack/solid-start": "^1.168.53", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json index 54382d494e..d9b4e97ece 100644 --- a/examples/solid/view-transitions/package.json +++ b/examples/solid/view-transitions/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.38", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json index e72157f496..1e86ba46b1 100644 --- a/examples/solid/with-framer-motion/package.json +++ b/examples/solid/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json index 1271b8093a..b89f9e3400 100644 --- a/examples/solid/with-trpc/package.json +++ b/examples/solid/with-trpc/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.38", - "@tanstack/solid-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-router": "^1.170.35", "@tanstack/solid-router-devtools": "^1.167.2", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", diff --git a/examples/vue/basic-file-based-jsx/package.json b/examples/vue/basic-file-based-jsx/package.json index bba31464a2..1f3116bd2d 100644 --- a/examples/vue/basic-file-based-jsx/package.json +++ b/examples/vue/basic-file-based-jsx/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.38", - "@tanstack/vue-router": "^1.170.33", + "@tanstack/router-plugin": "^1.168.39", + "@tanstack/vue-router": "^1.170.34", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", diff --git a/examples/vue/basic-file-based-sfc/package.json b/examples/vue/basic-file-based-sfc/package.json index 55b3bfcb66..785fdc7d58 100644 --- a/examples/vue/basic-file-based-sfc/package.json +++ b/examples/vue/basic-file-based-sfc/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.38", - "@tanstack/vue-router": "^1.170.33", + "@tanstack/router-plugin": "^1.168.39", + "@tanstack/vue-router": "^1.170.34", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", diff --git a/examples/vue/basic/package.json b/examples/vue/basic/package.json index fbfe8878c4..d967656ee8 100644 --- a/examples/vue/basic/package.json +++ b/examples/vue/basic/package.json @@ -9,7 +9,7 @@ "start": "vite" }, "dependencies": { - "@tanstack/vue-router": "^1.170.33", + "@tanstack/vue-router": "^1.170.34", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "vue": "^3.5.13", diff --git a/packages/react-router-ssr-query/CHANGELOG.md b/packages/react-router-ssr-query/CHANGELOG.md index 082433df3d..d0fc73ff50 100644 --- a/packages/react-router-ssr-query/CHANGELOG.md +++ b/packages/react-router-ssr-query/CHANGELOG.md @@ -1,5 +1,32 @@ # @tanstack/react-router-ssr-query +## 1.167.3 + +### Patch Changes + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + +- Updated dependencies [[`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26)]: + - @tanstack/router-ssr-query-core@1.169.3 + ## 1.167.2 ### Patch Changes diff --git a/packages/react-router-ssr-query/package.json b/packages/react-router-ssr-query/package.json index a42ea4b00c..7333146047 100644 --- a/packages/react-router-ssr-query/package.json +++ b/packages/react-router-ssr-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-ssr-query", - "version": "1.167.2", + "version": "1.167.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 5c5d1ff2c7..4142087bc0 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,38 @@ # @tanstack/react-router +## 1.170.37 + +### Patch Changes + +- [#8418](https://github.com/TanStack/router/pull/8418) [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387) - `deepEqual` now takes its flags as positional arguments — `deepEqual(a, b, partial?, explicitUndefined?)` — instead of an options object. The router's hot callers (Link option stabilization and active-state checks, `matchRoute`) no longer allocate an options object per comparison, and the comparator reads two booleans instead of a polymorphic object. `explicitUndefined` replaces `ignoreUndefined: false`. `deepEqual` is an internal helper; it stays exported for compatibility of two-argument calls. + +- [#8419](https://github.com/TanStack/router/pull/8419) [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd) - `resolvePath` (internal helper) now takes positional arguments — `resolvePath(base, to, trailingSlash?, cache?)` — so `buildLocation` and `matchRoute` no longer allocate an options object per path resolution. + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + +- [#8420](https://github.com/TanStack/router/pull/8420) [`8e164d2`](https://github.com/TanStack/router/commit/8e164d28f9e9eb1a7301109230d7ece9817492a8) - `useLinkProps` no longer calls through an internal wrapper. The host element `Link` renders on is an `@internal` overload parameter that is stripped from the published declarations, so the public `useLinkProps(options, forwardedRef?)` signature is unchanged. + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + ## 1.170.36 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 98895311b4..cdf9455d65 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.170.36", + "version": "1.170.37", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/CHANGELOG.md b/packages/react-start-client/CHANGELOG.md index 755f99e7a6..4c4c6546b1 100644 --- a/packages/react-start-client/CHANGELOG.md +++ b/packages/react-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-start-client +## 1.168.35 + +### Patch Changes + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`8e164d2`](https://github.com/TanStack/router/commit/8e164d28f9e9eb1a7301109230d7ece9817492a8), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + - @tanstack/react-router@1.170.37 + - @tanstack/start-client-core@1.170.31 + ## 1.168.34 ### Patch Changes diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 15600beb05..7f900fcda0 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.168.34", + "version": "1.168.35", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index 4640ec1267..4d97ff08c7 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,5 +1,16 @@ # @tanstack/react-start-rsc +## 0.1.54 + +### Patch Changes + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`8e164d2`](https://github.com/TanStack/router/commit/8e164d28f9e9eb1a7301109230d7ece9817492a8), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + - @tanstack/react-router@1.170.37 + - @tanstack/start-plugin-core@1.171.45 + - @tanstack/start-client-core@1.170.31 + - @tanstack/start-storage-context@1.167.33 + ## 0.1.53 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index ca30689e2f..17e3540bae 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.53", + "version": "0.1.54", "description": "React Server Components support for TanStack Start", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/CHANGELOG.md b/packages/react-start-server/CHANGELOG.md index 558227155a..6149790c29 100644 --- a/packages/react-start-server/CHANGELOG.md +++ b/packages/react-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-start-server +## 1.167.42 + +### Patch Changes + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`8e164d2`](https://github.com/TanStack/router/commit/8e164d28f9e9eb1a7301109230d7ece9817492a8), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + - @tanstack/react-router@1.170.37 + - @tanstack/start-server-core@1.169.36 + ## 1.167.41 ### Patch Changes diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index b2d5666efa..c4690c6386 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.167.41", + "version": "1.167.42", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/CHANGELOG.md b/packages/react-start/CHANGELOG.md index d72a86f0f5..eeafebc68a 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,5 +1,18 @@ # @tanstack/react-start +## 1.168.55 + +### Patch Changes + +- Updated dependencies [[`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`8e164d2`](https://github.com/TanStack/router/commit/8e164d28f9e9eb1a7301109230d7ece9817492a8)]: + - @tanstack/react-router@1.170.37 + - @tanstack/start-plugin-core@1.171.45 + - @tanstack/start-client-core@1.170.31 + - @tanstack/start-server-core@1.169.36 + - @tanstack/react-start-client@1.168.35 + - @tanstack/react-start-rsc@0.1.54 + - @tanstack/react-start-server@1.167.42 + ## 1.168.54 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 7e951bfd76..d291ec9bb6 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.168.54", + "version": "1.168.55", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/CHANGELOG.md b/packages/router-cli/CHANGELOG.md index 9640d444f8..077479e5fa 100644 --- a/packages/router-cli/CHANGELOG.md +++ b/packages/router-cli/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-cli +## 1.167.37 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-generator@1.167.37 + ## 1.167.36 ### Patch Changes diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 507c3d2e3b..7a1c444d95 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.167.36", + "version": "1.167.37", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/CHANGELOG.md b/packages/router-core/CHANGELOG.md index 932bb698d1..f8afd7acc6 100644 --- a/packages/router-core/CHANGELOG.md +++ b/packages/router-core/CHANGELOG.md @@ -1,5 +1,43 @@ # @tanstack/router-core +## 1.171.31 + +### Patch Changes + +- [#8417](https://github.com/TanStack/router/pull/8417) [`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83) - Speed up `deepEqual`: identical array elements no longer recurse, the exact comparison keeps a single key counter, and the redundant `typeof` early exit is gone. Equal numeric arrays compare ~70% faster and record comparisons 5–12% faster in the mixed-mode workloads that Link option stabilization and active-state checks produce, with a slightly smaller bundle. Behavior, including key enumeration and getter read order, is unchanged. + +- [#8418](https://github.com/TanStack/router/pull/8418) [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387) - `deepEqual` now takes its flags as positional arguments — `deepEqual(a, b, partial?, explicitUndefined?)` — instead of an options object. The router's hot callers (Link option stabilization and active-state checks, `matchRoute`) no longer allocate an options object per comparison, and the comparator reads two booleans instead of a polymorphic object. `explicitUndefined` replaces `ignoreUndefined: false`. `deepEqual` is an internal helper; it stays exported for compatibility of two-argument calls. + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Reduce per-request SSR overhead: abort settled route matches with one shared `AbortError`-shaped reason instead of building a stack-capturing `DOMException` per match, skip `JSON.parse` for search values that cannot start JSON, wait on request signals with one listener per wait, and keep resolved server-function modules in production builds instead of re-importing them on every call. + +- [#8419](https://github.com/TanStack/router/pull/8419) [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd) - `resolvePath` (internal helper) now takes positional arguments — `resolvePath(base, to, trailingSlash?, cache?)` — so `buildLocation` and `matchRoute` no longer allocate an options object per path resolution. + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + +- [#8422](https://github.com/TanStack/router/pull/8422) [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a) - Parse the location once when `router.update()` changes the basepath or rewrite, collect `invalidate()` match ids in a single pass, and specialize internal basepath composition without arrays or loops. Preserve basepath case sensitivity when creating and updating the router. + + Rebuild server route trees when `caseSensitive` changes and reuse the server cache only when the route tree and case sensitivity both match. + +- [#8421](https://github.com/TanStack/router/pull/8421) [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3) - Parse masked locations without mutating shared state and simplify input rewrite handling. + ## 1.171.30 ### Patch Changes diff --git a/packages/router-core/package.json b/packages/router-core/package.json index 6da94fab6c..ae61f9f080 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.171.30", + "version": "1.171.31", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/CHANGELOG.md b/packages/router-generator/CHANGELOG.md index adc652fd51..db07f68af0 100644 --- a/packages/router-generator/CHANGELOG.md +++ b/packages/router-generator/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-generator +## 1.167.37 + +### Patch Changes + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + ## 1.167.36 ### Patch Changes diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index cc1e7e937a..becd13a356 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.167.36", + "version": "1.167.37", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/CHANGELOG.md b/packages/router-plugin/CHANGELOG.md index 172fb3e48f..7406686cdb 100644 --- a/packages/router-plugin/CHANGELOG.md +++ b/packages/router-plugin/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/router-plugin +## 1.168.39 + +### Patch Changes + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`8e164d2`](https://github.com/TanStack/router/commit/8e164d28f9e9eb1a7301109230d7ece9817492a8), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + - @tanstack/react-router@1.170.37 + - @tanstack/router-generator@1.167.37 + ## 1.168.38 ### Patch Changes diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 3641b81e84..97e759185b 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.168.38", + "version": "1.168.39", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-ssr-query-core/CHANGELOG.md b/packages/router-ssr-query-core/CHANGELOG.md index dc1cf8b505..6ab0afbabe 100644 --- a/packages/router-ssr-query-core/CHANGELOG.md +++ b/packages/router-ssr-query-core/CHANGELOG.md @@ -1,5 +1,29 @@ # @tanstack/router-ssr-query-core +## 1.169.3 + +### Patch Changes + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + ## 1.169.2 ### Patch Changes diff --git a/packages/router-ssr-query-core/package.json b/packages/router-ssr-query-core/package.json index 9e9038431c..8254eaae81 100644 --- a/packages/router-ssr-query-core/package.json +++ b/packages/router-ssr-query-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-ssr-query-core", - "version": "1.169.2", + "version": "1.169.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/CHANGELOG.md b/packages/router-vite-plugin/CHANGELOG.md index 4706b7aa6d..cd421fc459 100644 --- a/packages/router-vite-plugin/CHANGELOG.md +++ b/packages/router-vite-plugin/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-vite-plugin +## 1.167.39 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-plugin@1.168.39 + ## 1.167.38 ### Patch Changes diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index f1c4aaa6a4..e928f27f04 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.167.38", + "version": "1.167.39", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-ssr-query/CHANGELOG.md b/packages/solid-router-ssr-query/CHANGELOG.md index 7ffec37eda..bf0c385751 100644 --- a/packages/solid-router-ssr-query/CHANGELOG.md +++ b/packages/solid-router-ssr-query/CHANGELOG.md @@ -1,5 +1,32 @@ # @tanstack/solid-router-ssr-query +## 1.167.3 + +### Patch Changes + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + +- Updated dependencies [[`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26)]: + - @tanstack/router-ssr-query-core@1.169.3 + ## 1.167.2 ### Patch Changes diff --git a/packages/solid-router-ssr-query/package.json b/packages/solid-router-ssr-query/package.json index 58832294d5..4b1ece0f78 100644 --- a/packages/solid-router-ssr-query/package.json +++ b/packages/solid-router-ssr-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-ssr-query", - "version": "1.167.2", + "version": "1.167.3", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/CHANGELOG.md b/packages/solid-router/CHANGELOG.md index 19b561901a..1340df37dc 100644 --- a/packages/solid-router/CHANGELOG.md +++ b/packages/solid-router/CHANGELOG.md @@ -1,5 +1,36 @@ # @tanstack/solid-router +## 1.170.35 + +### Patch Changes + +- [#8418](https://github.com/TanStack/router/pull/8418) [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387) - `deepEqual` now takes its flags as positional arguments — `deepEqual(a, b, partial?, explicitUndefined?)` — instead of an options object. The router's hot callers (Link option stabilization and active-state checks, `matchRoute`) no longer allocate an options object per comparison, and the comparator reads two booleans instead of a polymorphic object. `explicitUndefined` replaces `ignoreUndefined: false`. `deepEqual` is an internal helper; it stays exported for compatibility of two-argument calls. + +- [#8419](https://github.com/TanStack/router/pull/8419) [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd) - `resolvePath` (internal helper) now takes positional arguments — `resolvePath(base, to, trailingSlash?, cache?)` — so `buildLocation` and `matchRoute` no longer allocate an options object per path resolution. + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + ## 1.170.34 ### Patch Changes diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 973ec771cd..05a787668a 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.170.34", + "version": "1.170.35", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/CHANGELOG.md b/packages/solid-start-client/CHANGELOG.md index c64322654c..efdd8b50a7 100644 --- a/packages/solid-start-client/CHANGELOG.md +++ b/packages/solid-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start-client +## 1.168.34 + +### Patch Changes + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + - @tanstack/solid-router@1.170.35 + - @tanstack/start-client-core@1.170.31 + ## 1.168.33 ### Patch Changes diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index c5eac7c433..c14bd7d327 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.168.33", + "version": "1.168.34", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/CHANGELOG.md b/packages/solid-start-server/CHANGELOG.md index c9c1c3779c..eb1ccaed68 100644 --- a/packages/solid-start-server/CHANGELOG.md +++ b/packages/solid-start-server/CHANGELOG.md @@ -1,5 +1,34 @@ # @tanstack/solid-start-server +## 1.167.41 + +### Patch Changes + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + - @tanstack/solid-router@1.170.35 + - @tanstack/start-server-core@1.169.36 + ## 1.167.40 ### Patch Changes diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index bb3d107552..0e9308e7ce 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.167.40", + "version": "1.167.41", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/CHANGELOG.md b/packages/solid-start/CHANGELOG.md index fa598628aa..d3e4041c7a 100644 --- a/packages/solid-start/CHANGELOG.md +++ b/packages/solid-start/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/solid-start +## 1.168.53 + +### Patch Changes + +- Updated dependencies [[`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26)]: + - @tanstack/solid-router@1.170.35 + - @tanstack/start-plugin-core@1.171.45 + - @tanstack/solid-start-server@1.167.41 + - @tanstack/start-client-core@1.170.31 + - @tanstack/start-server-core@1.169.36 + - @tanstack/solid-start-client@1.168.34 + ## 1.168.52 ### Patch Changes diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 799b9757f9..e33b7b58a9 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.168.52", + "version": "1.168.53", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/CHANGELOG.md b/packages/start-client-core/CHANGELOG.md index 4997522d08..5aa355fd97 100644 --- a/packages/start-client-core/CHANGELOG.md +++ b/packages/start-client-core/CHANGELOG.md @@ -1,5 +1,33 @@ # @tanstack/start-client-core +## 1.170.31 + +### Patch Changes + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + - @tanstack/start-storage-context@1.167.33 + ## 1.170.30 ### Patch Changes diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index b837ee902c..76e385bf30 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.170.30", + "version": "1.170.31", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/CHANGELOG.md b/packages/start-plugin-core/CHANGELOG.md index f5431fae57..f84255015d 100644 --- a/packages/start-plugin-core/CHANGELOG.md +++ b/packages/start-plugin-core/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/start-plugin-core +## 1.171.45 + +### Patch Changes + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Reduce per-request SSR overhead: abort settled route matches with one shared `AbortError`-shaped reason instead of building a stack-capturing `DOMException` per match, skip `JSON.parse` for search values that cannot start JSON, wait on request signals with one listener per wait, and keep resolved server-function modules in production builds instead of re-importing them on every call. + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + - @tanstack/start-server-core@1.169.36 + - @tanstack/router-generator@1.167.37 + - @tanstack/router-plugin@1.168.39 + ## 1.171.44 ### Patch Changes diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index f89e1c8202..3dcb378e86 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.44", + "version": "1.171.45", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/CHANGELOG.md b/packages/start-server-core/CHANGELOG.md index 415eabbbab..8f8a064c18 100644 --- a/packages/start-server-core/CHANGELOG.md +++ b/packages/start-server-core/CHANGELOG.md @@ -1,5 +1,34 @@ # @tanstack/start-server-core +## 1.169.36 + +### Patch Changes + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + - @tanstack/start-client-core@1.170.31 + - @tanstack/start-storage-context@1.167.33 + ## 1.169.35 ### Patch Changes diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 2f9a8df05b..a73c0a3a0a 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.169.35", + "version": "1.169.36", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-static-server-functions/CHANGELOG.md b/packages/start-static-server-functions/CHANGELOG.md index dedd66863b..aac67e7d39 100644 --- a/packages/start-static-server-functions/CHANGELOG.md +++ b/packages/start-static-server-functions/CHANGELOG.md @@ -1,5 +1,34 @@ # @tanstack/start-static-server-functions +## 1.167.36 + +### Patch Changes + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + +- Updated dependencies [[`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26)]: + - @tanstack/start-client-core@1.170.31 + - @tanstack/react-start@1.168.55 + - @tanstack/solid-start@1.168.53 + ## 1.167.35 ### Patch Changes diff --git a/packages/start-static-server-functions/package.json b/packages/start-static-server-functions/package.json index e83124036c..21ddc2f542 100644 --- a/packages/start-static-server-functions/package.json +++ b/packages/start-static-server-functions/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-static-server-functions", - "version": "1.167.35", + "version": "1.167.36", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-storage-context/CHANGELOG.md b/packages/start-storage-context/CHANGELOG.md index 479b58aa08..1a05887058 100644 --- a/packages/start-storage-context/CHANGELOG.md +++ b/packages/start-storage-context/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/start-storage-context +## 1.167.33 + +### Patch Changes + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + ## 1.167.32 ### Patch Changes diff --git a/packages/start-storage-context/package.json b/packages/start-storage-context/package.json index 734722bd3a..0955b99573 100644 --- a/packages/start-storage-context/package.json +++ b/packages/start-storage-context/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-storage-context", - "version": "1.167.32", + "version": "1.167.33", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-router-ssr-query/CHANGELOG.md b/packages/vue-router-ssr-query/CHANGELOG.md index da87eb506a..a85b193dd8 100644 --- a/packages/vue-router-ssr-query/CHANGELOG.md +++ b/packages/vue-router-ssr-query/CHANGELOG.md @@ -1,5 +1,32 @@ # @tanstack/vue-router-ssr-query +## 1.167.3 + +### Patch Changes + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + +- Updated dependencies [[`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26)]: + - @tanstack/router-ssr-query-core@1.169.3 + ## 1.167.2 ### Patch Changes diff --git a/packages/vue-router-ssr-query/package.json b/packages/vue-router-ssr-query/package.json index 96eea78624..73e6dd1cc3 100644 --- a/packages/vue-router-ssr-query/package.json +++ b/packages/vue-router-ssr-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-router-ssr-query", - "version": "1.167.2", + "version": "1.167.3", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-router/CHANGELOG.md b/packages/vue-router/CHANGELOG.md index d21b1c852c..8ceb16f50b 100644 --- a/packages/vue-router/CHANGELOG.md +++ b/packages/vue-router/CHANGELOG.md @@ -1,5 +1,36 @@ # @tanstack/vue-router +## 1.170.34 + +### Patch Changes + +- [#8418](https://github.com/TanStack/router/pull/8418) [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387) - `deepEqual` now takes its flags as positional arguments — `deepEqual(a, b, partial?, explicitUndefined?)` — instead of an options object. The router's hot callers (Link option stabilization and active-state checks, `matchRoute`) no longer allocate an options object per comparison, and the comparator reads two booleans instead of a polymorphic object. `explicitUndefined` replaces `ignoreUndefined: false`. `deepEqual` is an internal helper; it stays exported for compatibility of two-argument calls. + +- [#8419](https://github.com/TanStack/router/pull/8419) [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd) - `resolvePath` (internal helper) now takes positional arguments — `resolvePath(base, to, trailingSlash?, cache?)` — so `buildLocation` and `matchRoute` no longer allocate an options object per path resolution. + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + ## 1.170.33 ### Patch Changes diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index 7bafd7133e..ec1b6c524e 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-router", - "version": "1.170.33", + "version": "1.170.34", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-client/CHANGELOG.md b/packages/vue-start-client/CHANGELOG.md index cb6913fe5b..dfb36c47fe 100644 --- a/packages/vue-start-client/CHANGELOG.md +++ b/packages/vue-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-start-client +## 1.167.37 + +### Patch Changes + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + - @tanstack/vue-router@1.170.34 + - @tanstack/start-client-core@1.170.31 + ## 1.167.36 ### Patch Changes diff --git a/packages/vue-start-client/package.json b/packages/vue-start-client/package.json index 2248242208..dda0c24b54 100644 --- a/packages/vue-start-client/package.json +++ b/packages/vue-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-client", - "version": "1.167.36", + "version": "1.167.37", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-server/CHANGELOG.md b/packages/vue-start-server/CHANGELOG.md index 71a9eed707..650f420491 100644 --- a/packages/vue-start-server/CHANGELOG.md +++ b/packages/vue-start-server/CHANGELOG.md @@ -1,5 +1,34 @@ # @tanstack/vue-start-server +## 1.167.41 + +### Patch Changes + +- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. + + Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. + + Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. + + The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. + + The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. + + Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. + + Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. + + Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. + + Static server functions decode cached `RawStream` values with the client deserializer plugins. + + SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. + +- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: + - @tanstack/router-core@1.171.31 + - @tanstack/vue-router@1.170.34 + - @tanstack/start-server-core@1.169.36 + ## 1.167.40 ### Patch Changes diff --git a/packages/vue-start-server/package.json b/packages/vue-start-server/package.json index 03b0c8da44..2ea1b2b594 100644 --- a/packages/vue-start-server/package.json +++ b/packages/vue-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-server", - "version": "1.167.40", + "version": "1.167.41", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start/CHANGELOG.md b/packages/vue-start/CHANGELOG.md index 985c5f8c07..8628a56e75 100644 --- a/packages/vue-start/CHANGELOG.md +++ b/packages/vue-start/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/vue-start +## 1.168.52 + +### Patch Changes + +- Updated dependencies [[`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26)]: + - @tanstack/vue-router@1.170.34 + - @tanstack/start-plugin-core@1.171.45 + - @tanstack/start-client-core@1.170.31 + - @tanstack/start-server-core@1.169.36 + - @tanstack/vue-start-server@1.167.41 + - @tanstack/vue-start-client@1.167.37 + ## 1.168.51 ### Patch Changes diff --git a/packages/vue-start/package.json b/packages/vue-start/package.json index 08a9a2a031..c838830cba 100644 --- a/packages/vue-start/package.json +++ b/packages/vue-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start", - "version": "1.168.51", + "version": "1.168.52", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a759613fc6..095e5b08b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11290,7 +11290,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11330,7 +11330,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11373,7 +11373,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11416,7 +11416,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11453,7 +11453,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11487,7 +11487,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11527,7 +11527,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11573,7 +11573,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11616,7 +11616,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11656,7 +11656,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router compression: specifier: ^1.8.0 @@ -11699,7 +11699,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11757,7 +11757,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11800,7 +11800,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11840,7 +11840,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11880,7 +11880,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router solid-js: specifier: 1.9.12 @@ -11914,7 +11914,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11954,7 +11954,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12003,7 +12003,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12052,7 +12052,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12098,7 +12098,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12138,7 +12138,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12175,7 +12175,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12209,7 +12209,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12240,7 +12240,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12271,7 +12271,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12311,7 +12311,7 @@ importers: specifier: ^4.2.2 version: 4.2.2 '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12348,7 +12348,7 @@ importers: examples/solid/quickstart-webpack-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12412,7 +12412,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12449,7 +12449,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12492,7 +12492,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12529,7 +12529,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12572,7 +12572,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12627,7 +12627,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12682,7 +12682,7 @@ importers: specifier: ^7.0.0 version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12734,7 +12734,7 @@ importers: specifier: ^0.41.1 version: 0.41.1 '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12777,7 +12777,7 @@ importers: examples/solid/start-basic-cloudflare: dependencies: '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12820,7 +12820,7 @@ importers: examples/solid/start-basic-netlify: dependencies: '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12860,7 +12860,7 @@ importers: examples/solid/start-basic-nitro: dependencies: '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12906,7 +12906,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12952,7 +12952,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13007,7 +13007,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13074,7 +13074,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13132,7 +13132,7 @@ importers: examples/solid/start-counter: dependencies: '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13178,7 +13178,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13221,7 +13221,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13267,7 +13267,7 @@ importers: examples/solid/start-streaming-data-from-server-functions: dependencies: '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13307,7 +13307,7 @@ importers: specifier: ^2.48.1 version: 2.48.1 '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13347,7 +13347,7 @@ importers: examples/solid/start-tailwind-v4: dependencies: '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13396,7 +13396,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13433,7 +13433,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13476,7 +13476,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.34 + specifier: ^1.170.35 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From 84936cc04530bba11059c57b293a794922bbc5aa Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Wed, 16 Sep 2026 23:12:34 +0200 Subject: [PATCH 044/175] perf(router-core): allocate replaceEqualDeep copies lazily (#8362) `replaceEqualDeep` runs on every navigation and Link build: search, params, state and loader data all go through it, and in the common case `next` turns out to be deeply equal to `prev`. Until now the function still allocated the result object (or array) up front and filled it key by key while comparing, only to throw it away and return `prev`. The copy is now created at the first difference. Everything compared before that point is known to be equal and is taken from `prev` in one pass (`copyItems`), so unchanged subtrees are shared exactly as before. When nothing differs, nothing is allocated; when only the key sets differ, the copy is built after the loop. Smaller changes in the same function: - deep equality is a single `equal` flag instead of a matched-key count compared against the sizes afterwards; once unequal, the `hasOwn` check for keys that only `next` has is skipped - `nullReplaceEqualDeep` passes a boolean instead of an object factory, so the plain variant no longer evaluates a default `() => ({})` per call and the copy site has no indirect call - an overload signature keeps the generic return type without the `_next` alias in the emitted code - `getEnumerableOwnKeys` loops over `getOwnPropertySymbols` directly; an empty loop needs no early return `tests/replace-equal-deep.bench.ts` was added first, with the shapes the router feeds these helpers. Paired runs against the previous version (hz, 1000 calls per iteration): equal empty objects 10.0k -> 10.6k (+6%) equal flat search 5.3k -> 5.9k (+12%) equal nested search 2.2k -> 2.4k (+13%) equal array of objects 445 -> 485 (+9%) flat, one changed leaf 5.4k -> 5.2k (-3%) wide (12 keys) changed 2.4k -> 2.2k (-11%) The equal paths win and allocate nothing; the copy paths pay for the extra call and the per-key `copy` check. --- .changeset/quiet-owls-share.md | 5 + packages/router-core/src/utils.ts | 101 +++++++------ .../tests/replace-equal-deep.bench.ts | 136 ++++++++++++++++++ packages/router-core/tests/utils.test.ts | 106 ++++++++++++++ 4 files changed, 302 insertions(+), 46 deletions(-) create mode 100644 .changeset/quiet-owls-share.md create mode 100644 packages/router-core/tests/replace-equal-deep.bench.ts diff --git a/.changeset/quiet-owls-share.md b/.changeset/quiet-owls-share.md new file mode 100644 index 0000000000..320b507a1d --- /dev/null +++ b/.changeset/quiet-owls-share.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Allocate the `replaceEqualDeep` result only at the first difference, so structural sharing of search, params, state and loader data no longer allocates when the new value is deeply equal to the previous one. diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts index e9b2295cb8..0eff94b5eb 100644 --- a/packages/router-core/src/utils.ts +++ b/packages/router-core/src/utils.ts @@ -219,73 +219,90 @@ export function hasKeys(obj: Record) { } export const createNull = () => Object.create(null) +// Search and params objects use null prototypes so keys like `__proto__` stay data. export const nullReplaceEqualDeep: typeof replaceEqualDeep = (prev, next) => - replaceEqualDeep(prev, next, createNull) + replaceEqualDeep(prev, next, true) /** - * This function returns `prev` if `_next` is deeply equal. + * This function returns `prev` if `next` is deeply equal. * If not, it will replace any deeply equal children of `b` with those of `a`. * This can be used for structural sharing between immutable JSON values for example. * Do not use this with signals */ export function replaceEqualDeep( prev: any, - _next: T, - _makeObj = () => ({}), + next: T, + _nullProto?: boolean, + _depth?: number, +): T +export function replaceEqualDeep( + prev: any, + next: any, + _nullProto = false, _depth = 0, -): T { +): any { if (isServer) { - return _next + return next } - if (prev === _next) { + if (prev === next) { return prev } - if (_depth > 500) return _next - - const next = _next as any + if (_depth > 500) return next const array = isPlainArray(prev) && isPlainArray(next) if (!array && !(isPlainObject(prev) && isPlainObject(next))) return next const prevItems = array ? prev : getEnumerableOwnKeys(prev) - if (!prevItems) return next const nextItems = array ? next : getEnumerableOwnKeys(next) - if (!nextItems) return next - const prevSize = prevItems.length + if (!prevItems || !nextItems) return next const nextSize = nextItems.length - const copy: any = array ? new Array(nextSize) : _makeObj() - let equalItems = 0 + // Most calls find `next` deeply equal, so the copy waits for the first difference. + let copy: any + let equal = prevItems.length === nextSize for (let i = 0; i < nextSize; i++) { const key = array ? i : (nextItems[i] as any) const p = prev[key] - const n = next[key] - - if (p === n) { - copy[key] = p - if (array ? i < prevSize : hasOwn.call(prev, key)) equalItems++ - continue + let n = next[key] + if (p !== n && p && n && typeof p === 'object' && typeof n === 'object') { + n = replaceEqualDeep(p, n, _nullProto, _depth + 1) } - - if ( - p === null || - n === null || - typeof p !== 'object' || - typeof n !== 'object' - ) { - copy[key] = n - continue + if (p !== n) { + equal = false + copy ??= copyItems(prev, nextItems, i, array, _nullProto) + } else if (equal && !array && !hasOwn.call(prev, key)) { + // Equal key counts can still hide a key that only `next` has (as `undefined`). + equal = false } - - const v = replaceEqualDeep(p, n, _makeObj, _depth + 1) - copy[key] = v - if (v === p) equalItems++ + if (copy) copy[key] = n } - return prevSize === nextSize && equalItems === prevSize ? prev : copy + return equal + ? prev + : (copy ?? copyItems(prev, nextItems, nextSize, array, _nullProto)) +} + +// Copies the first `end` entries from `prev`; they are known to be deep-equal. +function copyItems( + prev: any, + keys: ArrayLike, + end: number, + array: boolean, + nullProto: boolean, +) { + const copy: any = array + ? new Array(keys.length) + : nullProto + ? Object.create(null) + : {} + for (let i = 0; i < end; i++) { + const key = array ? i : keys[i] + copy[key] = prev[key] + } + return copy } /** @@ -305,17 +322,9 @@ function getEnumerableOwnKeys(o: object) { return false } - // Only check symbols if the object has any (most plain objects don't) - const symbols = Object.getOwnPropertySymbols(o) - - // Fast path: no symbols, return enumerable string keys directly - if (symbols.length === 0) { - return keys - } - - // Slow path: has symbols, include only enumerable ones, bail on any - // non-enumerable symbol so it round-trips like the string-key check above. - for (const symbol of symbols) { + // Include enumerable symbols (most plain objects have none); bail on a + // non-enumerable one so it round-trips like the string-key check above. + for (const symbol of Object.getOwnPropertySymbols(o)) { if (!isEnumerable.call(o, symbol)) { return false } diff --git a/packages/router-core/tests/replace-equal-deep.bench.ts b/packages/router-core/tests/replace-equal-deep.bench.ts new file mode 100644 index 0000000000..a4c3f2105e --- /dev/null +++ b/packages/router-core/tests/replace-equal-deep.bench.ts @@ -0,0 +1,136 @@ +import { bench, describe, expect } from 'vitest' +import { + createNull, + deepEqual, + nullReplaceEqualDeep, + replaceEqualDeep, +} from '../src/utils' + +// Shapes the router feeds these helpers on every Link build / navigation. +const empty = {} +const emptyNull = createNull() +const search = { tab: 'specs', page: 2, sort: 'newest', filter: 'available' } +const searchCopy = { ...search } +const searchChanged = { ...search, page: 3 } +const nested = { + tab: 'specs', + filters: { category: 'hardware', available: true }, + ids: [1, 2, 3, 4], +} +const nestedCopy = { + tab: 'specs', + filters: { category: 'hardware', available: true }, + ids: [1, 2, 3, 4], +} +const nestedLeafChanged = { + tab: 'specs', + filters: { category: 'software', available: true }, + ids: [1, 2, 3, 4], +} +const list = Array.from({ length: 16 }, (_, index) => ({ id: index })) +const listCopy = list.map((item) => ({ ...item })) +const listChanged = list.map((item, index) => + index === 10 ? { id: -1 } : { ...item }, +) +const wide = Object.fromEntries( + Array.from({ length: 12 }, (_, index) => [`key${index}`, `value${index}`]), +) +const wideChanged = { ...wide, key7: 'changed' } + +expect(replaceEqualDeep(empty, {})).toBe(empty) +expect(replaceEqualDeep(search, searchCopy)).toBe(search) +expect(replaceEqualDeep(search, searchChanged)).toStrictEqual(searchChanged) +expect(replaceEqualDeep(nested, nestedCopy)).toBe(nested) +expect(replaceEqualDeep(nested, nestedLeafChanged).ids).toBe(nested.ids) +expect(replaceEqualDeep(list, listCopy)).toBe(list) +expect(replaceEqualDeep(list, listChanged)[3]).toBe(list[3]) +expect(replaceEqualDeep(wide, wideChanged)).toStrictEqual(wideChanged) +expect(nullReplaceEqualDeep(emptyNull, {})).toBe(emptyNull) +expect(deepEqual(search, searchCopy, { partial: true })).toBe(true) + +const iterations = 1_000 +let sink: unknown + +describe('replaceEqualDeep', () => { + bench('equal empty objects', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(empty, {}) + } + }) + + bench('equal empty null-proto objects', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(emptyNull, createNull()) + } + }) + + bench('equal flat search', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchCopy) + } + }) + + bench('flat search with one changed leaf', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchChanged) + } + }) + + bench('equal nested search', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(nested, nestedCopy) + } + }) + + bench('nested search sharing unchanged subtrees', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(nested, nestedLeafChanged) + } + }) + + bench('equal array of objects', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(list, listCopy) + } + }) + + bench('array of objects with one changed item', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(list, listChanged) + } + }) + + bench('wide flat object with one changed leaf', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(wide, wideChanged) + } + }) + + bench('wide flat object with one changed leaf (null-proto)', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(wide, wideChanged) + } + }) +}) + +describe('deepEqual', () => { + bench('equal empty objects', () => { + for (let i = 0; i < iterations; i++) { + sink = deepEqual(empty, {}) + } + }) + + bench('equal flat search (partial)', () => { + for (let i = 0; i < iterations; i++) { + sink = deepEqual(search, searchCopy, { partial: true }) + } + }) + + bench('nested search with one changed leaf', () => { + for (let i = 0; i < iterations; i++) { + sink = deepEqual(nested, nestedLeafChanged) + } + }) +}) + +export { sink } diff --git a/packages/router-core/tests/utils.test.ts b/packages/router-core/tests/utils.test.ts index c5156adef8..aa60dbd8f2 100644 --- a/packages/router-core/tests/utils.test.ts +++ b/packages/router-core/tests/utils.test.ts @@ -4,7 +4,9 @@ import { deepEqual, encodePathLikeUrl, escapeHtml, + hasOwn, isPlainArray, + nullReplaceEqualDeep, replaceEqualDeep, } from '../src/utils' @@ -345,6 +347,110 @@ describe('replaceEqualDeep', () => { next.foo = 'baz' expect(replaceEqualDeep(current, next)).toEqual(next) }) + + // The copy is only allocated at the first difference; everything compared + // before that point has to be carried over from `prev`. + describe('lazy copy', () => { + it('keeps earlier equal entries, including explicit undefined, when a later key differs', () => { + const prev = { a: { x: 1 }, b: undefined, c: 1 } + const next = { a: { x: 1 }, b: undefined, c: 2 } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result).not.toBe(prev) + expect(result).not.toBe(next) + expect(result.a).toBe(prev.a) + expect('b' in result).toBe(true) + }) + + it('includes keys that only exist in next before the first difference', () => { + const prev: Record = { a: 1 } + const next = { b: undefined, a: 2 } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect('b' in result).toBe(true) + }) + + it('keeps the key order of next', () => { + const prev = { a: 1, b: 2, c: 3 } + expect(Object.keys(replaceEqualDeep(prev, { c: 3, b: 2, a: 9 }))).toEqual( + ['c', 'b', 'a'], + ) + expect(Object.keys(replaceEqualDeep(prev, { b: 9, a: 1, c: 3 }))).toEqual( + ['b', 'a', 'c'], + ) + }) + + it('copies when only the key sets differ', () => { + const prev = { a: 1, b: 2 } + const next = { a: 1 } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result).not.toBe(prev) + expect(result).not.toBe(next) + }) + + it('returns a longer array when next appends an explicit undefined', () => { + const prev = [1] + const next = [1, undefined] + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result).toHaveLength(2) + expect(result).not.toBe(prev) + expect(result).not.toBe(next) + }) + + it('shares equal array entries before and after the first difference', () => { + const prev = [{ a: 1 }, { b: 1 }, { c: 1 }] + const next = [{ a: 1 }, { b: 2 }, { c: 1 }] + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result[0]).toBe(prev[0]) + expect(result[1]).not.toBe(prev[1]) + expect(result[2]).toBe(prev[2]) + }) + }) +}) + +describe('nullReplaceEqualDeep', () => { + it('creates null-prototype copies on the first difference', () => { + const result = nullReplaceEqualDeep({ a: 1, b: 2 }, { a: 1, b: 3 }) + expect(Object.getPrototypeOf(result)).toBeNull() + expect(result.a).toBe(1) + expect(result.b).toBe(3) + }) + + it('creates null-prototype copies when only the key sets differ', () => { + const result = nullReplaceEqualDeep({ a: 1 }, { a: 1, b: undefined }) + expect(Object.getPrototypeOf(result)).toBeNull() + expect(result.a).toBe(1) + expect('b' in result).toBe(true) + }) + + it('creates null-prototype copies for nested objects', () => { + const prev = { shared: { x: 1 }, changed: { y: 1 } } + const result = nullReplaceEqualDeep(prev, { + shared: { x: 1 }, + changed: { y: 2 }, + }) + expect(Object.getPrototypeOf(result)).toBeNull() + expect(Object.getPrototypeOf(result.changed)).toBeNull() + expect(result.shared).toBe(prev.shared) + }) + + it('stores an own __proto__ key instead of changing the prototype', () => { + const next = JSON.parse('{"__proto__":{"isAdmin":true},"name":"Alice"}') + const result = nullReplaceEqualDeep({ name: 'Bob' }, next) + expect(Object.getPrototypeOf(result)).toBeNull() + expect(hasOwn.call(result, '__proto__')).toBe(true) + expect(result['__proto__']).toEqual({ isAdmin: true }) + expect(result.name).toBe('Alice') + expect(({} as any).isAdmin).toBeUndefined() + }) + + it('returns prev when a plain next equals a null-prototype prev', () => { + const prev = Object.assign(Object.create(null), { a: 1, b: { c: 2 } }) + expect(nullReplaceEqualDeep(prev, { a: 1, b: { c: 2 } })).toBe(prev) + }) }) describe('isPlainArray', () => { From cecae5440b8edaea77c5448fe3d74bbd20fe10a4 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Wed, 16 Sep 2026 23:12:35 +0200 Subject: [PATCH 045/175] perf(router-core): check plain objects by constructor (#8363) * perf(router-core): check plain objects by constructor `isPlainObject` gates every recursion step of `replaceEqualDeep` and `deepEqual`, so it runs at least twice per object pair, on every nested level, on every navigation and Link build. The previous implementation (copied from `is-plain-object`) called `Object.prototype.toString` on the value and again on its constructor's prototype, plus a `hasOwnProperty` lookup: up to four `toString` dispatches per compared pair, most of them spent confirming that `{}` is a plain object. The check is now a single expression: !!o && typeof o === 'object' && (o.constructor ?? Object) === Object Object literals, `JSON.parse` output and `Object.create(literal)` inherit `Object` as their constructor; `Object.create(null)` objects (the router's search and params objects) have none, which `?? Object` accepts. Class instances, arrays, `Map`, `Date`, functions and primitives fail it, as before. The only accept-set differences are objects from another realm (an iframe's `Object` is not `===` ours) and objects with a custom `Symbol.toStringTag`; neither occurs in router state. Paired runs against the previous version (hz, 1000 calls per iteration): deepEqual equal empty objects 25.6k -> 59.4k (+132%) deepEqual nested, one changed leaf 11.3k -> 22.8k (+102%) deepEqual equal flat (partial) 23.0k -> 39.7k (+73%) replaceEqualDeep equal empty objects 10.6k -> 14.9k (+40%) replaceEqualDeep equal array of objs 489 -> 604 (+24%) replaceEqualDeep equal nested 2.4k -> 2.8k (+19%) replaceEqualDeep equal flat search 6.0k -> 7.0k (+17%) Adds an accept/reject table for `isPlainObject` and checks that class instances stay opaque to structural sharing while null-prototype and literal objects compare as equal. * fix(router-core): keep records with a constructor key plain `?constructor=foo` decodes to an own `constructor` data key on the null-prototype search record, and `(o.constructor ?? Object) === Object` read that key. Such records (and the `{ ...search }` copies of them) were classified as non-plain, so `replaceEqualDeep` handed back `next` without sharing and `deepEqual` reported them unequal. Keep the constructor comparison as the fast accept: it is an inline-cache load for literals and null-prototype records and is what the PR's speedup comes from. When `constructor` is anything else, consult the actual prototype instead of rejecting: `null` or one whose `constructor` is `Object` means a record, anything else a class instance. The prototype lookup is a builtin call (~6ns in megamorphic optimized code), so running it unconditionally would return most of the gain: median hz over 3 rotated rounds, `replaceEqualDeep` equal empty 10.9k -> 8.6k (-21%), equal array of objects 470 -> 386 (-18%), `deepEqual` equal empty 58.0k -> 35.9k (-38%). With the fallback only on the mismatch path the hot cases stay within noise of the shortcut and the constructor-key cases now do the sharing work at the same cost as other null-prototype records. `react-router.minimal` gzip is +15 B against the shortcut and still 44 B below the `toString` implementation. Benchmarks the predicate directly (literal, null-prototype record, record with a constructor key, class instance) and sharing of a search record that carries a constructor key. Tests both record shapes and parser output, all `constructor` value types, and that a class instance with an own `constructor` key stays opaque. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/brave-keys-count.md | 5 + packages/router-core/src/utils.ts | 33 ++--- .../tests/replace-equal-deep.bench.ts | 56 ++++++++ packages/router-core/tests/utils.test.ts | 132 ++++++++++++++++++ 4 files changed, 201 insertions(+), 25 deletions(-) create mode 100644 .changeset/brave-keys-count.md diff --git a/.changeset/brave-keys-count.md b/.changeset/brave-keys-count.md new file mode 100644 index 0000000000..be6595920a --- /dev/null +++ b/.changeset/brave-keys-count.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Detect plain objects by constructor instead of `Object.prototype.toString` dispatches in `isPlainObject`, which gates every `deepEqual` and `replaceEqualDeep` recursion step. Object literals, `JSON.parse` output and null-prototype objects are still plain; objects from another realm no longer are. Records with an own `constructor` key (for example the search params of `?constructor=foo`) fall back to a prototype check, so they keep structural sharing while class instances stay opaque. diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts index 0eff94b5eb..549814a38f 100644 --- a/packages/router-core/src/utils.ts +++ b/packages/router-core/src/utils.ts @@ -333,35 +333,18 @@ function getEnumerableOwnKeys(o: object) { return keys } -// Copied from: https://github.com/jonschlinkert/is-plain-object -export function isPlainObject(o: any) { - if (!hasObjectPrototype(o)) { +export function isPlainObject(o: unknown): boolean { + if (!o || typeof o !== 'object') { return false } - - // If has modified constructor - const ctor = o.constructor - if (typeof ctor === 'undefined') { + // Literals inherit `Object`; null-prototype records have no constructor at all. + if ((o.constructor ?? Object) === Object) { return true } - - // If has modified prototype - const prot = ctor.prototype - if (!hasObjectPrototype(prot)) { - return false - } - - // If constructor does not have an Object-specific method - if (!prot.hasOwnProperty('isPrototypeOf')) { - return false - } - - // Most likely a plain Object - return true -} - -function hasObjectPrototype(o: any) { - return Object.prototype.toString.call(o) === '[object Object]' + // An own `constructor` key (`?constructor=foo`) hides the inherited one, so + // only the prototype can tell such a record from a class instance. + const proto = Object.getPrototypeOf(o) + return proto === null || proto.constructor === Object } /** diff --git a/packages/router-core/tests/replace-equal-deep.bench.ts b/packages/router-core/tests/replace-equal-deep.bench.ts index a4c3f2105e..52c46d1a35 100644 --- a/packages/router-core/tests/replace-equal-deep.bench.ts +++ b/packages/router-core/tests/replace-equal-deep.bench.ts @@ -2,6 +2,7 @@ import { bench, describe, expect } from 'vitest' import { createNull, deepEqual, + isPlainObject, nullReplaceEqualDeep, replaceEqualDeep, } from '../src/utils' @@ -12,6 +13,19 @@ const emptyNull = createNull() const search = { tab: 'specs', page: 2, sort: 'newest', filter: 'available' } const searchCopy = { ...search } const searchChanged = { ...search, page: 3 } +// `?constructor=foo` decodes to an own `constructor` key on a null-proto record. +const searchWithConstructorKey = Object.assign(createNull(), { + constructor: 'foo', + page: 2, +}) +const searchWithConstructorKeyCopy = Object.assign(createNull(), { + constructor: 'foo', + page: 2, +}) +class Instance { + a = 1 +} +const instance = new Instance() const nested = { tab: 'specs', filters: { category: 'hardware', available: true }, @@ -46,11 +60,44 @@ expect(replaceEqualDeep(list, listCopy)).toBe(list) expect(replaceEqualDeep(list, listChanged)[3]).toBe(list[3]) expect(replaceEqualDeep(wide, wideChanged)).toStrictEqual(wideChanged) expect(nullReplaceEqualDeep(emptyNull, {})).toBe(emptyNull) +expect( + nullReplaceEqualDeep(searchWithConstructorKey, searchWithConstructorKeyCopy), +).toBe(searchWithConstructorKey) expect(deepEqual(search, searchCopy, { partial: true })).toBe(true) +expect(isPlainObject(search)).toBe(true) +expect(isPlainObject(emptyNull)).toBe(true) +expect(isPlainObject(searchWithConstructorKey)).toBe(true) +expect(isPlainObject(instance)).toBe(false) const iterations = 1_000 let sink: unknown +describe('isPlainObject', () => { + bench('literal', () => { + for (let i = 0; i < iterations; i++) { + sink = isPlainObject(search) + } + }) + + bench('null-proto record', () => { + for (let i = 0; i < iterations; i++) { + sink = isPlainObject(emptyNull) + } + }) + + bench('null-proto record with a constructor key', () => { + for (let i = 0; i < iterations; i++) { + sink = isPlainObject(searchWithConstructorKey) + } + }) + + bench('class instance', () => { + for (let i = 0; i < iterations; i++) { + sink = isPlainObject(instance) + } + }) +}) + describe('replaceEqualDeep', () => { bench('equal empty objects', () => { for (let i = 0; i < iterations; i++) { @@ -64,6 +111,15 @@ describe('replaceEqualDeep', () => { } }) + bench('equal null-proto search with a constructor key', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep( + searchWithConstructorKey, + searchWithConstructorKeyCopy, + ) + } + }) + bench('equal flat search', () => { for (let i = 0; i < iterations; i++) { sink = replaceEqualDeep(search, searchCopy) diff --git a/packages/router-core/tests/utils.test.ts b/packages/router-core/tests/utils.test.ts index aa60dbd8f2..280d84f204 100644 --- a/packages/router-core/tests/utils.test.ts +++ b/packages/router-core/tests/utils.test.ts @@ -6,9 +6,11 @@ import { escapeHtml, hasOwn, isPlainArray, + isPlainObject, nullReplaceEqualDeep, replaceEqualDeep, } from '../src/utils' +import { decode } from '../src/qss' describe('replaceEqualDeep', () => { it('should return the same object if the input objects are equal', () => { @@ -453,6 +455,136 @@ describe('nullReplaceEqualDeep', () => { }) }) +describe('isPlainObject', () => { + it.each([ + ['object literal', {}], + ['object literal with keys', { a: 1 }], + ['Object.create(null)', Object.create(null)], + ['object inheriting from a literal', Object.create({ inherited: 1 })], + ['JSON.parse result', JSON.parse('{"a":1}')], + ['frozen literal', Object.freeze({ a: 1 })], + ['new Object()', new Object()], + ['literal with an own constructor key', { constructor: 'foo' }], + [ + 'null-prototype object with an own constructor key', + Object.assign(Object.create(null), { constructor: 'foo' }), + ], + ['decoded search with a constructor key', decode('constructor=foo&page=1')], + ])('returns true for %s', (_name, value) => { + expect(isPlainObject(value)).toBe(true) + }) + + class Foo { + a = 1 + } + + it.each([ + ['null', null], + ['undefined', undefined], + ['number', 1], + ['string', 'a'], + ['boolean', true], + ['symbol', Symbol('s')], + ['function', () => {}], + ['empty array', []], + ['array', [1]], + ['Map', new Map()], + ['Set', new Set()], + ['Date', new Date()], + ['RegExp', /x/], + ['Promise', Promise.resolve()], + ['class instance', new Foo()], + ['Object.create(class prototype)', Object.create(Foo.prototype)], + [ + 'class instance with an own constructor key', + Object.assign(new Foo(), { constructor: 'foo' }), + ], + ])('returns false for %s', (_name, value) => { + expect(isPlainObject(value)).toBe(false) + }) + + it.each([ + ['string', 'foo'], + ['number', 1], + ['boolean', false], + ['null', null], + ['undefined', undefined], + ['array', ['a', 'b']], + ['object', { nested: 1 }], + ])('stays plain with a %s-valued constructor key', (_name, value) => { + expect(isPlainObject({ constructor: value })).toBe(true) + expect( + isPlainObject(Object.assign(Object.create(null), { constructor: value })), + ).toBe(true) + }) + + it.each([ + ['literal', Object.prototype], + ['null-prototype', null], + ])( + 'treats a constructor key as data in %s search records', + (_name, proto) => { + const makeSearch = (constructor: string) => + Object.assign(Object.create(proto), { + constructor, + filters: { status: 'open' }, + }) + const share = proto === null ? nullReplaceEqualDeep : replaceEqualDeep + + const prev = makeSearch('foo') + const equal = makeSearch('foo') + const changed = makeSearch('bar') + + expect(isPlainObject(prev)).toBe(true) + expect(deepEqual(prev, equal)).toBe(true) + expect(share(prev, equal)).toBe(prev) + + expect(deepEqual(prev, changed)).toBe(false) + const result = share(prev, changed) + expect(result).not.toBe(prev) + expect(result.constructor).toBe('bar') + expect(result.filters).toBe(prev.filters) + expect(Object.getPrototypeOf(result)).toBe(proto) + }, + ) + + it('shares decoded search records that carry a constructor key', () => { + const prev = decode('constructor=foo&page=1') + expect(prev.constructor).toBe('foo') + + expect(nullReplaceEqualDeep(prev, decode('constructor=foo&page=1'))).toBe( + prev, + ) + expect(deepEqual(prev, decode('page=1&constructor=foo'))).toBe(true) + + const changed = nullReplaceEqualDeep(prev, decode('constructor=bar&page=1')) + expect(changed).not.toBe(prev) + expect(changed.constructor).toBe('bar') + expect(changed.page).toBe(1) + + const repeated = decode('constructor=a&constructor=b') + expect(repeated.constructor).toStrictEqual(['a', 'b']) + expect(deepEqual(repeated, decode('constructor=a&constructor=b'))).toBe( + true, + ) + }) + + it('keeps class instances opaque for structural sharing and equality', () => { + const prev = new Foo() + const next = new Foo() + expect(replaceEqualDeep(prev, next)).toBe(next) + expect(deepEqual(prev, next)).toBe(false) + expect(deepEqual({ foo: prev }, { foo: prev })).toBe(true) + }) + + it('treats null-prototype and literal objects alike', () => { + const nullProto = Object.assign(Object.create(null), { a: 1 }) + expect(deepEqual(nullProto, { a: 1 })).toBe(true) + expect(deepEqual({ a: 1 }, nullProto)).toBe(true) + expect(replaceEqualDeep(nullProto, { a: 1 })).toBe(nullProto) + }) +}) + describe('isPlainArray', () => { it('should return `true` for plain arrays', () => { expect(isPlainArray([1, 2])).toEqual(true) From 01035782e53af9b929c784b94ddd64b95efb89c7 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Wed, 16 Sep 2026 23:12:36 +0200 Subject: [PATCH 046/175] perf(router-core): skip symbol enumeration for plain replaceEqualDeep inputs (#8364) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Every object pair `replaceEqualDeep` visited paid for three native key lookups per side: `Object.keys`, `Object.getOwnPropertyNames` (to detect non-enumerable props) and `Object.getOwnPropertySymbols`. Measured on a 4-key literal the first two cost 7.6 ns and 10 ns, the symbol lookup 34 ns — 31 ns even on `{}` — so two thirds of the enumeration cost went into a key type that router data never carries. (`Reflect.ownKeys` as a single replacement call was tried and is 100 ns.) Symbol keys and non-enumerable keys still have to be handled correctly: Apollo's `preloadQuery` refs carry symbol keys and broke under `defaultStructuralSharing` when copies dropped them (#4237). Instead of comparing and copying such objects key by key, they are now opaque: an object with non-enumerable own keys on either side, or symbol keys on `next`, makes `next` pass through untouched. That keeps both guarantees that matter — no partial copy, no stale `prev` returned for it — and only gives up structural sharing for those objects. `prev` is not scanned for symbols on purpose. It is normally an earlier `next`, so a symbol-carrying `prev` meets a symbol-carrying `next` and the `next` check fires; a symbol-carrying `prev` with a symbol-free, otherwise equal `next` returns `prev` (covered by a test). Plain objects are now compared and copied by `Object.keys` alone, and `getEnumerableOwnKeys` is gone. Paired runs against the previous version (hz, 1000 calls per iteration): equal empty objects 14.8k -> 18.3k (+24%) equal empty null-proto objects 5.1k -> 6.3k (+24%) equal flat search 7.3k -> 8.2k (+12%) flat, one changed leaf 6.1k -> 6.9k (+12%) equal nested search 3.0k -> 3.1k (+4%) nested, sharing subtrees 2.6k -> 2.7k (+7%) equal array of objects 609 -> 729 (+20%) array, one changed item 551 -> 640 (+16%) wide (12 keys) changed, null-proto 1.8k -> 2.0k (+9%) Tests now document the pass-through contract for symbol-keyed objects, including the deliberate `prev`-only asymmetry. --- .changeset/calm-symbols-pass.md | 5 ++ packages/router-core/src/utils.ts | 46 +++++----------- packages/router-core/tests/utils.test.ts | 68 +++++++++++++++--------- 3 files changed, 61 insertions(+), 58 deletions(-) create mode 100644 .changeset/calm-symbols-pass.md diff --git a/.changeset/calm-symbols-pass.md b/.changeset/calm-symbols-pass.md new file mode 100644 index 0000000000..239cb5792f --- /dev/null +++ b/.changeset/calm-symbols-pass.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Compare and copy plain objects in `replaceEqualDeep` by their string keys only, skipping the symbol-key lookup that dominated key enumeration. Objects with non-enumerable own properties, or symbol keys on the incoming value, now pass through untouched instead of being structurally shared. diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts index 549814a38f..10498ec978 100644 --- a/packages/router-core/src/utils.ts +++ b/packages/router-core/src/utils.ts @@ -209,7 +209,6 @@ export function functionalUpdate( } export const hasOwn = Object.prototype.hasOwnProperty -const isEnumerable = Object.prototype.propertyIsEnumerable export function hasKeys(obj: Record) { for (const key in obj) { @@ -254,9 +253,20 @@ export function replaceEqualDeep( if (!array && !(isPlainObject(prev) && isPlainObject(next))) return next - const prevItems = array ? prev : getEnumerableOwnKeys(prev) - const nextItems = array ? next : getEnumerableOwnKeys(next) - if (!prevItems || !nextItems) return next + const prevItems = array ? prev : Object.keys(prev) + const nextItems = array ? next : Object.keys(next) + // Non-enumerable keys, or symbol keys on `next`, make an object opaque: it passes + // through untouched rather than being compared or copied by its string keys only. + // (`getOwnPropertySymbols` is ~4x the cost of the other two, so `prev` — normally an + // earlier `next` — is not checked for symbols.) + if ( + !array && + (prevItems.length !== Object.getOwnPropertyNames(prev).length || + nextItems.length !== Object.getOwnPropertyNames(next).length || + Object.getOwnPropertySymbols(next).length) + ) { + return next + } const nextSize = nextItems.length // Most calls find `next` deeply equal, so the copy waits for the first difference. @@ -305,34 +315,6 @@ function copyItems( return copy } -/** - * Equivalent to `Reflect.ownKeys`, but ensures that objects are "clone-friendly": - * will return false if object has any non-enumerable properties. - * - * Optimized for the common case where objects have no symbol properties. - */ -function getEnumerableOwnKeys(o: object) { - // `Object.keys` returns only enumerable own string keys natively (no per-key - // JS callback). If it has fewer entries than `getOwnPropertyNames` (all own - // string keys), the object has a non-enumerable own string prop and is not - // "clone-friendly" -> bail. This replaces an O(n) loop of - // `propertyIsEnumerable` calls with two native calls. - const keys = Object.keys(o) - if (keys.length !== Object.getOwnPropertyNames(o).length) { - return false - } - - // Include enumerable symbols (most plain objects have none); bail on a - // non-enumerable one so it round-trips like the string-key check above. - for (const symbol of Object.getOwnPropertySymbols(o)) { - if (!isEnumerable.call(o, symbol)) { - return false - } - ;(keys as Array).push(symbol) - } - return keys -} - export function isPlainObject(o: unknown): boolean { if (!o || typeof o !== 'object') { return false diff --git a/packages/router-core/tests/utils.test.ts b/packages/router-core/tests/utils.test.ts index 280d84f204..2954ae0c5c 100644 --- a/packages/router-core/tests/utils.test.ts +++ b/packages/router-core/tests/utils.test.ts @@ -41,20 +41,20 @@ describe('replaceEqualDeep', () => { }) describe('symbol properties', () => { - it('should look at symbol properties in the object comparison', () => { + it('passes objects with differing symbol values through untouched', () => { const propertyKey = Symbol('property') const obj1 = { a: 1, [propertyKey]: 2 } const obj2 = { a: 1, [propertyKey]: 3 } const result = replaceEqualDeep(obj1, obj2) - expect(result).toStrictEqual(obj2) + expect(result).toBe(obj2) }) - it('should copy over symbol properties when creating a new object', () => { + it('never copies an object with symbol properties partially', () => { const propertyKey = Symbol('property') const obj1 = { a: 1, [propertyKey]: 2 } const obj2 = { a: 3, [propertyKey]: 2 } const result = replaceEqualDeep(obj1, obj2) - expect(result).toStrictEqual(obj2) + expect(result).toBe(obj2) }) }) @@ -852,15 +852,14 @@ describe('decodePath', () => { }) /** - * Tests for getEnumerableOwnKeys behavior (internal function). - * Tested indirectly through replaceEqualDeep since getEnumerableOwnKeys is not exported. + * Tests for the key handling of replaceEqualDeep. * - * getEnumerableOwnKeys should: - * 1. Return array of all enumerable own keys (strings + symbols) - * 2. Return false if any property is non-enumerable - * 3. Handle objects with no symbols efficiently (optimization target) + * Plain objects are compared and copied by their enumerable own string keys. + * Objects with symbol keys (checked on `next`) or non-enumerable keys are opaque: + * `next` passes through untouched, so no data is dropped and no stale object is + * reused (Apollo's preloadQuery refs carry symbol keys, see #4237). */ -describe('getEnumerableOwnKeys behavior (via replaceEqualDeep)', () => { +describe('key handling (via replaceEqualDeep)', () => { describe('plain objects with string keys only', () => { it('should handle empty objects', () => { const prev = {} @@ -931,24 +930,24 @@ describe('getEnumerableOwnKeys behavior (via replaceEqualDeep)', () => { }) }) - describe('objects with symbol keys', () => { - it('should handle objects with single symbol key', () => { + describe('objects with symbol keys pass through untouched', () => { + it('returns next for a single symbol key', () => { const sym = Symbol('test') const prev = { [sym]: 1 } const next = { [sym]: 1 } - expect(replaceEqualDeep(prev, next)).toBe(prev) + expect(replaceEqualDeep(prev, next)).toBe(next) }) - it('should handle objects with multiple symbol keys', () => { + it('returns next for multiple symbol keys', () => { const sym1 = Symbol('a') const sym2 = Symbol('b') const sym3 = Symbol('c') const prev = { [sym1]: 1, [sym2]: 2, [sym3]: 3 } const next = { [sym1]: 1, [sym2]: 2, [sym3]: 3 } - expect(replaceEqualDeep(prev, next)).toBe(prev) + expect(replaceEqualDeep(prev, next)).toBe(next) }) - it('should detect differences in symbol values', () => { + it('keeps differing symbol values', () => { const sym = Symbol('test') const prev = { [sym]: 1 } const next = { [sym]: 2 } @@ -957,23 +956,31 @@ describe('getEnumerableOwnKeys behavior (via replaceEqualDeep)', () => { expect(result[sym]).toBe(2) }) - it('should handle global symbols', () => { + it('returns next for global symbols', () => { const sym = Symbol.for('global.test.key') const prev = { [sym]: 'value' } const next = { [sym]: 'value' } + expect(replaceEqualDeep(prev, next)).toBe(next) + }) + + it('does not share a symbol-keyed prev when next has no symbols', () => { + // Only `next` is checked for symbols; a former `next` returned as-is is the usual prev. + const sym = Symbol('test') + const prev = { a: 1, [sym]: 1 } + const next = { a: 1 } expect(replaceEqualDeep(prev, next)).toBe(prev) }) }) describe('objects with mixed string and symbol keys', () => { - it('should handle objects with both string and symbol keys', () => { + it('returns next when both string and symbol keys are present', () => { const sym = Symbol('test') const prev = { a: 1, b: 2, [sym]: 3 } const next = { a: 1, b: 2, [sym]: 3 } - expect(replaceEqualDeep(prev, next)).toBe(prev) + expect(replaceEqualDeep(prev, next)).toBe(next) }) - it('should detect differences in string keys when symbols present', () => { + it('keeps string differences when symbols present', () => { const sym = Symbol('test') const prev = { a: 1, b: 2, [sym]: 3 } const next = { a: 1, b: 99, [sym]: 3 } @@ -983,7 +990,7 @@ describe('getEnumerableOwnKeys behavior (via replaceEqualDeep)', () => { expect(result[sym]).toBe(3) }) - it('should detect differences in symbol keys when strings present', () => { + it('keeps symbol differences when strings present', () => { const sym = Symbol('test') const prev = { a: 1, b: 2, [sym]: 3 } const next = { a: 1, b: 2, [sym]: 99 } @@ -993,11 +1000,20 @@ describe('getEnumerableOwnKeys behavior (via replaceEqualDeep)', () => { expect(result[sym]).toBe(99) }) - it('should handle complex nested objects with symbols', () => { + it('shares plain siblings around a nested symbol-keyed object', () => { const sym = Symbol('nested') - const prev = { outer: { inner: 1, [sym]: { deep: 'value' } } } - const next = { outer: { inner: 1, [sym]: { deep: 'value' } } } - expect(replaceEqualDeep(prev, next)).toBe(prev) + const prev = { + outer: { inner: 1, [sym]: { deep: 'value' } }, + plain: { x: 1 }, + } + const next = { + outer: { inner: 1, [sym]: { deep: 'value' } }, + plain: { x: 1 }, + } + const result = replaceEqualDeep(prev, next) + expect(result).not.toBe(prev) + expect(result.outer).toBe(next.outer) + expect(result.plain).toBe(prev.plain) }) }) From bbd2336b8446de3f7dd85070895e7cf43980183e Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Wed, 16 Sep 2026 23:12:36 +0200 Subject: [PATCH 047/175] perf(router-core): split replaceEqualDeep into an equality scan and a copy phase (#8389) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * perf(router-core): split replaceEqualDeep into an equality scan and a copy phase `replaceEqualDeep` compared and copied in one loop. Every entry, also on the common all-equal path, paid for the copy bookkeeping (`copy ??=`, `if (copy) copy[key] = n`), an `equal` flag and — for objects — a `hasOwn.call(prev, key)` lookup, while arrays and objects shared the same keyed accesses through `array ? i : keys[i]`, so every access site saw both element and named keys. The function now runs in two phases: - Scan: walk `next` up to the first difference, sharing equal children on the way. Arrays and objects have their own loop, so each keyed access only ever sees one kind of key and nothing is allocated while entries keep matching. A key at the same position of both key lists is proven to be `prev`'s own key; only reordered keys still need `hasOwn`. When everything matched and the key counts agree, `prev` is returned. - Copy: equality is ruled out, so the loop only builds the result. The scanned prefix is shared from `prev`, the first differing entry keeps the value the scan already computed, and the rest is resolved without any equality bookkeeping. Only an object entry of `prev` can share anything, so the recursion is guarded by a single `typeof` check; `null` and mismatched types return `next`'s entry through the entry checks. `isPlainArray` is no longer used here: the array check reuses the `Object.keys` result that the scan needs anyway. Semantics are unchanged: pass-through for non-enumerable keys and for symbol keys on `next`, null-prototype copies, the depth limit and the SSR early return all stay as they were, and the tests pass against both implementations. Bundle size (`benchmark:bundle-size`, gzip): react-router.minimal -1 B, react-router.full -18 B, all 18 scenarios net -110 B (13 down, 5 up, max +20 B on react-start.full for identical code). Paired runs against the previous version (hz medians of 3 runs, 1000 calls per iteration; the machine was under load, so single-digit differences are noise): equal flat search 5.96k -> 6.98k (+17%) equal nested search 2.47k -> 2.83k (+14%) equal array of objects 524 -> 579 (+10%) equal long primitive array (1024) 49 -> 69 (+39%) long primitive array, last item changed 37 -> 41 (+11%) wider flat object (64 keys), last changed 218 -> 229 (+5%) flat search, one changed leaf 5.31k -> 5.59k (+5%) array of objects, one changed item 483 -> 513 (+6%) flat search, all leaves changed 5.29k -> 5.35k (+1%) array of shared objects, one changed 1.61k -> 1.44k (-10%, ±29%) Entries that change between an object and a primitive now pay one recursive call instead of an inline four-way type check; guarding both sides costs more bundle bytes than this branch is worth. Adds tests for the scan/copy boundary (equal children and next-only keys after the first difference, reordered keys, object/primitive transitions, shorter and longer arrays, a change in the last of 1024 entries, the depth limit) and bench cases for the shapes that told the candidate implementations apart. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * fix(router-core): keep sparse arrays with extra keys opaque in replaceEqualDeep The plain-array check compares `Object.keys(array).length` with `array.length`. A hole and an extra enumerable key cancel out in that count, so `Object.assign([1, ,], { extra: 'x' })` was admitted: the index-based copy dropped `extra` and turned the hole into an explicit `undefined`, and an index-wise equal `prev` was returned for it. The same blind spot exists in the exported `isPlainArray`, which the previous implementation used for this check. Extra string keys always sort after the index keys, so once the count matches, `next` is a dense index-only array exactly when its last key is its last index. That is one string comparison per array instead of a per-key validation, and it stays inline with the existing count check. `prev` keeps the count check only: a result is either a copy built from `next`'s entries or `prev` itself, which the caller already holds. Symbol keys on arrays stay admitted, as before this stack: checking them costs an `Object.getOwnPropertySymbols` call per array pair, which measured ~8% on the equal nested search shape (a record holding a four-element array), and `react-router.minimal` +3 B on top of the +13 B gzip of this fix. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/split-phase-sharing.md | 5 + packages/router-core/src/utils.ts | 112 +++++++------ .../tests/replace-equal-deep.bench.ts | 74 +++++++++ packages/router-core/tests/utils.test.ts | 148 ++++++++++++++++++ 4 files changed, 291 insertions(+), 48 deletions(-) create mode 100644 .changeset/split-phase-sharing.md diff --git a/.changeset/split-phase-sharing.md b/.changeset/split-phase-sharing.md new file mode 100644 index 0000000000..3bed92f275 --- /dev/null +++ b/.changeset/split-phase-sharing.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Split `replaceEqualDeep` into an equality scan and a copy phase: arrays and objects are scanned by dedicated loops up to the first difference, matching keys prove ownership without a `hasOwnProperty` lookup, and once a difference is found the result is built without any further equality bookkeeping. Deeply equal search, params, state and loader data are recognised faster and changed values are copied with less work per entry. diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts index 10498ec978..475e8f29ed 100644 --- a/packages/router-core/src/utils.ts +++ b/packages/router-core/src/utils.ts @@ -237,7 +237,7 @@ export function replaceEqualDeep( export function replaceEqualDeep( prev: any, next: any, - _nullProto = false, + _nullProto?: boolean, _depth = 0, ): any { if (isServer) { @@ -249,68 +249,84 @@ export function replaceEqualDeep( if (_depth > 500) return next - const array = isPlainArray(prev) && isPlainArray(next) + const array = Array.isArray(prev) && Array.isArray(next) if (!array && !(isPlainObject(prev) && isPlainObject(next))) return next - const prevItems = array ? prev : Object.keys(prev) - const nextItems = array ? next : Object.keys(next) - // Non-enumerable keys, or symbol keys on `next`, make an object opaque: it passes - // through untouched rather than being compared or copied by its string keys only. + const prevKeys = Object.keys(prev) + const nextKeys = Object.keys(next) + const length = nextKeys.length + // Holes or extra keys on an array, non-enumerable keys on an object, or symbol + // keys on `next` make a value opaque: it passes through untouched rather than + // being compared or copied by its indices or string keys only. A hole and an + // extra key cancel out in the key count, but extra keys sort after the indices, + // so only a dense index-only `next` has its last index as its last key. // (`getOwnPropertySymbols` is ~4x the cost of the other two, so `prev` — normally an - // earlier `next` — is not checked for symbols.) + // earlier `next` — is not checked for symbols, and arrays are not checked at all.) if ( - !array && - (prevItems.length !== Object.getOwnPropertyNames(prev).length || - nextItems.length !== Object.getOwnPropertyNames(next).length || - Object.getOwnPropertySymbols(next).length) + array + ? prevKeys.length !== prev.length || + length !== next.length || + (length && nextKeys[length - 1] !== `${length - 1}`) + : prevKeys.length !== Object.getOwnPropertyNames(prev).length || + length !== Object.getOwnPropertyNames(next).length || + Object.getOwnPropertySymbols(next).length ) { return next } - const nextSize = nextItems.length - // Most calls find `next` deeply equal, so the copy waits for the first difference. - let copy: any - let equal = prevItems.length === nextSize + let i = 0 + let n: any - for (let i = 0; i < nextSize; i++) { - const key = array ? i : (nextItems[i] as any) - const p = prev[key] - let n = next[key] - if (p !== n && p && n && typeof p === 'object' && typeof n === 'object') { - n = replaceEqualDeep(p, n, _nullProto, _depth + 1) + // Most calls find `next` deeply equal, so nothing is allocated while entries + // keep matching: scan up to the first difference, sharing equal children on + // the way. Arrays and objects get their own loop so that each keyed access + // only ever sees one kind of key. Only an object entry of `prev` can share + // anything; the recursive call returns `next`'s entry for `null` and for + // mismatched types. When the key counts differ, the scan still runs: every + // child it resolves is exactly what the copy below shares. + if (array) { + for (; i < length; i++) { + const p = prev[i] + n = next[i] + if (p !== n && typeof p === 'object') { + n = replaceEqualDeep(p, n, _nullProto, _depth + 1) + } + if (n !== p) break } - if (p !== n) { - equal = false - copy ??= copyItems(prev, nextItems, i, array, _nullProto) - } else if (equal && !array && !hasOwn.call(prev, key)) { + } else { + for (; i < length; i++) { + const key = nextKeys[i]! + const p = prev[key] + n = next[key] + if (p !== n && typeof p === 'object') { + n = replaceEqualDeep(p, n, _nullProto, _depth + 1) + } // Equal key counts can still hide a key that only `next` has (as `undefined`). - equal = false + // The same key at the same position of both key lists proves it is `prev`'s + // own key; only reordered keys need the `hasOwn` lookup. + if (n !== p || (prevKeys[i] !== key && !hasOwn.call(prev, key))) { + break + } } - if (copy) copy[key] = n } + // Everything in `next` matched and `prev` has no additional keys. + if (i === length && prevKeys.length === length) return prev - return equal - ? prev - : (copy ?? copyItems(prev, nextItems, nextSize, array, _nullProto)) -} - -// Copies the first `end` entries from `prev`; they are known to be deep-equal. -function copyItems( - prev: any, - keys: ArrayLike, - end: number, - array: boolean, - nullProto: boolean, -) { - const copy: any = array - ? new Array(keys.length) - : nullProto - ? Object.create(null) - : {} - for (let i = 0; i < end; i++) { - const key = array ? i : keys[i] - copy[key] = prev[key] + // Equality is ruled out from here on, so this loop only builds the result: + // the scanned prefix is shared from `prev`, entry `i` keeps the value the scan + // already computed, and the rest is resolved without any equality bookkeeping. + const copy: any = array ? [] : _nullProto ? Object.create(null) : {} + for (let j = 0; j < length; j++) { + const key = array ? j : nextKeys[j]! + const p = prev[key] + if (j > i) { + n = next[key] + if (p !== n && typeof p === 'object') { + n = replaceEqualDeep(p, n, _nullProto, _depth + 1) + } + } + copy[key] = j < i ? p : n } return copy } diff --git a/packages/router-core/tests/replace-equal-deep.bench.ts b/packages/router-core/tests/replace-equal-deep.bench.ts index 52c46d1a35..d6eac3279b 100644 --- a/packages/router-core/tests/replace-equal-deep.bench.ts +++ b/packages/router-core/tests/replace-equal-deep.bench.ts @@ -46,10 +46,31 @@ const listCopy = list.map((item) => ({ ...item })) const listChanged = list.map((item, index) => index === 10 ? { id: -1 } : { ...item }, ) +const listShared = list.map((item, index) => (index === 10 ? { id: -1 } : item)) const wide = Object.fromEntries( Array.from({ length: 12 }, (_, index) => [`key${index}`, `value${index}`]), ) const wideChanged = { ...wide, key7: 'changed' } +const searchAllChanged = { + tab: 'other', + page: 3, + sort: 'oldest', + filter: 'sold', +} +const searchReordered = { + filter: 'available', + sort: 'newest', + page: 2, + tab: 'specs', +} +const searchSubset = { tab: 'specs', page: 2, sort: 'newest' } +const wider = Object.fromEntries( + Array.from({ length: 64 }, (_, index) => [`key${index}`, `value${index}`]), +) +const widerChangedLast = { ...wider, key63: 'changed' } +const numbers = Array.from({ length: 1024 }, (_, index) => index) +const numbersCopy = [...numbers] +const numbersChangedLast = numbers.map((n, index) => (index === 1023 ? -1 : n)) expect(replaceEqualDeep(empty, {})).toBe(empty) expect(replaceEqualDeep(search, searchCopy)).toBe(search) @@ -59,6 +80,17 @@ expect(replaceEqualDeep(nested, nestedLeafChanged).ids).toBe(nested.ids) expect(replaceEqualDeep(list, listCopy)).toBe(list) expect(replaceEqualDeep(list, listChanged)[3]).toBe(list[3]) expect(replaceEqualDeep(wide, wideChanged)).toStrictEqual(wideChanged) +expect(replaceEqualDeep(list, listShared)[3]).toBe(list[3]) +expect(replaceEqualDeep(search, searchAllChanged)).toStrictEqual( + searchAllChanged, +) +expect(replaceEqualDeep(search, searchReordered)).toBe(search) +expect(replaceEqualDeep(search, searchSubset)).toStrictEqual(searchSubset) +expect(replaceEqualDeep(wider, widerChangedLast)).toStrictEqual( + widerChangedLast, +) +expect(replaceEqualDeep(numbers, numbersCopy)).toBe(numbers) +expect(replaceEqualDeep(numbers, numbersChangedLast)[1023]).toBe(-1) expect(nullReplaceEqualDeep(emptyNull, {})).toBe(emptyNull) expect( nullReplaceEqualDeep(searchWithConstructorKey, searchWithConstructorKeyCopy), @@ -167,6 +199,48 @@ describe('replaceEqualDeep', () => { sink = nullReplaceEqualDeep(wide, wideChanged) } }) + + bench('flat search with all leaves changed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchAllChanged) + } + }) + + bench('equal flat search with reordered keys', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchReordered) + } + }) + + bench('flat search with a key removed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchSubset) + } + }) + + bench('array of shared objects with one changed item', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(list, listShared) + } + }) + + bench('wider flat object (64 keys) with the last leaf changed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(wider, widerChangedLast) + } + }) + + bench('equal long primitive array', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(numbers, numbersCopy) + } + }) + + bench('long primitive array with the last item changed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(numbers, numbersChangedLast) + } + }) }) describe('deepEqual', () => { diff --git a/packages/router-core/tests/utils.test.ts b/packages/router-core/tests/utils.test.ts index 2954ae0c5c..407abd7953 100644 --- a/packages/router-core/tests/utils.test.ts +++ b/packages/router-core/tests/utils.test.ts @@ -256,6 +256,28 @@ describe('replaceEqualDeep', () => { expect(result).toBe(next) }) + // A hole and an extra key cancel out in `Object.keys(array).length`, so the + // key count alone would admit such an array and the copy would drop the key + // and fill the hole. + describe('non-dense arrays', () => { + it('passes a sparse array with an extra key through untouched', () => { + const next = Object.assign([1, ,], { extra: 'x' }) as Array + expect(Object.keys(next)).toHaveLength(next.length) + expect(replaceEqualDeep([1, 3], next)).toBe(next) + expect(replaceEqualDeep([1, undefined], next)).toBe(next) + }) + + it('still shares dense arrays', () => { + const prev = [1, 2, undefined] + expect(replaceEqualDeep(prev, [1, 2, undefined])).toBe(prev) + expect(replaceEqualDeep(prev, [1, 3, undefined])).toStrictEqual([ + 1, + 3, + undefined, + ]) + }) + }) + it('should replace all parent objects if some nested value changes', () => { const prev = { todo: { id: '1', meta: { createdAt: 0 }, state: { done: false } }, @@ -411,6 +433,132 @@ describe('replaceEqualDeep', () => { expect(result[2]).toBe(prev[2]) }) }) + + // The scan stops at the first difference; everything after it is resolved by + // the copy loop, which must share and recurse exactly like the scan does. + describe('split-phase copy', () => { + it('returns prev for equal objects whose keys are ordered differently', () => { + const prev = { a: 1, b: { x: 1 }, c: 3 } + const next = { c: 3, a: 1, b: { x: 1 } } + expect(replaceEqualDeep(prev, next)).toBe(prev) + }) + + it('copies when a reordered next has a key that prev lacks', () => { + const prev: Record = { a: 1, b: 2 } + const next = { b: 2, c: undefined } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result).not.toBe(prev) + expect(result).not.toBe(next) + expect('c' in result).toBe(true) + expect('a' in result).toBe(false) + }) + + it('includes keys that only exist in next after the first difference', () => { + const prev: Record = { a: 1, b: 2, d: 4 } + const next = { a: 9, b: 2, c: undefined } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect('c' in result).toBe(true) + expect('d' in result).toBe(false) + }) + + it('shares equal children that come after the first difference', () => { + const prev = { a: 1, b: { x: 1 }, c: [1, 2], d: 'same' } + const next = { a: 2, b: { x: 1 }, c: [1, 2], d: 'same' } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result.b).toBe(prev.b) + expect(result.c).toBe(prev.c) + }) + + it('recurses into changed children that come after the first difference', () => { + const prev = { a: 1, b: { x: 1, y: { z: 1 } } } + const next = { a: 2, b: { x: 2, y: { z: 1 } } } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result.b).not.toBe(prev.b) + expect(result.b).not.toBe(next.b) + expect(result.b.y).toBe(prev.b.y) + }) + + it('takes the next value when an entry changes between object and primitive', () => { + const prev = { a: { x: 1 }, b: null, c: 's', d: [1], e: 0 } + const next = { a: null, b: { x: 1 }, c: {}, d: 's', e: [1] } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result.b).toBe(next.b) + expect(result.c).toBe(next.c) + expect(result.e).toBe(next.e) + }) + + it('takes the next value when a later entry changes between object and primitive', () => { + const prev = { k: 0, a: { x: 1 }, b: undefined, c: [1] } + const next = { k: 1, a: undefined, b: { x: 1 }, c: 's' } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result.b).toBe(next.b) + }) + + it('copies a shorter next array, sharing its equal prefix', () => { + const prev = [{ a: 1 }, { b: 1 }, { c: 1 }] + const next = [{ a: 1 }, { b: 1 }] + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result).not.toBe(prev) + expect(result).not.toBe(next) + expect(result[0]).toBe(prev[0]) + expect(result[1]).toBe(prev[1]) + }) + + it('copies a longer next array, sharing the equal prefix', () => { + const prev = [{ a: 1 }] + const next = [{ a: 1 }, { b: 1 }] + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result[0]).toBe(prev[0]) + expect(result[1]).toBe(next[1]) + }) + + it('copies a next object whose entries all match a larger prev', () => { + const prev = { a: { x: 1 }, b: 2 } + const next = { a: { x: 1 } } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result).not.toBe(prev) + expect(result).not.toBe(next) + expect(result.a).toBe(prev.a) + }) + + it('handles a change in the last entry of a long array', () => { + const prev = Array.from({ length: 1024 }, (_, index) => ({ index })) + const next = prev.map((item, index) => + index === 1023 ? { index: -1 } : item, + ) + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result).not.toBe(prev) + expect(result[0]).toBe(prev[0]) + expect(result[1022]).toBe(prev[1022]) + expect(result[1023]).not.toBe(prev[1023]) + expect(result[1023]).toStrictEqual(next[1023]) + }) + + it('stops sharing beyond the depth limit', () => { + const nest = (depth: number) => { + let value: any = { leaf: true } + for (let i = 0; i < depth; i++) { + value = { child: value } + } + return value + } + const prev = nest(510) + const next = nest(510) + const result = replaceEqualDeep(prev, next) + expect(result).not.toBe(prev) + expect(result).toStrictEqual(next) + }) + }) }) describe('nullReplaceEqualDeep', () => { From ce10dcd4d9d3d23738744e453205aad5c6dbd716 Mon Sep 17 00:00:00 2001 From: Flo Date: Wed, 16 Sep 2026 23:12:37 +0200 Subject: [PATCH 048/175] perf(router-core): reduce replaceEqualDeep allocations (#8411) * perf(router-core): reuse key buffers in replaceEqualDeep * perf(router-core): reuse unchanged incoming objects * perf(router-core): reuse existing search objects --- .changeset/poor-tires-tan.md | 7 + packages/router-core/src/utils.ts | 147 +++--- .../tests/replace-equal-deep.bench.ts | 272 +++++++++++ packages/router-core/tests/utils.test.ts | 428 ++++++++++++++++-- 4 files changed, 760 insertions(+), 94 deletions(-) create mode 100644 .changeset/poor-tires-tan.md diff --git a/.changeset/poor-tires-tan.md b/.changeset/poor-tires-tan.md new file mode 100644 index 0000000000..f230c6a400 --- /dev/null +++ b/.changeset/poor-tires-tan.md @@ -0,0 +1,7 @@ +--- +'@tanstack/router-core': patch +--- + +Reduce structural-sharing allocations by reusing array key storage and returning incoming objects when their children need no replacements. Preserve signed zero consistently, remove stale symbol properties, and keep sparse arrays with extra keys and built-ins with an own `constructor` opaque. + +Null-prototype mode now applies only when constructing a copy; existing incoming objects can be reused with their original prototype. diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts index 475e8f29ed..63aa518695 100644 --- a/packages/router-core/src/utils.ts +++ b/packages/router-core/src/utils.ts @@ -223,10 +223,11 @@ export const nullReplaceEqualDeep: typeof replaceEqualDeep = (prev, next) => replaceEqualDeep(prev, next, true) /** - * This function returns `prev` if `next` is deeply equal. - * If not, it will replace any deeply equal children of `b` with those of `a`. - * This can be used for structural sharing between immutable JSON values for example. - * Do not use this with signals + * Reuse equal children between immutable plain objects and dense arrays. + * Return `prev` for deeply equal values; otherwise return an object already + * containing the resolved children or create a copy with the shared children. + * Getters and own `__proto__` keys in ordinary object copies are unsupported. + * Do not use this with signals. */ export function replaceEqualDeep( prev: any, @@ -247,28 +248,30 @@ export function replaceEqualDeep( return prev } - if (_depth > 500) return next + if (_depth++ > 500) { + return next + } const array = Array.isArray(prev) && Array.isArray(next) - if (!array && !(isPlainObject(prev) && isPlainObject(next))) return next + if (!array && !(isPlainObject(prev) && isPlainObject(next))) { + return next + } - const prevKeys = Object.keys(prev) - const nextKeys = Object.keys(next) + const prevKeys: Array = Object.keys(prev) + const previousCount = prevKeys.length + const nextKeys: Array = Object.keys(next) const length = nextKeys.length - // Holes or extra keys on an array, non-enumerable keys on an object, or symbol - // keys on `next` make a value opaque: it passes through untouched rather than - // being compared or copied by its indices or string keys only. A hole and an - // extra key cancel out in the key count, but extra keys sort after the indices, - // so only a dense index-only `next` has its last index as its last key. - // (`getOwnPropertySymbols` is ~4x the cost of the other two, so `prev` — normally an - // earlier `next` — is not checked for symbols, and arrays are not checked at all.) + // Hidden object keys and symbols on next make the value opaque. Arrays + // must have only dense enumerable indices: a hole and an extra key can + // cancel out in the count, so also check the last key of both arrays. if ( array - ? prevKeys.length !== prev.length || + ? previousCount !== prev.length || length !== next.length || - (length && nextKeys[length - 1] !== `${length - 1}`) - : prevKeys.length !== Object.getOwnPropertyNames(prev).length || + (previousCount && last(prevKeys) !== `${previousCount - 1}`) || + (length && last(nextKeys) !== `${length - 1}`) + : previousCount !== Object.getOwnPropertyNames(prev).length || length !== Object.getOwnPropertyNames(next).length || Object.getOwnPropertySymbols(next).length ) { @@ -276,57 +279,75 @@ export function replaceEqualDeep( } let i = 0 - let n: any + let child: any + let previous: any + let key: any - // Most calls find `next` deeply equal, so nothing is allocated while entries - // keep matching: scan up to the first difference, sharing equal children on - // the way. Arrays and objects get their own loop so that each keyed access - // only ever sees one kind of key. Only an object entry of `prev` can share - // anything; the recursive call returns `next`'s entry for `null` and for - // mismatched types. When the key counts differ, the scan still runs: every - // child it resolves is exactly what the copy below shares. if (array) { + // Entries before the first difference already resolve to prev. for (; i < length; i++) { - const p = prev[i] - n = next[i] - if (p !== n && typeof p === 'object') { - n = replaceEqualDeep(p, n, _nullProto, _depth + 1) - } - if (n !== p) break - } - } else { - for (; i < length; i++) { - const key = nextKeys[i]! - const p = prev[key] - n = next[key] - if (p !== n && typeof p === 'object') { - n = replaceEqualDeep(p, n, _nullProto, _depth + 1) - } - // Equal key counts can still hide a key that only `next` has (as `undefined`). - // The same key at the same position of both key lists proves it is `prev`'s - // own key; only reordered keys need the `hasOwn` lookup. - if (n !== p || (prevKeys[i] !== key && !hasOwn.call(prev, key))) { + key = i + previous = prev[key] + child = next[key] + child = + previous === child + ? previous + : typeof previous === 'object' + ? replaceEqualDeep(previous, child, _nullProto, _depth) + : child + if (child !== previous) { break } } + if (i === length && previousCount === length) { + return prev + } + } else { + let equal = previousCount === length + let unchanged = true + for (; i < length; i++) { + key = nextKeys[i]! + previous = prev[key] + const incoming = next[key] + child = + previous === incoming + ? previous + : typeof previous === 'object' + ? replaceEqualDeep(previous, incoming, _nullProto, _depth) + : incoming + equal &&= + child === previous && (prevKeys[i] === key || hasOwn.call(prev, key)) + unchanged &&= Object.is(child, incoming) + // This key has been checked; its private slot can hold the result. + prevKeys[i] = child + } + if (equal) { + return Object.getOwnPropertySymbols(prev).length ? next : prev + } + if (unchanged) { + return next + } } - // Everything in `next` matched and `prev` has no additional keys. - if (i === length && prevKeys.length === length) return prev - // Equality is ruled out from here on, so this loop only builds the result: - // the scanned prefix is shared from `prev`, entry `i` keeps the value the scan - // already computed, and the rest is resolved without any equality bookkeeping. - const copy: any = array ? [] : _nullProto ? Object.create(null) : {} + // Reuse the validated array key list; it is private and has the right length. + const copy: any = array ? nextKeys.fill(0) : _nullProto ? createNull() : {} for (let j = 0; j < length; j++) { - const key = array ? j : nextKeys[j]! - const p = prev[key] - if (j > i) { - n = next[key] - if (p !== n && typeof p === 'object') { - n = replaceEqualDeep(p, n, _nullProto, _depth + 1) + key = array ? j : nextKeys[j]! + if (array) { + previous = prev[key] + if (j > i) { + child = next[key] + child = + previous === child + ? previous + : typeof previous === 'object' + ? replaceEqualDeep(previous, child, _nullProto, _depth) + : child } + copy[key] = j < i ? previous : child + } else { + copy[key] = prevKeys[j] } - copy[key] = j < i ? p : n } return copy } @@ -335,14 +356,8 @@ export function isPlainObject(o: unknown): boolean { if (!o || typeof o !== 'object') { return false } - // Literals inherit `Object`; null-prototype records have no constructor at all. - if ((o.constructor ?? Object) === Object) { - return true - } - // An own `constructor` key (`?constructor=foo`) hides the inherited one, so - // only the prototype can tell such a record from a class instance. - const proto = Object.getPrototypeOf(o) - return proto === null || proto.constructor === Object + // An own constructor is data, so classify the actual prototype. + return (Object.getPrototypeOf(o)?.constructor ?? Object) === Object } /** diff --git a/packages/router-core/tests/replace-equal-deep.bench.ts b/packages/router-core/tests/replace-equal-deep.bench.ts index d6eac3279b..bfcf65feff 100644 --- a/packages/router-core/tests/replace-equal-deep.bench.ts +++ b/packages/router-core/tests/replace-equal-deep.bench.ts @@ -13,6 +13,14 @@ const emptyNull = createNull() const search = { tab: 'specs', page: 2, sort: 'newest', filter: 'available' } const searchCopy = { ...search } const searchChanged = { ...search, page: 3 } +// parseSearch and path extraction produce null-prototype records. Exercise +// these separately from ordinary selector objects: their property storage differs. +const nullSearch = Object.assign(createNull(), search) +const nullSearchCopy = Object.assign(createNull(), searchCopy) +const nullSearchChanged = Object.assign(createNull(), searchChanged) +const decimalRecord = { x: 0.5, y: 1.5, width: 640.5, height: 480.5 } +const decimalRecordCopy = { ...decimalRecord } +const decimalRecordChanged = { ...decimalRecord, x: 1.5 } // `?constructor=foo` decodes to an own `constructor` key on a null-proto record. const searchWithConstructorKey = Object.assign(createNull(), { constructor: 'foo', @@ -68,15 +76,76 @@ const wider = Object.fromEntries( Array.from({ length: 64 }, (_, index) => [`key${index}`, `value${index}`]), ) const widerChangedLast = { ...wider, key63: 'changed' } +const widerChangedFirst = { ...wider, key0: 'changed' } +const widerAllChanged = Object.fromEntries( + Object.keys(wider).map((key) => [key, 'changed']), +) +const widerSubset = Object.fromEntries(Object.entries(wider).slice(0, 8)) const numbers = Array.from({ length: 1024 }, (_, index) => index) const numbersCopy = [...numbers] const numbersChangedLast = numbers.map((n, index) => (index === 1023 ? -1 : n)) +const numbersChangedFirst = numbers.map((n, index) => (index === 0 ? -1 : n)) +const numbersChangedMiddle = numbers.map((n, index) => (index === 512 ? -1 : n)) +const numbersAllChanged = numbers.map((n) => -n - 1) +const numbersShorter = numbers.slice(0, 512) +const numbersLonger = [...numbers, undefined, undefined] +const smallNumbers = [1, 2, 3, 4] +const smallNumbersChanged = [9, 2, 3, 4] +const consumedNumbers = replaceEqualDeep(numbers, numbersChangedLast) +const longList = Array.from({ length: 1024 }, (_, id) => ({ id })) +const longListCopy = [...longList] +const longListClonedLast = [...longList] +longListClonedLast[1023] = { id: 1023 } +const longListChangedLast = [...longList] +longListChangedLast[1023] = { id: -1 } +const longListClonedThenChanged = [...longListChangedLast] +longListClonedThenChanged[1022] = { id: 1022 } +const numericCases = [ + ['fractional', Array.from({ length: 1024 }, (_, index) => index + 0.5)], + [ + 'large integer', + Array.from({ length: 1024 }, (_, index) => 2 ** 40 + index), + ], +] as const +const numericResults = numericCases.map(([name, prev]) => { + const next = [...prev] + next[1023] = -1.5 + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + return { name, prev, next, result } +}) +const mixedPairs: Array<[unknown, unknown]> = [ + [search, search], + [search, searchCopy], + [search, searchChanged], + [search, searchSubset], + [searchSubset, search], + [nested, nestedCopy], + [list, listChanged], + [list, listShared], + [smallNumbers, smallNumbersChanged], + [emptyNull, createNull()], + [searchWithConstructorKey, searchWithConstructorKeyCopy], +] expect(replaceEqualDeep(empty, {})).toBe(empty) expect(replaceEqualDeep(search, searchCopy)).toBe(search) expect(replaceEqualDeep(search, searchChanged)).toStrictEqual(searchChanged) +expect(nullReplaceEqualDeep(nullSearch, nullSearchCopy)).toBe(nullSearch) +expect(nullReplaceEqualDeep(nullSearch, searchCopy)).toBe(nullSearch) +expect(replaceEqualDeep(decimalRecord, decimalRecordCopy)).toBe(decimalRecord) +expect(replaceEqualDeep(decimalRecord, decimalRecordChanged)).toStrictEqual( + decimalRecordChanged, +) +expect(nullReplaceEqualDeep(nullSearch, nullSearchChanged)).toStrictEqual( + nullSearchChanged, +) expect(replaceEqualDeep(nested, nestedCopy)).toBe(nested) expect(replaceEqualDeep(nested, nestedLeafChanged).ids).toBe(nested.ids) +const nullNestedResult = nullReplaceEqualDeep(nested, nestedLeafChanged) +expect(nullNestedResult).toEqual(nestedLeafChanged) +expect(nullNestedResult.ids).toBe(nested.ids) +expect(Object.getPrototypeOf(nullNestedResult)).toBeNull() expect(replaceEqualDeep(list, listCopy)).toBe(list) expect(replaceEqualDeep(list, listChanged)[3]).toBe(list[3]) expect(replaceEqualDeep(wide, wideChanged)).toStrictEqual(wideChanged) @@ -90,7 +159,32 @@ expect(replaceEqualDeep(wider, widerChangedLast)).toStrictEqual( widerChangedLast, ) expect(replaceEqualDeep(numbers, numbersCopy)).toBe(numbers) +expect(replaceEqualDeep(longList, longListCopy)).toBe(longList) +expect(replaceEqualDeep(longList, longListClonedLast)).toBe(longList) +expect(replaceEqualDeep(longList, longListChangedLast)).toStrictEqual( + longListChangedLast, +) +const sharedLongList = replaceEqualDeep(longList, longListClonedThenChanged) +expect(sharedLongList).toStrictEqual(longListClonedThenChanged) +expect(sharedLongList[1022]).toBe(longList[1022]) +expect(replaceEqualDeep(widerSubset, wider)).toStrictEqual(wider) +expect(replaceEqualDeep(wider, widerChangedFirst)).toStrictEqual( + widerChangedFirst, +) +expect(replaceEqualDeep(wider, widerAllChanged)).toStrictEqual(widerAllChanged) expect(replaceEqualDeep(numbers, numbersChangedLast)[1023]).toBe(-1) +for (const [prev, next] of mixedPairs) { + expect(replaceEqualDeep(prev, next)).toStrictEqual(next) +} +for (const next of [ + numbersChangedFirst, + numbersChangedMiddle, + numbersAllChanged, + numbersShorter, + numbersLonger, +]) { + expect(replaceEqualDeep(numbers, next)).toStrictEqual(next) +} expect(nullReplaceEqualDeep(emptyNull, {})).toBe(emptyNull) expect( nullReplaceEqualDeep(searchWithConstructorKey, searchWithConstructorKeyCopy), @@ -164,6 +258,61 @@ describe('replaceEqualDeep', () => { } }) + bench('equal parsed null-proto search', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nullSearch, nullSearchCopy) + } + }) + + bench('equal ordinary search against a null-proto previous value', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nullSearch, searchCopy) + } + }) + + bench('parsed null-proto search with one changed leaf', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nullSearch, nullSearchChanged) + } + }) + + bench('ordinary search update in null-proto mode', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nullSearch, searchChanged) + } + }) + + bench('equal ordinary search in null-proto mode', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(search, searchCopy) + } + }) + + bench('successive ordinary search update in null-proto mode', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(search, searchChanged) + } + }) + + bench('changed selector followed by the same incoming reference', () => { + for (let i = 0; i < iterations; i++) { + const current = replaceEqualDeep(search, searchChanged) + sink = replaceEqualDeep(current, searchChanged) + } + }) + + bench('equal record with decimal values', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(decimalRecord, decimalRecordCopy) + } + }) + + bench('changed record with decimal values', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(decimalRecord, decimalRecordChanged) + } + }) + bench('equal nested search', () => { for (let i = 0; i < iterations; i++) { sink = replaceEqualDeep(nested, nestedCopy) @@ -176,6 +325,12 @@ describe('replaceEqualDeep', () => { } }) + bench('nested search sharing unchanged subtrees in null-proto mode', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nested, nestedLeafChanged) + } + }) + bench('equal array of objects', () => { for (let i = 0; i < iterations; i++) { sink = replaceEqualDeep(list, listCopy) @@ -230,6 +385,52 @@ describe('replaceEqualDeep', () => { } }) + bench('flat object growing from 8 to 64 keys', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(widerSubset, wider) + } + }) + + for (const [name, next] of [ + ['first leaf changed', widerChangedFirst], + ['all leaves changed', widerAllChanged], + ] as const) { + bench(`wider flat object (64 keys) with ${name}`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(wider, next) + } + }) + } + + bench('equal long array of shared objects', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(longList, longListCopy) + } + }) + + for (const [name, next] of [ + ['cloned but equal', longListClonedLast], + ['changed', longListChangedLast], + ['changed after a cloned but equal item', longListClonedThenChanged], + ] as const) { + bench(`long array of shared objects with the last item ${name}`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(longList, next) + } + }) + } + + for (const length of [0, 1, 4]) { + const prev = Array.from({ length }, (_, index) => index) + const next = [...prev] + expect(replaceEqualDeep(prev, next)).toBe(prev) + bench(`equal primitive array of length ${length}`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(prev, next) + } + }) + } + bench('equal long primitive array', () => { for (let i = 0; i < iterations; i++) { sink = replaceEqualDeep(numbers, numbersCopy) @@ -241,6 +442,77 @@ describe('replaceEqualDeep', () => { sink = replaceEqualDeep(numbers, numbersChangedLast) } }) + + for (const [name, next] of [ + ['first item changed', numbersChangedFirst], + ['middle item changed', numbersChangedMiddle], + ['all items changed', numbersAllChanged], + ['shortened', numbersShorter], + ['appended undefined values', numbersLonger], + ] as const) { + bench(`long primitive array with ${name}`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(numbers, next) + } + }) + } + + bench('small primitive array with the first item changed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(smallNumbers, smallNumbersChanged) + } + }) + + bench('mixed search and array updates', () => { + for (let i = 0; i < iterations; i++) { + const [prev, next] = mixedPairs[i % mixedPairs.length]! + sink = replaceEqualDeep(prev, next) + } + }) + + for (const { name, prev, next } of numericResults) { + bench(`long ${name} array with the last item changed`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(prev, next) + } + }) + } +}) + +describe('consume structurally shared arrays', () => { + bench('sum changed primitive array by index', () => { + for (let i = 0; i < iterations; i++) { + let sum = 0 + for (let j = 0; j < consumedNumbers.length; j++) { + sum += consumedNumbers[j]! + } + sink = sum + } + }) + + bench('reduce changed primitive array', () => { + for (let i = 0; i < iterations; i++) { + sink = consumedNumbers.reduce((sum, value) => sum + value, 0) + } + }) + + for (const { name, result } of numericResults) { + bench(`sum changed ${name} array by index`, () => { + for (let i = 0; i < iterations; i++) { + let sum = 0 + for (let j = 0; j < result.length; j++) { + sum += result[j]! + } + sink = sum + } + }) + + bench(`reduce changed ${name} array`, () => { + for (let i = 0; i < iterations; i++) { + sink = result.reduce((sum, value) => sum + value, 0) + } + }) + } }) describe('deepEqual', () => { diff --git a/packages/router-core/tests/utils.test.ts b/packages/router-core/tests/utils.test.ts index 407abd7953..baeb751e8f 100644 --- a/packages/router-core/tests/utils.test.ts +++ b/packages/router-core/tests/utils.test.ts @@ -13,6 +13,226 @@ import { import { decode } from '../src/qss' describe('replaceEqualDeep', () => { + it('reuses the next object when its children need no replacements', () => { + const shared = Object.freeze({ id: 1 }) + const prev = Object.freeze({ shared, page: 1 }) + const next = Object.freeze({ shared, page: 2 }) + + expect(replaceEqualDeep(prev, next)).toBe(next) + }) + + it('reuses a changed null-prototype search record', () => { + const prev = decode('page=1&sort=newest') + const next = decode('page=2&sort=newest') + + expect(nullReplaceEqualDeep(prev, next)).toBe(next) + }) + + it('reuses a changed ordinary object in null-prototype mode', () => { + const prev = decode('page=1&sort=newest') + const next = { page: '2', sort: 'newest' } + const result = nullReplaceEqualDeep(prev, next) + + expect(result).toBe(next) + expect(Object.getPrototypeOf(result)).toBe(Object.prototype) + }) + + it('returns the previous signed zero when strict equality matches', () => { + expect(replaceEqualDeep(-0, 0)).toBe(-0) + expect(replaceEqualDeep(0, -0)).toBe(0) + }) + + it.each([false, true])( + 'uses the same signed-zero sharing rule for every child (nullProto=%s)', + (nullProto) => { + const prev = { first: -0, changed: 1, last: -0 } + const next = { first: 0, changed: 2, last: 0 } + const result = replaceEqualDeep(prev, next, nullProto) + expect(result).not.toBe(next) + expect(Object.getPrototypeOf(result)).toBe( + nullProto ? null : Object.prototype, + ) + expect(result.first).toBe(-0) + expect(result.changed).toBe(2) + expect(result.last).toBe(-0) + expect(replaceEqualDeep([-0, 1, -0], [0, 2, 0], nullProto)).toStrictEqual( + [-0, 2, -0], + ) + }, + ) + + // Known unsupported edge case for ordinary object copies. + it.skip('copies an own __proto__ property as data in the incoming key order', () => { + const prev = JSON.parse('{"first":1,"__proto__":{"shared":1},"last":1}') + const next = JSON.parse('{"first":2,"__proto__":{"shared":1},"last":1}') + const result = replaceEqualDeep(prev, next) + expect(Object.getPrototypeOf(result)).toBe(Object.prototype) + expect(hasOwn.call(result, '__proto__')).toBe(true) + expect(result.__proto__).toBe(prev.__proto__) + expect(Object.keys(result)).toEqual(Object.keys(next)) + expect(result).toStrictEqual(next) + }) + + it.skip.each([undefined, { shared: 1 }])( + 'preserves a newly added own __proto__ property with value %j', + (value) => { + const prev = { first: 1, last: 1 } + const next = { first: 1, ['__proto__']: value, last: 1 } + const result = replaceEqualDeep(prev, next) + expect(Object.getPrototypeOf(result)).toBe(Object.prototype) + expect(hasOwn.call(result, '__proto__')).toBe(true) + expect(result.__proto__).toBe(value) + expect(Object.keys(result)).toEqual(Object.keys(next)) + expect(result).toStrictEqual(next) + }, + ) + + it('shares children without changing recursively frozen inputs', () => { + const prev = Object.freeze({ + items: Object.freeze([ + Object.freeze({ id: 1 }), + Object.freeze({ id: 2 }), + ]), + page: 1, + }) + const next = Object.freeze({ + items: Object.freeze([ + Object.freeze({ id: 1 }), + Object.freeze({ id: 3 }), + ]), + page: 2, + }) + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result.items[0]).toBe(prev.items[0]) + expect(next.items[0]).not.toBe(prev.items[0]) + expect(prev.items[1]?.id).toBe(2) + expect(next.items[1]?.id).toBe(3) + }) + + it('preserves special numbers and explicit undefined in changed frozen arrays', () => { + const prev = Object.freeze([-0, NaN, Infinity, 2 ** 40, 1.5, undefined, 1]) + const next = Object.freeze([0, NaN, Infinity, 2 ** 40, 1.5, undefined, 2]) + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual([ + -0, + NaN, + Infinity, + 2 ** 40, + 1.5, + undefined, + 2, + ]) + expect(hasOwn.call(result, 5)).toBe(true) + expect(next[0]).toBe(0) + expect(prev[6]).toBe(1) + }) + + it('ignores auxiliary array metadata without using its constructor or iterator', () => { + const fail = () => { + throw new Error('array metadata must not be invoked') + } + const decorate = (values: Array) => + Object.freeze( + Object.defineProperties(values, { + metadata: { value: 'ignored' }, + constructor: { value: { [Symbol.species]: fail } }, + [Symbol.iterator]: { value: fail }, + }), + ) + const child = Object.freeze({ id: 1 }) + const prev = decorate([child, 1]) + const equal = decorate([{ id: 1 }, 1]) + const next = decorate([{ id: 1 }, 2]) + + expect(replaceEqualDeep(prev, equal)).toBe(prev) + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual([child, 2]) + expect(result[0]).toBe(child) + expect(Object.keys(result)).toEqual(['0', '1']) + expect(Object.getOwnPropertySymbols(result)).toEqual([]) + expect(prev[1]).toBe(1) + expect(next[0]).not.toBe(child) + }) + + it.each(['prev', 'next'])( + 'preserves incoming values with a non-enumerable array index on %s', + (side) => { + const prev = [{ id: 1 }, 1] + const next = [{ id: 1 }, 2] + Object.defineProperty(side === 'prev' ? prev : next, '1', { + enumerable: false, + }) + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(Object.getOwnPropertyDescriptor(result, '1')?.enumerable).toBe( + Object.getOwnPropertyDescriptor(next, '1')?.enumerable, + ) + }, + ) + + it('does not consider separate NaN children strictly equal', () => { + const prev = { value: NaN } + const next = { value: NaN } + const result = replaceEqualDeep(prev, next) + expect(result).not.toBe(prev) + expect(result).toStrictEqual(next) + }) + + it.each([0, 1, 8, 16])( + 'resolves deeply equal children after %i identical array entries', + (length) => { + const prefix = Array.from({ length }, (_, index) => index) + const shared = { child: { value: 1 } } + const prev = [...prefix, shared, { version: 1 }] + const equal = [...prefix, { child: { value: 1 } }, { version: 1 }] + expect(replaceEqualDeep(prev, equal)).toBe(prev) + + const next = [...prefix, { child: { value: 1 } }, { version: 2 }] + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result).not.toBe(prev) + expect(result).not.toBe(next) + expect(result[length]).toBe(shared) + }, + ) + + it('bounds recursion for cyclic records', () => { + const prev: any = { value: 1 } + const next: any = { value: 2 } + prev.self = prev + next.self = next + const result = replaceEqualDeep(prev, next) + expect(result.value).toBe(2) + expect(result.self).toBe(next) + }) + + it.each([0, 1])( + 'bounds recursion for cyclic arrays with %s preceding values', + (index) => { + const prev: Array = index ? [1] : [] + const next: Array = index ? [2] : [] + prev.push(prev) + next.push(next) + const result = replaceEqualDeep(prev, next) + let tail = result + for (let i = 0; i < 1000 && tail !== next; i++) { + tail = tail[index] + } + expect(tail).toBe(next) + if (index) { + expect(result[0]).toBe(2) + } + expect(prev[index]).toBe(prev) + expect(next[index]).toBe(next) + }, + ) + + it('preserves identity even when the recursion budget is exhausted', () => { + const value = [{ id: 1 }] + expect(replaceEqualDeep(value, value, false, 10_000)).toBe(value) + }) + it('should return the same object if the input objects are equal', () => { const obj = { a: 1, b: 2 } const result = replaceEqualDeep(obj, obj) @@ -138,7 +358,6 @@ describe('replaceEqualDeep', () => { const result = replaceEqualDeep(prev, next) expect(result).toEqual(next) expect(result).not.toBe(prev) - expect(result).not.toBe(next) }) it('should return a copy when the previous value is a different array superset', () => { @@ -147,7 +366,6 @@ describe('replaceEqualDeep', () => { const result = replaceEqualDeep(prev, next) expect(result).toEqual(next) expect(result).not.toBe(prev) - expect(result).not.toBe(next) }) it('should return the previous value when the next value is an equal empty array', () => { @@ -188,7 +406,6 @@ describe('replaceEqualDeep', () => { expect(result).not.toBe(next) expect(result[0]).toBe(prev[0]) expect(result[1]).toBe(prev[1]) - expect(result[2]).not.toBe(next[2]) expect(result[2].b.b).toBe(next[2].b.b) expect(result[3]).toBe(prev[3]) }) @@ -267,6 +484,13 @@ describe('replaceEqualDeep', () => { expect(replaceEqualDeep([1, undefined], next)).toBe(next) }) + it('does not reuse a sparse previous array with a compensating extra key', () => { + const prev = Object.assign([1, ,], { extra: 'old' }) + const next = [1, undefined] + expect(Object.keys(prev)).toHaveLength(prev.length) + expect(replaceEqualDeep(prev, next)).toBe(next) + }) + it('still shares dense arrays', () => { const prev = [1, 2, undefined] expect(replaceEqualDeep(prev, [1, 2, undefined])).toBe(prev) @@ -295,7 +519,6 @@ describe('replaceEqualDeep', () => { expect(result.todo).not.toBe(next.todo) expect(result.todo.id).toBe(next.todo.id) expect(result.todo.meta).toBe(prev.todo.meta) - expect(result.todo.state).not.toBe(next.todo.state) expect(result.todo.state.done).toBe(next.todo.state.done) expect(result.otherTodo).toBe(prev.otherTodo) }) @@ -323,7 +546,6 @@ describe('replaceEqualDeep', () => { expect(result.todos[0]).not.toBe(next.todos[0]) expect(result.todos[0]?.id).toBe(next.todos[0]?.id) expect(result.todos[0]?.meta).toBe(prev.todos[0]?.meta) - expect(result.todos[0]?.state).not.toBe(next.todos[0]?.state) expect(result.todos[0]?.state.done).toBe(next.todos[0]?.state.done) expect(result.todos[1]).toBe(prev.todos[1]) }) @@ -372,9 +594,7 @@ describe('replaceEqualDeep', () => { expect(replaceEqualDeep(current, next)).toEqual(next) }) - // The copy is only allocated at the first difference; everything compared - // before that point has to be carried over from `prev`. - describe('lazy copy', () => { + describe('sharing children in changed containers', () => { it('keeps earlier equal entries, including explicit undefined, when a later key differs', () => { const prev = { a: { x: 1 }, b: undefined, c: 1 } const next = { a: { x: 1 }, b: undefined, c: 2 } @@ -410,7 +630,6 @@ describe('replaceEqualDeep', () => { const result = replaceEqualDeep(prev, next) expect(result).toStrictEqual(next) expect(result).not.toBe(prev) - expect(result).not.toBe(next) }) it('returns a longer array when next appends an explicit undefined', () => { @@ -420,7 +639,6 @@ describe('replaceEqualDeep', () => { expect(result).toStrictEqual(next) expect(result).toHaveLength(2) expect(result).not.toBe(prev) - expect(result).not.toBe(next) }) it('shares equal array entries before and after the first difference', () => { @@ -434,9 +652,20 @@ describe('replaceEqualDeep', () => { }) }) - // The scan stops at the first difference; everything after it is resolved by - // the copy loop, which must share and recurse exactly like the scan does. - describe('split-phase copy', () => { + describe('changed keys and recursive sharing', () => { + it('copies an empty array after a nonempty array', () => { + const prev = [1] + const result = replaceEqualDeep(prev, []) + expect(result).toStrictEqual([]) + expect(result).not.toBe(prev) + }) + + it('appends multiple explicit undefined array entries', () => { + const result = replaceEqualDeep([1], [1, undefined, undefined]) + expect(result).toStrictEqual([1, undefined, undefined]) + expect(hasOwn.call(result, 1)).toBe(true) + expect(hasOwn.call(result, 2)).toBe(true) + }) it('returns prev for equal objects whose keys are ordered differently', () => { const prev = { a: 1, b: { x: 1 }, c: 3 } const next = { c: 3, a: 1, b: { x: 1 } } @@ -449,7 +678,6 @@ describe('replaceEqualDeep', () => { const result = replaceEqualDeep(prev, next) expect(result).toStrictEqual(next) expect(result).not.toBe(prev) - expect(result).not.toBe(next) expect('c' in result).toBe(true) expect('a' in result).toBe(false) }) @@ -562,34 +790,62 @@ describe('replaceEqualDeep', () => { }) describe('nullReplaceEqualDeep', () => { + it('keeps a shared array prefix and reuses unchanged child results', () => { + const shared = { id: 1 } + const prev = [shared, { id: 2 }] + const next = [shared, { id: 3 }] + const result = nullReplaceEqualDeep(prev, next) + expect(Array.isArray(result)).toBe(true) + expect(result[0]).toBe(shared) + expect(Object.getPrototypeOf(result[0])).toBe(Object.prototype) + expect(result[1]).toBe(next[1]) + expect(Object.getPrototypeOf(result[1])).toBe(Object.prototype) + }) + it('creates null-prototype copies on the first difference', () => { - const result = nullReplaceEqualDeep({ a: 1, b: 2 }, { a: 1, b: 3 }) + const prev = { a: { x: 1 }, b: 2 } + const result = nullReplaceEqualDeep(prev, { a: { x: 1 }, b: 3 }) expect(Object.getPrototypeOf(result)).toBeNull() - expect(result.a).toBe(1) + expect(result.a).toBe(prev.a) expect(result.b).toBe(3) }) it('creates null-prototype copies when only the key sets differ', () => { - const result = nullReplaceEqualDeep({ a: 1 }, { a: 1, b: undefined }) + const prev = { a: { x: 1 } } + const result = nullReplaceEqualDeep(prev, { a: { x: 1 }, b: undefined }) expect(Object.getPrototypeOf(result)).toBeNull() - expect(result.a).toBe(1) + expect(result.a).toBe(prev.a) expect('b' in result).toBe(true) }) - it('creates null-prototype copies for nested objects', () => { + it('reuses a changed child when only the root needs a null-prototype copy', () => { const prev = { shared: { x: 1 }, changed: { y: 1 } } - const result = nullReplaceEqualDeep(prev, { - shared: { x: 1 }, - changed: { y: 2 }, - }) + const next = { shared: { x: 1 }, changed: { y: 2 } } + const result = nullReplaceEqualDeep(prev, next) expect(Object.getPrototypeOf(result)).toBeNull() - expect(Object.getPrototypeOf(result.changed)).toBeNull() + expect(result.changed).toBe(next.changed) expect(result.shared).toBe(prev.shared) }) + it('creates null-prototype copies at every level that needs replacements', () => { + const prev = { outer: { shared: { id: 1 }, page: 1 } } + const next = { outer: { shared: { id: 1 }, page: 2 } } + const result = nullReplaceEqualDeep(prev, next) + expect(Object.getPrototypeOf(result)).toBeNull() + expect(Object.getPrototypeOf(result.outer)).toBeNull() + expect(result.outer.shared).toBe(prev.outer.shared) + expect(result.outer.page).toBe(2) + expect(prev).toStrictEqual({ outer: { shared: { id: 1 }, page: 1 } }) + expect(next).toStrictEqual({ outer: { shared: { id: 1 }, page: 2 } }) + }) + it('stores an own __proto__ key instead of changing the prototype', () => { - const next = JSON.parse('{"__proto__":{"isAdmin":true},"name":"Alice"}') - const result = nullReplaceEqualDeep({ name: 'Bob' }, next) + const prev = { name: 'Bob', shared: { id: 1 } } + const next = JSON.parse( + '{"__proto__":{"isAdmin":true},"name":"Alice","shared":{"id":1}}', + ) + const result = nullReplaceEqualDeep(prev, next) + expect(result.shared).toBe(prev.shared) expect(Object.getPrototypeOf(result)).toBeNull() expect(hasOwn.call(result, '__proto__')).toBe(true) expect(result['__proto__']).toEqual({ isAdmin: true }) @@ -604,6 +860,36 @@ describe('nullReplaceEqualDeep', () => { }) describe('isPlainObject', () => { + it.each([ + [ + 'null-prototype record', + Object.assign(Object.create(null), { inherited: 1 }), + ], + ['null constructor', { constructor: null }], + ['undefined constructor', { constructor: undefined }], + ])('shares records inheriting from a %s', (_name, proto) => { + const prev = Object.assign(Object.create(proto), { + child: { id: 1 }, + page: 1, + }) + const equal = Object.assign(Object.create(proto), { + child: { id: 1 }, + page: 1, + }) + const next = Object.assign(Object.create(proto), { + child: { id: 1 }, + page: 2, + }) + + expect(isPlainObject(prev)).toBe(true) + expect(deepEqual(prev, equal)).toBe(true) + expect(replaceEqualDeep(prev, equal)).toBe(prev) + const result = replaceEqualDeep(prev, next) + expect(result.child).toBe(prev.child) + expect(result.page).toBe(2) + expect(Object.keys(result)).toEqual(['child', 'page']) + }) + it.each([ ['object literal', {}], ['object literal with keys', { a: 1 }], @@ -725,6 +1011,23 @@ describe('isPlainObject', () => { expect(deepEqual({ foo: prev }, { foo: prev })).toBe(true) }) + it.each([null, undefined])( + 'keeps built-ins opaque with an own constructor valued %s', + (constructor) => { + for (const [prev, next] of [ + [new Date(0), new Date(1)], + [new Map([['value', 0]]), new Map([['value', 1]])], + [/before/, /after/], + ]) { + Object.assign(prev!, { constructor }) + Object.assign(next!, { constructor }) + expect(isPlainObject(prev)).toBe(false) + expect(deepEqual(prev, next)).toBe(false) + expect(replaceEqualDeep(prev, next)).toBe(next) + } + }, + ) + it('treats null-prototype and literal objects alike', () => { const nullProto = Object.assign(Object.create(null), { a: 1 }) expect(deepEqual(nullProto, { a: 1 })).toBe(true) @@ -1112,11 +1415,80 @@ describe('key handling (via replaceEqualDeep)', () => { }) it('does not share a symbol-keyed prev when next has no symbols', () => { - // Only `next` is checked for symbols; a former `next` returned as-is is the usual prev. const sym = Symbol('test') const prev = { a: 1, [sym]: 1 } const next = { a: 1 } - expect(replaceEqualDeep(prev, next)).toBe(prev) + expect(replaceEqualDeep(prev, next)).toBe(next) + }) + + it('removes a previous non-enumerable symbol', () => { + const sym = Symbol('hidden') + const prev = Object.defineProperty({ a: 1 }, sym, { value: 'old' }) + const next = { a: 1 } + expect(replaceEqualDeep(prev, next)).toBe(next) + }) + + it.each(['first', 'last'])( + 'removes nested symbols in the %s entry', + (position) => { + const sym = Symbol('metadata') + const removed = { a: 1, [sym]: 'old' } + const shared = { b: 2 } + const prev = + position === 'first' + ? { removed, shared, changed: 0 } + : { changed: 0, shared, removed } + const next = + position === 'first' + ? { removed: { a: 1 }, shared: { b: 2 }, changed: 1 } + : { changed: 1, shared: { b: 2 }, removed: { a: 1 } } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(result.removed).toBe(next.removed) + expect(result.shared).toBe(shared) + }, + ) + + it('removes symbols by reusing a null-prototype next object', () => { + const sym = Symbol('metadata') + const prev = Object.assign(Object.create(null), { a: 1, [sym]: 'old' }) + const next = Object.assign(Object.create(null), { a: 1 }) + expect(nullReplaceEqualDeep(prev, next)).toBe(next) + }) + + it('preserves incoming values when previous symbols exist in null-prototype mode', () => { + const sym = Symbol('metadata') + const prev = { child: { a: 1 }, page: 1, [sym]: 'old' } + const next = { child: { a: 1 }, page: 2 } + const result = nullReplaceEqualDeep(prev, next) + expect({ ...result }).toStrictEqual(next) + expect(Object.getOwnPropertySymbols(result)).toEqual([]) + expect(result.page).toBe(2) + }) + + it('keeps an opaque next object unchanged in null-prototype mode', () => { + const next = { child: { a: 1 }, [Symbol('metadata')]: 'kept' } + const result = nullReplaceEqualDeep({ child: { a: 1 } }, next) + expect(result).toBe(next) + expect(Object.getPrototypeOf(result)).toBe(Object.prototype) + }) + + it('preserves incoming values when previous symbols accompany changed string keys', () => { + const sym = Symbol('metadata') + const prev = { changed: 0, child: { a: 1 }, [sym]: 'old' } + const next = { changed: 1, child: { a: 1 } } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(prev[sym]).toBe('old') + }) + + it('preserves incoming values when previous symbols accompany removed string keys', () => { + const sym = Symbol('metadata') + const prev = { removed: 0, child: { a: 1 }, [sym]: 'old' } + const next = { child: { a: 1 } } + const result = replaceEqualDeep(prev, next) + expect(result).toStrictEqual(next) + expect(prev[sym]).toBe('old') }) }) From 84bde660a12d82e8c74859b3240157af7566f843 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2026 23:34:45 +0200 Subject: [PATCH 049/175] ci: Version Packages (#8457) ci: changeset release Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/brave-keys-count.md | 5 - .changeset/calm-symbols-pass.md | 5 - .changeset/poor-tires-tan.md | 7 -- .changeset/quiet-owls-share.md | 5 - .changeset/split-phase-sharing.md | 5 - .../package.json | 4 +- .../react/authenticated-routes/package.json | 4 +- .../basic-default-search-params/package.json | 2 +- .../react/basic-devtools-panel/package.json | 2 +- examples/react/basic-file-based/package.json | 4 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-react-query-file-based/package.json | 4 +- examples/react/basic-react-query/package.json | 2 +- .../react/basic-ssr-file-based/package.json | 4 +- .../package.json | 4 +- .../basic-virtual-file-based/package.json | 4 +- .../package.json | 4 +- examples/react/basic/package.json | 2 +- examples/react/deferred-data/package.json | 2 +- examples/react/i18n-paraglide/package.json | 4 +- .../kitchen-sink-file-based/package.json | 4 +- .../package.json | 4 +- .../kitchen-sink-react-query/package.json | 2 +- examples/react/kitchen-sink/package.json | 2 +- examples/react/large-file-based/package.json | 4 +- examples/react/location-masking/package.json | 2 +- .../react/navigation-blocking/package.json | 2 +- .../package.json | 4 +- .../react/quickstart-file-based/package.json | 4 +- .../quickstart-rspack-file-based/package.json | 4 +- .../package.json | 4 +- examples/react/quickstart/package.json | 2 +- .../router-monorepo-react-query/package.json | 4 +- .../packages/router/package.json | 4 +- .../router-monorepo-simple-lazy/package.json | 4 +- .../packages/router/package.json | 4 +- .../react/router-monorepo-simple/package.json | 4 +- .../packages/router/package.json | 4 +- .../react/scroll-restoration/package.json | 2 +- .../search-validator-adapters/package.json | 4 +- examples/react/start-bare/package.json | 4 +- examples/react/start-basic-auth/package.json | 4 +- .../react/start-basic-authjs/package.json | 4 +- .../react/start-basic-cloudflare/package.json | 4 +- .../start-basic-react-query/package.json | 4 +- .../react/start-basic-rsbuild/package.json | 4 +- .../react/start-basic-static/package.json | 6 +- examples/react/start-basic/package.json | 4 +- examples/react/start-bun/package.json | 6 +- examples/react/start-clerk-basic/package.json | 4 +- .../react/start-convex-trellaux/package.json | 4 +- examples/react/start-counter/package.json | 4 +- .../react/start-i18n-paraglide/package.json | 4 +- examples/react/start-large/package.json | 4 +- examples/react/start-material-ui/package.json | 4 +- .../react/start-next-migration/package.json | 4 +- examples/react/start-rscs/package.json | 4 +- .../package.json | 4 +- .../react/start-supabase-basic/package.json | 4 +- examples/react/start-tailwind-v4/package.json | 4 +- examples/react/start-trellaux/package.json | 4 +- examples/react/start-workos/package.json | 4 +- examples/react/view-transitions/package.json | 4 +- .../react/with-framer-motion/package.json | 2 +- .../react/with-trpc-react-query/package.json | 4 +- examples/react/with-trpc/package.json | 4 +- .../package.json | 4 +- .../solid/authenticated-routes/package.json | 4 +- .../basic-default-search-params/package.json | 2 +- .../solid/basic-devtools-panel/package.json | 2 +- examples/solid/basic-file-based/package.json | 4 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-solid-query-file-based/package.json | 4 +- examples/solid/basic-solid-query/package.json | 4 +- .../solid/basic-ssr-file-based/package.json | 4 +- .../package.json | 4 +- .../basic-virtual-file-based/package.json | 4 +- .../package.json | 4 +- examples/solid/basic/package.json | 2 +- examples/solid/deferred-data/package.json | 2 +- examples/solid/i18n-paraglide/package.json | 4 +- .../kitchen-sink-file-based/package.json | 4 +- .../package.json | 4 +- .../kitchen-sink-solid-query/package.json | 2 +- examples/solid/kitchen-sink/package.json | 2 +- examples/solid/large-file-based/package.json | 4 +- examples/solid/location-masking/package.json | 2 +- .../solid/navigation-blocking/package.json | 2 +- .../package.json | 4 +- .../solid/quickstart-file-based/package.json | 4 +- .../quickstart-rspack-file-based/package.json | 4 +- .../package.json | 4 +- examples/solid/quickstart/package.json | 2 +- .../router-monorepo-simple-lazy/package.json | 4 +- .../packages/router/package.json | 4 +- .../solid/router-monorepo-simple/package.json | 4 +- .../packages/router/package.json | 4 +- .../router-monorepo-solid-query/package.json | 4 +- .../packages/router/package.json | 4 +- .../solid/scroll-restoration/package.json | 2 +- .../search-validator-adapters/package.json | 4 +- examples/solid/start-basic-auth/package.json | 4 +- .../solid/start-basic-authjs/package.json | 4 +- .../solid/start-basic-cloudflare/package.json | 4 +- .../solid/start-basic-netlify/package.json | 4 +- examples/solid/start-basic-nitro/package.json | 4 +- .../start-basic-solid-query/package.json | 4 +- .../solid/start-basic-static/package.json | 6 +- examples/solid/start-basic/package.json | 4 +- examples/solid/start-bun/package.json | 6 +- .../start-convex-better-auth/package.json | 4 +- examples/solid/start-counter/package.json | 4 +- .../solid/start-i18n-paraglide/package.json | 4 +- examples/solid/start-large/package.json | 4 +- .../package.json | 4 +- .../solid/start-supabase-basic/package.json | 4 +- examples/solid/start-tailwind-v4/package.json | 4 +- examples/solid/view-transitions/package.json | 4 +- .../solid/with-framer-motion/package.json | 2 +- examples/solid/with-trpc/package.json | 4 +- .../vue/basic-file-based-jsx/package.json | 4 +- .../vue/basic-file-based-sfc/package.json | 4 +- examples/vue/basic/package.json | 2 +- packages/react-router/CHANGELOG.md | 7 ++ packages/react-router/package.json | 2 +- packages/react-start-client/CHANGELOG.md | 9 ++ packages/react-start-client/package.json | 2 +- packages/react-start-rsc/CHANGELOG.md | 11 ++ packages/react-start-rsc/package.json | 2 +- packages/react-start-server/CHANGELOG.md | 9 ++ packages/react-start-server/package.json | 2 +- packages/react-start/CHANGELOG.md | 13 +++ packages/react-start/package.json | 2 +- packages/router-cli/CHANGELOG.md | 7 ++ packages/router-cli/package.json | 2 +- packages/router-core/CHANGELOG.md | 16 +++ packages/router-core/package.json | 2 +- packages/router-generator/CHANGELOG.md | 7 ++ packages/router-generator/package.json | 2 +- packages/router-plugin/CHANGELOG.md | 9 ++ packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/CHANGELOG.md | 7 ++ packages/router-vite-plugin/package.json | 2 +- packages/solid-router/CHANGELOG.md | 7 ++ packages/solid-router/package.json | 2 +- packages/solid-start-client/CHANGELOG.md | 9 ++ packages/solid-start-client/package.json | 2 +- packages/solid-start-server/CHANGELOG.md | 9 ++ packages/solid-start-server/package.json | 2 +- packages/solid-start/CHANGELOG.md | 12 +++ packages/solid-start/package.json | 2 +- packages/start-client-core/CHANGELOG.md | 8 ++ packages/start-client-core/package.json | 2 +- packages/start-plugin-core/CHANGELOG.md | 10 ++ packages/start-plugin-core/package.json | 2 +- packages/start-server-core/CHANGELOG.md | 9 ++ packages/start-server-core/package.json | 2 +- .../CHANGELOG.md | 9 ++ .../package.json | 2 +- packages/start-storage-context/CHANGELOG.md | 7 ++ packages/start-storage-context/package.json | 2 +- packages/vue-router/CHANGELOG.md | 7 ++ packages/vue-router/package.json | 2 +- packages/vue-start-client/CHANGELOG.md | 9 ++ packages/vue-start-client/package.json | 2 +- packages/vue-start-server/CHANGELOG.md | 9 ++ packages/vue-start-server/package.json | 2 +- packages/vue-start/CHANGELOG.md | 12 +++ packages/vue-start/package.json | 2 +- pnpm-lock.yaml | 102 +++++++++--------- 170 files changed, 500 insertions(+), 315 deletions(-) delete mode 100644 .changeset/brave-keys-count.md delete mode 100644 .changeset/calm-symbols-pass.md delete mode 100644 .changeset/poor-tires-tan.md delete mode 100644 .changeset/quiet-owls-share.md delete mode 100644 .changeset/split-phase-sharing.md diff --git a/.changeset/brave-keys-count.md b/.changeset/brave-keys-count.md deleted file mode 100644 index be6595920a..0000000000 --- a/.changeset/brave-keys-count.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Detect plain objects by constructor instead of `Object.prototype.toString` dispatches in `isPlainObject`, which gates every `deepEqual` and `replaceEqualDeep` recursion step. Object literals, `JSON.parse` output and null-prototype objects are still plain; objects from another realm no longer are. Records with an own `constructor` key (for example the search params of `?constructor=foo`) fall back to a prototype check, so they keep structural sharing while class instances stay opaque. diff --git a/.changeset/calm-symbols-pass.md b/.changeset/calm-symbols-pass.md deleted file mode 100644 index 239cb5792f..0000000000 --- a/.changeset/calm-symbols-pass.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Compare and copy plain objects in `replaceEqualDeep` by their string keys only, skipping the symbol-key lookup that dominated key enumeration. Objects with non-enumerable own properties, or symbol keys on the incoming value, now pass through untouched instead of being structurally shared. diff --git a/.changeset/poor-tires-tan.md b/.changeset/poor-tires-tan.md deleted file mode 100644 index f230c6a400..0000000000 --- a/.changeset/poor-tires-tan.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Reduce structural-sharing allocations by reusing array key storage and returning incoming objects when their children need no replacements. Preserve signed zero consistently, remove stale symbol properties, and keep sparse arrays with extra keys and built-ins with an own `constructor` opaque. - -Null-prototype mode now applies only when constructing a copy; existing incoming objects can be reused with their original prototype. diff --git a/.changeset/quiet-owls-share.md b/.changeset/quiet-owls-share.md deleted file mode 100644 index 320b507a1d..0000000000 --- a/.changeset/quiet-owls-share.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Allocate the `replaceEqualDeep` result only at the first difference, so structural sharing of search, params, state and loader data no longer allocates when the new value is deeply equal to the previous one. diff --git a/.changeset/split-phase-sharing.md b/.changeset/split-phase-sharing.md deleted file mode 100644 index 3bed92f275..0000000000 --- a/.changeset/split-phase-sharing.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Split `replaceEqualDeep` into an equality scan and a copy phase: arrays and objects are scanned by dedicated loops up to the first difference, matching keys prove ownership without a `hasOwnProperty` lookup, and once a difference is found the result is built without any further equality bookkeeping. Deeply equal search, params, state and loader data are recognised faster and changed values are copied with less work per entry. diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index d976b0c7e3..5a2dd24144 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "firebase": "^11.4.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index c077be36b0..ac4c79626d 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 51fc7c86b3..c09f5a4e42 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 50c655a05e..01127e38ee 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.67.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 2e02ffbb3b..32597ca25d 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 8979c76193..5cd3457922 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index f25afc6a8e..2a4148c136 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 8a588013ca..b314bfc5c4 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.json index dea344cf1a..19c34de508 100644 --- a/examples/react/basic-ssr-file-based/package.json +++ b/examples/react/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/react-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.40", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/react/basic-ssr-streaming-file-based/package.json b/examples/react/basic-ssr-streaming-file-based/package.json index d7224d70a2..190f226f66 100644 --- a/examples/react/basic-ssr-streaming-file-based/package.json +++ b/examples/react/basic-ssr-streaming-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/react-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.40", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 3f8c3643b7..681a77c011 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 9c782eb325..5b739b829f 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index ee017a9a77..501c432f16 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 0d496b77d4..35f3af4399 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/i18n-paraglide/package.json b/examples/react/i18n-paraglide/package.json index b99e11aadb..fac0be9548 100644 --- a/examples/react/i18n-paraglide/package.json +++ b/examples/react/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/react-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index a1b4bb4106..f1992c0157 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 635a9de0c7..40f1866e31 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 0c160fbeef..92ae795961 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 8cce0bff68..23b489366a 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index d4a658c4a0..32f14c0d79 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -13,9 +13,9 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 6df24fc7d2..5d755394f1 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -12,7 +12,7 @@ "@radix-ui/react-dialog": "^1.1.6", "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 474d2cdb73..ae9bac9a06 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index c9fdf9e717..7fd805bce2 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 300ed4563a..732790fb1c 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 196602eed6..12df148bf3 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "postcss": "^8.5.1", "react": "^19.0.0", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 593537bda4..83438e8eb5 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.15.33", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index f072fe41f2..c159029401 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 63efa0911e..52f15cd866 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index f44675b9a8..6806a7961c 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -11,8 +11,8 @@ "@router-mono-react-query/post-query": "workspace:*", "@tanstack/history": "^1.162.4", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/react-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index e1e66f2bad..1ac497e230 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index f70831c7ce..e9ed02c574 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/react-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 997278f85a..78c38fa25c 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 350f7769d4..926f2b1db3 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/react-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 496af5938b..dfd65f61b2 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-virtual": "^3.13.0", "react": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 072d8d0a49..5ec3a48650 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 49ac42324b..ce3a89fd68 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "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 bf647cfae1..72710a9d50 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index a706679fe8..5332a96d16 100644 --- a/examples/react/start-basic-authjs/package.json +++ b/examples/react/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "react": "^19.0.0", "react-dom": "^19.0.0", "start-authjs": "^1.0.0", diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index 50216ee6d9..0c96dd0ca9 100644 --- a/examples/react/start-basic-cloudflare/package.json +++ b/examples/react/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 0e89d3d820..daf7c83170 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -13,10 +13,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json index 110ff9afc8..ff6f97a1a4 100644 --- a/examples/react/start-basic-rsbuild/package.json +++ b/examples/react/start-basic-rsbuild/package.json @@ -10,9 +10,9 @@ "start": "srvx --prod -s ../client dist/server/index.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "react": "^19.2.3", "react-dom": "^19.2.3", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 09d74178d3..9276c1665b 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", - "@tanstack/start-static-server-functions": "^1.167.36", + "@tanstack/react-start": "^1.168.56", + "@tanstack/start-static-server-functions": "^1.167.37", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index d34e1f4415..48b48dade3 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index 52b6dcdd5e..a204b130e3 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.55", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/react-start": "^1.168.56", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 04df3b876d..97c2f818b8 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "^0.27.14", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index bd34498a08..b086e1361e 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -15,10 +15,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 7425d04b37..ca42a88d13 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "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 1b84dad2f5..fa951ceb07 100644 --- a/examples/react/start-i18n-paraglide/package.json +++ b/examples/react/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "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 1fd425cb01..0f1a3359bb 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "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 2519d69e85..82a68c4775 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,9 +15,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json index 55c038e758..48a5db46d1 100644 --- a/examples/react/start-next-migration/package.json +++ b/examples/react/start-next-migration/package.json @@ -12,8 +12,8 @@ "test:e2e": "playwright test" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-router": "^1.170.38", + "@tanstack/react-start": "^1.168.56", "iron-session": "^9.0.0", "next": "16.3.4", "react": "^19.2.3", diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index 0a5813f84d..9a7960ed25 100644 --- a/examples/react/start-rscs/package.json +++ b/examples/react/start-rscs/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "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 b0a4bdfb16..b43b1b8861 100644 --- a/examples/react/start-streaming-data-from-server-functions/package.json +++ b/examples/react/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "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 3196e076ee..8bf094d0ed 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index bece25d69c..675f3db646 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "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 80d5b68ce2..76c362eb4b 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index ed91c64852..1d68e74632 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.3.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.55", + "@tanstack/react-start": "^1.168.56", "@workos/authkit-tanstack-react-start": "^0.5.0", "react": "^19.0.0", "react-dom": "^19.0.0" diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 3880efb395..986add9cb8 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index f18f16dd73..12b55bf048 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "framer-motion": "^11.18.2", "react": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 3a1dc75350..8f4fc275b6 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "@trpc/tanstack-react-query": "^11.4.3", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 6950dd2b5a..f1632d8133 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.37", + "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "express": "^5.2.1", diff --git a/examples/solid/authenticated-routes-firebase/package.json b/examples/solid/authenticated-routes-firebase/package.json index 248d9f1f6c..fb32163b42 100644 --- a/examples/solid/authenticated-routes-firebase/package.json +++ b/examples/solid/authenticated-routes-firebase/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.39", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "firebase": "^11.4.0", "redaxios": "^0.5.1", diff --git a/examples/solid/authenticated-routes/package.json b/examples/solid/authenticated-routes/package.json index bc798c35b7..d41bbe8fb4 100644 --- a/examples/solid/authenticated-routes/package.json +++ b/examples/solid/authenticated-routes/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.39", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-default-search-params/package.json b/examples/solid/basic-default-search-params/package.json index 1ff4349784..593fa999da 100644 --- a/examples/solid/basic-default-search-params/package.json +++ b/examples/solid/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 6fe2974650..e6193f437d 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index c3ad2654be..38c92c9337 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -18,7 +18,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 5d669e1887..514f8faa8d 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index dd7e935fe0..048df25285 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -13,7 +13,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -21,7 +21,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 5148891f58..fa0095518a 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -12,14 +12,14 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-ssr-file-based/package.json b/examples/solid/basic-ssr-file-based/package.json index 951a86b424..550afdd0ea 100644 --- a/examples/solid/basic-ssr-file-based/package.json +++ b/examples/solid/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/solid-router": "^1.170.35", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.40", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json index 29d3a0cf75..800cf861be 100644 --- a/examples/solid/basic-ssr-streaming-file-based/package.json +++ b/examples/solid/basic-ssr-streaming-file-based/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "compression": "^1.8.0", "express": "^5.2.1", @@ -24,7 +24,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@types/express": "^5.0.6", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/solid/basic-virtual-file-based/package.json b/examples/solid/basic-virtual-file-based/package.json index a5074f6ee7..b9c3d08b57 100644 --- a/examples/solid/basic-virtual-file-based/package.json +++ b/examples/solid/basic-virtual-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.39", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", diff --git a/examples/solid/basic-virtual-inside-file-based/package.json b/examples/solid/basic-virtual-inside-file-based/package.json index 682faff9b6..8ba2b8fdd3 100644 --- a/examples/solid/basic-virtual-inside-file-based/package.json +++ b/examples/solid/basic-virtual-inside-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.39", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index 8e997be24f..dcf218133f 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/deferred-data/package.json b/examples/solid/deferred-data/package.json index 6d8a8ef585..1d41485ce5 100644 --- a/examples/solid/deferred-data/package.json +++ b/examples/solid/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json index eb1e332dd4..2339c231d0 100644 --- a/examples/solid/i18n-paraglide/package.json +++ b/examples/solid/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.40", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index ab975c0496..4ccb19acf9 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/kitchen-sink-solid-query-file-based/package.json b/examples/solid/kitchen-sink-solid-query-file-based/package.json index 922c80aaf1..2f5ea8865d 100644 --- a/examples/solid/kitchen-sink-solid-query-file-based/package.json +++ b/examples/solid/kitchen-sink-solid-query-file-based/package.json @@ -10,10 +10,10 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json index 9d422070af..5bcb646548 100644 --- a/examples/solid/kitchen-sink-solid-query/package.json +++ b/examples/solid/kitchen-sink-solid-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/kitchen-sink/package.json b/examples/solid/kitchen-sink/package.json index 0267a92960..46947c2b26 100644 --- a/examples/solid/kitchen-sink/package.json +++ b/examples/solid/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/large-file-based/package.json b/examples/solid/large-file-based/package.json index 58c0ae94a3..6758f5a9f5 100644 --- a/examples/solid/large-file-based/package.json +++ b/examples/solid/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/location-masking/package.json b/examples/solid/location-masking/package.json index d1c6c15830..125acad2e8 100644 --- a/examples/solid/location-masking/package.json +++ b/examples/solid/location-masking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/navigation-blocking/package.json b/examples/solid/navigation-blocking/package.json index c0e7e9a89a..65b2d23073 100644 --- a/examples/solid/navigation-blocking/package.json +++ b/examples/solid/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json index a5ed7115d3..c4021965a8 100644 --- a/examples/solid/quickstart-esbuild-file-based/package.json +++ b/examples/solid/quickstart-esbuild-file-based/package.json @@ -9,8 +9,8 @@ "start": "dev" }, "dependencies": { - "@tanstack/router-plugin": "^1.168.39", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index 86041cbd45..1a1115bc0f 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -18,7 +18,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/quickstart-rspack-file-based/package.json b/examples/solid/quickstart-rspack-file-based/package.json index 014157825e..f913bce56c 100644 --- a/examples/solid/quickstart-rspack-file-based/package.json +++ b/examples/solid/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "postcss": "^8.5.1", "solid-js": "^1.9.10", @@ -19,7 +19,7 @@ "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2" } diff --git a/examples/solid/quickstart-webpack-file-based/package.json b/examples/solid/quickstart-webpack-file-based/package.json index af11a0388b..009a7868dc 100644 --- a/examples/solid/quickstart-webpack-file-based/package.json +++ b/examples/solid/quickstart-webpack-file-based/package.json @@ -7,7 +7,7 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" @@ -15,7 +15,7 @@ "devDependencies": { "@babel/core": "^7.28.5", "@babel/preset-typescript": "^7.27.1", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "babel-loader": "^10.0.0", "babel-preset-solid": "^1.9.10", "css-loader": "^7.1.2", diff --git a/examples/solid/quickstart/package.json b/examples/solid/quickstart/package.json index 429892a2a4..245fdc3d84 100644 --- a/examples/solid/quickstart/package.json +++ b/examples/solid/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/router-monorepo-simple-lazy/package.json b/examples/solid/router-monorepo-simple-lazy/package.json index a85b4823e9..a2175573dc 100644 --- a/examples/solid/router-monorepo-simple-lazy/package.json +++ b/examples/solid/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json index 5595aeeabd..78e91a4028 100644 --- a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/solid-router": "^1.170.35", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.40", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json index 9a52e8ba47..8f576eacf3 100644 --- a/examples/solid/router-monorepo-simple/package.json +++ b/examples/solid/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple/packages/router/package.json b/examples/solid/router-monorepo-simple/packages/router/package.json index 08b70f2437..b9b3720826 100644 --- a/examples/solid/router-monorepo-simple/packages/router/package.json +++ b/examples/solid/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/solid-router": "^1.170.35", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.40", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json index 41b5b11469..36cc5941d3 100644 --- a/examples/solid/router-monorepo-solid-query/package.json +++ b/examples/solid/router-monorepo-solid-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-solid-query/packages/router/package.json b/examples/solid/router-monorepo-solid-query/packages/router/package.json index 6249d242a1..1a47601e63 100644 --- a/examples/solid/router-monorepo-solid-query/packages/router/package.json +++ b/examples/solid/router-monorepo-solid-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.162.4", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.35", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.40", "@router-solid-mono-solid-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^4.4.3", diff --git a/examples/solid/scroll-restoration/package.json b/examples/solid/scroll-restoration/package.json index b6b923a92b..5e5989b07b 100644 --- a/examples/solid/scroll-restoration/package.json +++ b/examples/solid/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-virtual": "^3.13.0", "solid-js": "^1.9.10", diff --git a/examples/solid/search-validator-adapters/package.json b/examples/solid/search-validator-adapters/package.json index 01627ff2f0..3694a57636 100644 --- a/examples/solid/search-validator-adapters/package.json +++ b/examples/solid/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/router-plugin": "^1.168.40", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json index e4899af3ad..79c9d3ecdb 100644 --- a/examples/solid/start-basic-auth/package.json +++ b/examples/solid/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index 10c984ce1f..49511a05ad 100644 --- a/examples/solid/start-basic-authjs/package.json +++ b/examples/solid/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "solid-js": "^1.9.10", "start-authjs": "^1.0.0", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json index ae322a0626..3e5a2ef79e 100644 --- a/examples/solid/start-basic-cloudflare/package.json +++ b/examples/solid/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json index b9111c4252..f2cf549404 100644 --- a/examples/solid/start-basic-netlify/package.json +++ b/examples/solid/start-basic-netlify/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json index 84eeb8b1e7..ef3fa3a998 100644 --- a/examples/solid/start-basic-nitro/package.json +++ b/examples/solid/start-basic-nitro/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json index 92fdf2db09..ce09a1f67e 100644 --- a/examples/solid/start-basic-solid-query/package.json +++ b/examples/solid/start-basic-solid-query/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 8d681b2aea..20f43dd6e5 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", - "@tanstack/start-static-server-functions": "^1.167.36", + "@tanstack/solid-start": "^1.168.54", + "@tanstack/start-static-server-functions": "^1.167.37", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 469ceb5296..61fe51dec7 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index de4bfcf1ce..a4cc5eb8cb 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.53", - "@tanstack/router-plugin": "^1.168.39", + "@tanstack/solid-start": "^1.168.54", + "@tanstack/router-plugin": "^1.168.40", "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 4ce1705e4b..2f7db4ed88 100644 --- a/examples/solid/start-convex-better-auth/package.json +++ b/examples/solid/start-convex-better-auth/package.json @@ -13,9 +13,9 @@ "dependencies": { "@convex-dev/better-auth": "^0.9.7", "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "better-auth": "^1.6.19", "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 4e312bdb53..9950628bcd 100644 --- a/examples/solid/start-counter/package.json +++ b/examples/solid/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "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 58592d830a..e304a0fbd1 100644 --- a/examples/solid/start-i18n-paraglide/package.json +++ b/examples/solid/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index f066269435..3adcaf907a 100644 --- a/examples/solid/start-large/package.json +++ b/examples/solid/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "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 b93827a6cf..a51e5b7829 100644 --- a/examples/solid/start-streaming-data-from-server-functions/package.json +++ b/examples/solid/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "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 5d6a3b51be..c2df01371d 100644 --- a/examples/solid/start-supabase-basic/package.json +++ b/examples/solid/start-supabase-basic/package.json @@ -14,9 +14,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "solid-js": "^1.9.9", "redaxios": "^0.5.1" }, diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json index f21ec17eb4..4dd8e97c08 100644 --- a/examples/solid/start-tailwind-v4/package.json +++ b/examples/solid/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.53", + "@tanstack/solid-start": "^1.168.54", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json index d9b4e97ece..3dd5928a94 100644 --- a/examples/solid/view-transitions/package.json +++ b/examples/solid/view-transitions/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.39", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json index 1e86ba46b1..194710dfd2 100644 --- a/examples/solid/with-framer-motion/package.json +++ b/examples/solid/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json index b89f9e3400..0265148af4 100644 --- a/examples/solid/with-trpc/package.json +++ b/examples/solid/with-trpc/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.39", - "@tanstack/solid-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", diff --git a/examples/vue/basic-file-based-jsx/package.json b/examples/vue/basic-file-based-jsx/package.json index 1f3116bd2d..28bd94e7a4 100644 --- a/examples/vue/basic-file-based-jsx/package.json +++ b/examples/vue/basic-file-based-jsx/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.39", - "@tanstack/vue-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.40", + "@tanstack/vue-router": "^1.170.35", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", diff --git a/examples/vue/basic-file-based-sfc/package.json b/examples/vue/basic-file-based-sfc/package.json index 785fdc7d58..f8df778961 100644 --- a/examples/vue/basic-file-based-sfc/package.json +++ b/examples/vue/basic-file-based-sfc/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.39", - "@tanstack/vue-router": "^1.170.34", + "@tanstack/router-plugin": "^1.168.40", + "@tanstack/vue-router": "^1.170.35", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", diff --git a/examples/vue/basic/package.json b/examples/vue/basic/package.json index d967656ee8..3d4169db70 100644 --- a/examples/vue/basic/package.json +++ b/examples/vue/basic/package.json @@ -9,7 +9,7 @@ "start": "vite" }, "dependencies": { - "@tanstack/vue-router": "^1.170.34", + "@tanstack/vue-router": "^1.170.35", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "vue": "^3.5.13", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 4142087bc0..94d54a4bd7 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/react-router +## 1.170.38 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + ## 1.170.37 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index cdf9455d65..63624917f5 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.170.37", + "version": "1.170.38", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/CHANGELOG.md b/packages/react-start-client/CHANGELOG.md index 4c4c6546b1..15995d2c0f 100644 --- a/packages/react-start-client/CHANGELOG.md +++ b/packages/react-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-start-client +## 1.168.36 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + - @tanstack/react-router@1.170.38 + - @tanstack/start-client-core@1.170.32 + ## 1.168.35 ### Patch Changes diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 7f900fcda0..b6ff394f09 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.168.35", + "version": "1.168.36", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index 4d97ff08c7..2919c4e879 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,5 +1,16 @@ # @tanstack/react-start-rsc +## 0.1.55 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + - @tanstack/react-router@1.170.38 + - @tanstack/start-client-core@1.170.32 + - @tanstack/start-plugin-core@1.171.46 + - @tanstack/start-storage-context@1.167.34 + ## 0.1.54 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index 17e3540bae..ae593ed6f7 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.54", + "version": "0.1.55", "description": "React Server Components support for TanStack Start", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/CHANGELOG.md b/packages/react-start-server/CHANGELOG.md index 6149790c29..5bc820d2cb 100644 --- a/packages/react-start-server/CHANGELOG.md +++ b/packages/react-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-start-server +## 1.167.43 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + - @tanstack/react-router@1.170.38 + - @tanstack/start-server-core@1.169.37 + ## 1.167.42 ### Patch Changes diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index c4690c6386..20d4704d95 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.167.42", + "version": "1.167.43", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/CHANGELOG.md b/packages/react-start/CHANGELOG.md index eeafebc68a..18d437117f 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,5 +1,18 @@ # @tanstack/react-start +## 1.168.56 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/react-router@1.170.38 + - @tanstack/react-start-client@1.168.36 + - @tanstack/react-start-rsc@0.1.55 + - @tanstack/react-start-server@1.167.43 + - @tanstack/start-client-core@1.170.32 + - @tanstack/start-plugin-core@1.171.46 + - @tanstack/start-server-core@1.169.37 + ## 1.168.55 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index d291ec9bb6..6ac67a4dbd 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.168.55", + "version": "1.168.56", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/CHANGELOG.md b/packages/router-cli/CHANGELOG.md index 077479e5fa..9b209808ae 100644 --- a/packages/router-cli/CHANGELOG.md +++ b/packages/router-cli/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-cli +## 1.167.38 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-generator@1.167.38 + ## 1.167.37 ### Patch Changes diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 7a1c444d95..ea3a927eef 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.167.37", + "version": "1.167.38", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/CHANGELOG.md b/packages/router-core/CHANGELOG.md index f8afd7acc6..90a0e714f8 100644 --- a/packages/router-core/CHANGELOG.md +++ b/packages/router-core/CHANGELOG.md @@ -1,5 +1,21 @@ # @tanstack/router-core +## 1.171.32 + +### Patch Changes + +- [#8363](https://github.com/TanStack/router/pull/8363) [`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4) - Detect plain objects by constructor instead of `Object.prototype.toString` dispatches in `isPlainObject`, which gates every `deepEqual` and `replaceEqualDeep` recursion step. Object literals, `JSON.parse` output and null-prototype objects are still plain; objects from another realm no longer are. Records with an own `constructor` key (for example the search params of `?constructor=foo`) fall back to a prototype check, so they keep structural sharing while class instances stay opaque. + +- [#8364](https://github.com/TanStack/router/pull/8364) [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7) - Compare and copy plain objects in `replaceEqualDeep` by their string keys only, skipping the symbol-key lookup that dominated key enumeration. Objects with non-enumerable own properties, or symbol keys on the incoming value, now pass through untouched instead of being structurally shared. + +- [#8411](https://github.com/TanStack/router/pull/8411) [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716) - Reduce structural-sharing allocations by reusing array key storage and returning incoming objects when their children need no replacements. Preserve signed zero consistently, remove stale symbol properties, and keep sparse arrays with extra keys and built-ins with an own `constructor` opaque. + + Null-prototype mode now applies only when constructing a copy; existing incoming objects can be reused with their original prototype. + +- [#8362](https://github.com/TanStack/router/pull/8362) [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa) - Allocate the `replaceEqualDeep` result only at the first difference, so structural sharing of search, params, state and loader data no longer allocates when the new value is deeply equal to the previous one. + +- [#8389](https://github.com/TanStack/router/pull/8389) [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e) - Split `replaceEqualDeep` into an equality scan and a copy phase: arrays and objects are scanned by dedicated loops up to the first difference, matching keys prove ownership without a `hasOwnProperty` lookup, and once a difference is found the result is built without any further equality bookkeeping. Deeply equal search, params, state and loader data are recognised faster and changed values are copied with less work per entry. + ## 1.171.31 ### Patch Changes diff --git a/packages/router-core/package.json b/packages/router-core/package.json index ae61f9f080..f1df4c6fbf 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.171.31", + "version": "1.171.32", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/CHANGELOG.md b/packages/router-generator/CHANGELOG.md index db07f68af0..e7c4827baa 100644 --- a/packages/router-generator/CHANGELOG.md +++ b/packages/router-generator/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-generator +## 1.167.38 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + ## 1.167.37 ### Patch Changes diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index becd13a356..6fce1dc6e3 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.167.37", + "version": "1.167.38", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/CHANGELOG.md b/packages/router-plugin/CHANGELOG.md index 7406686cdb..43d1808274 100644 --- a/packages/router-plugin/CHANGELOG.md +++ b/packages/router-plugin/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/router-plugin +## 1.168.40 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + - @tanstack/react-router@1.170.38 + - @tanstack/router-generator@1.167.38 + ## 1.168.39 ### Patch Changes diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 97e759185b..5713a7c5b0 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.168.39", + "version": "1.168.40", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/CHANGELOG.md b/packages/router-vite-plugin/CHANGELOG.md index cd421fc459..5a902decae 100644 --- a/packages/router-vite-plugin/CHANGELOG.md +++ b/packages/router-vite-plugin/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-vite-plugin +## 1.167.40 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-plugin@1.168.40 + ## 1.167.39 ### Patch Changes diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index e928f27f04..56cb2bb82d 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.167.39", + "version": "1.167.40", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/CHANGELOG.md b/packages/solid-router/CHANGELOG.md index 1340df37dc..29c4793a53 100644 --- a/packages/solid-router/CHANGELOG.md +++ b/packages/solid-router/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/solid-router +## 1.170.36 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + ## 1.170.35 ### Patch Changes diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 05a787668a..a3379ba672 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.170.35", + "version": "1.170.36", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/CHANGELOG.md b/packages/solid-start-client/CHANGELOG.md index efdd8b50a7..d01ce8c871 100644 --- a/packages/solid-start-client/CHANGELOG.md +++ b/packages/solid-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start-client +## 1.168.35 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + - @tanstack/solid-router@1.170.36 + - @tanstack/start-client-core@1.170.32 + ## 1.168.34 ### Patch Changes diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index c14bd7d327..76aad8cf34 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.168.34", + "version": "1.168.35", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/CHANGELOG.md b/packages/solid-start-server/CHANGELOG.md index eb1ccaed68..4186f01de0 100644 --- a/packages/solid-start-server/CHANGELOG.md +++ b/packages/solid-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start-server +## 1.167.42 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + - @tanstack/solid-router@1.170.36 + - @tanstack/start-server-core@1.169.37 + ## 1.167.41 ### Patch Changes diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 0e9308e7ce..94e1448c24 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.167.41", + "version": "1.167.42", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/CHANGELOG.md b/packages/solid-start/CHANGELOG.md index d3e4041c7a..d234f8f514 100644 --- a/packages/solid-start/CHANGELOG.md +++ b/packages/solid-start/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/solid-start +## 1.168.54 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/solid-router@1.170.36 + - @tanstack/solid-start-client@1.168.35 + - @tanstack/solid-start-server@1.167.42 + - @tanstack/start-client-core@1.170.32 + - @tanstack/start-plugin-core@1.171.46 + - @tanstack/start-server-core@1.169.37 + ## 1.168.53 ### Patch Changes diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index e33b7b58a9..a7e22858ec 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.168.53", + "version": "1.168.54", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/CHANGELOG.md b/packages/start-client-core/CHANGELOG.md index 5aa355fd97..521864b296 100644 --- a/packages/start-client-core/CHANGELOG.md +++ b/packages/start-client-core/CHANGELOG.md @@ -1,5 +1,13 @@ # @tanstack/start-client-core +## 1.170.32 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + - @tanstack/start-storage-context@1.167.34 + ## 1.170.31 ### Patch Changes diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 76e385bf30..a813c1f77e 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.170.31", + "version": "1.170.32", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/CHANGELOG.md b/packages/start-plugin-core/CHANGELOG.md index f84255015d..7236af6571 100644 --- a/packages/start-plugin-core/CHANGELOG.md +++ b/packages/start-plugin-core/CHANGELOG.md @@ -1,5 +1,15 @@ # @tanstack/start-plugin-core +## 1.171.46 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + - @tanstack/router-generator@1.167.38 + - @tanstack/router-plugin@1.168.40 + - @tanstack/start-server-core@1.169.37 + ## 1.171.45 ### Patch Changes diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 3dcb378e86..dc88254aeb 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.45", + "version": "1.171.46", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/CHANGELOG.md b/packages/start-server-core/CHANGELOG.md index 8f8a064c18..a24c72469a 100644 --- a/packages/start-server-core/CHANGELOG.md +++ b/packages/start-server-core/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/start-server-core +## 1.169.37 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + - @tanstack/start-client-core@1.170.32 + - @tanstack/start-storage-context@1.167.34 + ## 1.169.36 ### Patch Changes diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index a73c0a3a0a..d89979cfff 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.169.36", + "version": "1.169.37", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-static-server-functions/CHANGELOG.md b/packages/start-static-server-functions/CHANGELOG.md index aac67e7d39..43421814eb 100644 --- a/packages/start-static-server-functions/CHANGELOG.md +++ b/packages/start-static-server-functions/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/start-static-server-functions +## 1.167.37 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/start-client-core@1.170.32 + - @tanstack/react-start@1.168.56 + - @tanstack/solid-start@1.168.54 + ## 1.167.36 ### Patch Changes diff --git a/packages/start-static-server-functions/package.json b/packages/start-static-server-functions/package.json index 21ddc2f542..cec2e42ff2 100644 --- a/packages/start-static-server-functions/package.json +++ b/packages/start-static-server-functions/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-static-server-functions", - "version": "1.167.36", + "version": "1.167.37", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-storage-context/CHANGELOG.md b/packages/start-storage-context/CHANGELOG.md index 1a05887058..ec1c88fd9e 100644 --- a/packages/start-storage-context/CHANGELOG.md +++ b/packages/start-storage-context/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/start-storage-context +## 1.167.34 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + ## 1.167.33 ### Patch Changes diff --git a/packages/start-storage-context/package.json b/packages/start-storage-context/package.json index 0955b99573..0d1222c6e7 100644 --- a/packages/start-storage-context/package.json +++ b/packages/start-storage-context/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-storage-context", - "version": "1.167.33", + "version": "1.167.34", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-router/CHANGELOG.md b/packages/vue-router/CHANGELOG.md index 8ceb16f50b..7710012185 100644 --- a/packages/vue-router/CHANGELOG.md +++ b/packages/vue-router/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/vue-router +## 1.170.35 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + ## 1.170.34 ### Patch Changes diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index ec1b6c524e..70f8ddc729 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-router", - "version": "1.170.34", + "version": "1.170.35", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-client/CHANGELOG.md b/packages/vue-start-client/CHANGELOG.md index dfb36c47fe..29b49fe1ed 100644 --- a/packages/vue-start-client/CHANGELOG.md +++ b/packages/vue-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-start-client +## 1.167.38 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + - @tanstack/start-client-core@1.170.32 + - @tanstack/vue-router@1.170.35 + ## 1.167.37 ### Patch Changes diff --git a/packages/vue-start-client/package.json b/packages/vue-start-client/package.json index dda0c24b54..0ee21a577c 100644 --- a/packages/vue-start-client/package.json +++ b/packages/vue-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-client", - "version": "1.167.37", + "version": "1.167.38", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-server/CHANGELOG.md b/packages/vue-start-server/CHANGELOG.md index 650f420491..7b30e9e791 100644 --- a/packages/vue-start-server/CHANGELOG.md +++ b/packages/vue-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-start-server +## 1.167.42 + +### Patch Changes + +- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: + - @tanstack/router-core@1.171.32 + - @tanstack/start-server-core@1.169.37 + - @tanstack/vue-router@1.170.35 + ## 1.167.41 ### Patch Changes diff --git a/packages/vue-start-server/package.json b/packages/vue-start-server/package.json index 2ea1b2b594..07d4f891a1 100644 --- a/packages/vue-start-server/package.json +++ b/packages/vue-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-server", - "version": "1.167.41", + "version": "1.167.42", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start/CHANGELOG.md b/packages/vue-start/CHANGELOG.md index 8628a56e75..872b188fb1 100644 --- a/packages/vue-start/CHANGELOG.md +++ b/packages/vue-start/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/vue-start +## 1.168.53 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/start-client-core@1.170.32 + - @tanstack/start-plugin-core@1.171.46 + - @tanstack/start-server-core@1.169.37 + - @tanstack/vue-router@1.170.35 + - @tanstack/vue-start-client@1.167.38 + - @tanstack/vue-start-server@1.167.42 + ## 1.168.52 ### Patch Changes diff --git a/packages/vue-start/package.json b/packages/vue-start/package.json index c838830cba..babdb4e20d 100644 --- a/packages/vue-start/package.json +++ b/packages/vue-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start", - "version": "1.168.52", + "version": "1.168.53", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 095e5b08b7..c6cc0374eb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11290,7 +11290,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11330,7 +11330,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11373,7 +11373,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11416,7 +11416,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11453,7 +11453,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11487,7 +11487,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11527,7 +11527,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11573,7 +11573,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11616,7 +11616,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11656,7 +11656,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router compression: specifier: ^1.8.0 @@ -11699,7 +11699,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11757,7 +11757,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11800,7 +11800,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11840,7 +11840,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11880,7 +11880,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router solid-js: specifier: 1.9.12 @@ -11914,7 +11914,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11954,7 +11954,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12003,7 +12003,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12052,7 +12052,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12098,7 +12098,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12138,7 +12138,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12175,7 +12175,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12209,7 +12209,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12240,7 +12240,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12271,7 +12271,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12311,7 +12311,7 @@ importers: specifier: ^4.2.2 version: 4.2.2 '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12348,7 +12348,7 @@ importers: examples/solid/quickstart-webpack-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12412,7 +12412,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12449,7 +12449,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12492,7 +12492,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12529,7 +12529,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12572,7 +12572,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12627,7 +12627,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12682,7 +12682,7 @@ importers: specifier: ^7.0.0 version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12734,7 +12734,7 @@ importers: specifier: ^0.41.1 version: 0.41.1 '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12777,7 +12777,7 @@ importers: examples/solid/start-basic-cloudflare: dependencies: '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12820,7 +12820,7 @@ importers: examples/solid/start-basic-netlify: dependencies: '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12860,7 +12860,7 @@ importers: examples/solid/start-basic-nitro: dependencies: '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12906,7 +12906,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12952,7 +12952,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13007,7 +13007,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13074,7 +13074,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13132,7 +13132,7 @@ importers: examples/solid/start-counter: dependencies: '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13178,7 +13178,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13221,7 +13221,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13267,7 +13267,7 @@ importers: examples/solid/start-streaming-data-from-server-functions: dependencies: '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13307,7 +13307,7 @@ importers: specifier: ^2.48.1 version: 2.48.1 '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13347,7 +13347,7 @@ importers: examples/solid/start-tailwind-v4: dependencies: '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13396,7 +13396,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13433,7 +13433,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13476,7 +13476,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.35 + specifier: ^1.170.36 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From faec323dc5f6e1edf08779ef50cdf935843ddcd1 Mon Sep 17 00:00:00 2001 From: Flo Date: Thu, 17 Sep 2026 10:05:30 +0200 Subject: [PATCH 050/175] fix(router-core): missing deepEqual signature changes in replace-equal-deep benchmark (#8462) --- packages/router-core/tests/replace-equal-deep.bench.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/router-core/tests/replace-equal-deep.bench.ts b/packages/router-core/tests/replace-equal-deep.bench.ts index bfcf65feff..86639cb26d 100644 --- a/packages/router-core/tests/replace-equal-deep.bench.ts +++ b/packages/router-core/tests/replace-equal-deep.bench.ts @@ -189,7 +189,7 @@ expect(nullReplaceEqualDeep(emptyNull, {})).toBe(emptyNull) expect( nullReplaceEqualDeep(searchWithConstructorKey, searchWithConstructorKeyCopy), ).toBe(searchWithConstructorKey) -expect(deepEqual(search, searchCopy, { partial: true })).toBe(true) +expect(deepEqual(search, searchCopy, true)).toBe(true) expect(isPlainObject(search)).toBe(true) expect(isPlainObject(emptyNull)).toBe(true) expect(isPlainObject(searchWithConstructorKey)).toBe(true) @@ -524,7 +524,7 @@ describe('deepEqual', () => { bench('equal flat search (partial)', () => { for (let i = 0; i < iterations; i++) { - sink = deepEqual(search, searchCopy, { partial: true }) + sink = deepEqual(search, searchCopy, true) } }) From 6faf2bf292a547bd2c357b2db882cf90c8374618 Mon Sep 17 00:00:00 2001 From: Flo Date: Thu, 17 Sep 2026 10:26:33 +0200 Subject: [PATCH 051/175] ci: skip benchmarks for package test-only PRs (#8463) --- .github/workflows/client-nav-benchmarks.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/client-nav-benchmarks.yml b/.github/workflows/client-nav-benchmarks.yml index 7eedc222ae..06e7e733b8 100644 --- a/.github/workflows/client-nav-benchmarks.yml +++ b/.github/workflows/client-nav-benchmarks.yml @@ -18,6 +18,9 @@ on: pull_request: paths: - 'packages/**' + - '!packages/**/tests/**' + - '!packages/**/__tests__/**' + - '!packages/**/*.test.*' - 'benchmarks/**' workflow_dispatch: From 2fb77232309d34cd179dd526b25020b791b53721 Mon Sep 17 00:00:00 2001 From: Flo Date: Thu, 17 Sep 2026 11:19:08 +0200 Subject: [PATCH 052/175] perf(benchmarks): compress bundle-size outputs once (#8453) * perf(benchmarks): compress bundle-size outputs once * add link to readme in skill * ci: apply automated fixes * fix(benchmarks): persist timing flag in measurement command --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- benchmarks/bundle-size/README.md | 23 +++ benchmarks/bundle-size/package.json | 4 +- scripts/benchmarks/bundle-size/compress.mjs | 64 +++++++ .../benchmarks/bundle-size/compress.test.mjs | 179 ++++++++++++++++++ scripts/benchmarks/bundle-size/measure.mjs | 111 ++++++----- scripts/benchmarks/bundle-size/run.mjs | 3 + scripts/benchmarks/bundle-size/run.test.mjs | 8 + scripts/benchmarks/bundle-size/timings.mjs | 20 ++ .../benchmarks/bundle-size/timings.test.mjs | 35 ++++ skills/bundle-size-optimization/SKILL.md | 5 + 10 files changed, 399 insertions(+), 53 deletions(-) create mode 100644 scripts/benchmarks/bundle-size/compress.mjs create mode 100644 scripts/benchmarks/bundle-size/compress.test.mjs create mode 100644 scripts/benchmarks/bundle-size/timings.mjs create mode 100644 scripts/benchmarks/bundle-size/timings.test.mjs diff --git a/benchmarks/bundle-size/README.md b/benchmarks/bundle-size/README.md index e5986f106c..b5dfc9c4d9 100644 --- a/benchmarks/bundle-size/README.md +++ b/benchmarks/bundle-size/README.md @@ -65,6 +65,29 @@ Full stdout and stderr stay in the log files. A positive bundle-size delta does For agent runs, use `pnpm --silent benchmark:bundle-size:run ...` to omit the package-manager command echo. +### Phase Timings + +To diagnose measurement time, request a fresh run: + +```bash +pnpm benchmark:bundle-size:run --scenario react-router.minimal --analysis --timings +``` + +The runner directly executes `measure.mjs` on every invocation, rebuilding the selected scenarios and recording fresh timings in `measure.log`. Its package-build step still uses Nx and may restore cached packages. Use `--skip-package-builds` only when those packages are already built and unchanged. + +`measure.mjs` also accepts `--timings` directly. Alternatively, set `BUNDLE_SIZE_TIMINGS=1`. Timing lines go to stderr with the prefix `[bundle-size:timing]` followed by JSON containing `phase`, `durationMs`, and, for scenario phases, `scenario`. They are diagnostics only and do not add fields to the size metrics. + +The cached `pnpm benchmark:bundle-size` / Nx build path can replay terminal output from an earlier execution, including old timing lines. Setting `BUNDLE_SIZE_TIMINGS=1` does not invalidate that cache or guarantee fresh timings. Use the direct runner above for timing investigations; refreshing `current.json` after a cache hit does not remeasure build time. + +- `package-builds`: elapsed time for the package-build invocation, including Nx startup/cache handling; omitted when package builds are skipped. +- `scenario-build`: elapsed time for each scenario's build and cleanup. +- `manifest-resolution`: manifest discovery, parsing, entry selection, and collection of all/initial JS file lists. +- `gzip` / `brotli`: accumulated codec time across distinct files for each scenario, using Node's default compression settings. File reads and summation are excluded; initial files reuse already measured sizes. +- `analysis`: source attribution, when `--analysis` is enabled. +- `overall`: measurement execution through report/history writing. Module imports, process startup, and the outer runner's tests/report command are excluded. + +Phases that start also report elapsed work on failure; compression reports partial accumulated times before propagating the error. Timing records alone do not indicate success. `overall` contains the other phases, so nested timings must not be added to it. The phase breakdown also excludes overhead such as file reads and result writing, so its sum is not expected to equal `overall`. + ## Compare Optimization Candidates Before you change the implementation, save a named baseline: diff --git a/benchmarks/bundle-size/package.json b/benchmarks/bundle-size/package.json index 3705df05fc..283f675e44 100644 --- a/benchmarks/bundle-size/package.json +++ b/benchmarks/bundle-size/package.json @@ -4,7 +4,7 @@ "type": "module", "scripts": { "build": "node ../../scripts/benchmarks/bundle-size/measure.mjs --skip-package-builds --measurements-only", - "test:unit": "node --test ../../scripts/benchmarks/bundle-size/pr-report.test.mjs ../../scripts/benchmarks/bundle-size/run.test.mjs ../../scripts/benchmarks/bundle-size/report.test.mjs ../../scripts/benchmarks/bundle-size/build.test.mjs" + "test:unit": "node --test ../../scripts/benchmarks/bundle-size/pr-report.test.mjs ../../scripts/benchmarks/bundle-size/run.test.mjs ../../scripts/benchmarks/bundle-size/report.test.mjs ../../scripts/benchmarks/bundle-size/build.test.mjs ../../scripts/benchmarks/bundle-size/compress.test.mjs ../../scripts/benchmarks/bundle-size/timings.test.mjs" }, "nx": { "targets": { @@ -14,6 +14,8 @@ "^buildProduction", "dependentTaskOutputs", "{workspaceRoot}/scripts/benchmarks/bundle-size/measure.mjs", + "{workspaceRoot}/scripts/benchmarks/bundle-size/compress.mjs", + "{workspaceRoot}/scripts/benchmarks/bundle-size/timings.mjs", "{workspaceRoot}/scripts/benchmarks/bundle-size/report.mjs", { "runtime": "node --version" diff --git a/scripts/benchmarks/bundle-size/compress.mjs b/scripts/benchmarks/bundle-size/compress.mjs new file mode 100644 index 0000000000..f30d8794ca --- /dev/null +++ b/scripts/benchmarks/bundle-size/compress.mjs @@ -0,0 +1,64 @@ +import fs from 'node:fs' +import path from 'node:path' +import { brotliCompressSync, gzipSync } from 'node:zlib' + +function sumSizes(files) { + let rawBytes = 0 + let gzipBytes = 0 + let brotliBytes = 0 + + for (const file of files) { + rawBytes += file.rawBytes + gzipBytes += file.gzipBytes + brotliBytes += file.brotliBytes + } + + return { rawBytes, gzipBytes, brotliBytes, files } +} + +// Keep the cache local to one measurement: rebuilds can reuse filenames. +export function measureFileSizes(baseDir, jsFiles, initialJsFiles, onTiming) { + const measured = new Map() + let gzipMs = 0 + let brotliMs = 0 + + function measureFile(file) { + let sizes = measured.get(file) + if (sizes) { + return sizes + } + + const content = fs.readFileSync(path.join(baseDir, file)) + const gzipStarted = onTiming ? performance.now() : 0 + let gzipBytes + try { + gzipBytes = gzipSync(content).byteLength + } finally { + if (onTiming) { + gzipMs += performance.now() - gzipStarted + } + } + const brotliStarted = onTiming ? performance.now() : 0 + let brotliBytes + try { + brotliBytes = brotliCompressSync(content).byteLength + } finally { + if (onTiming) { + brotliMs += performance.now() - brotliStarted + } + } + + sizes = { file, rawBytes: content.byteLength, gzipBytes, brotliBytes } + measured.set(file, sizes) + return sizes + } + + try { + const sizes = sumSizes(jsFiles.map(measureFile)) + const initialSizes = sumSizes(initialJsFiles.map(measureFile)) + return { sizes, initialSizes } + } finally { + onTiming?.('gzip', gzipMs) + onTiming?.('brotli', brotliMs) + } +} diff --git a/scripts/benchmarks/bundle-size/compress.test.mjs b/scripts/benchmarks/bundle-size/compress.test.mjs new file mode 100644 index 0000000000..a73b93b77c --- /dev/null +++ b/scripts/benchmarks/bundle-size/compress.test.mjs @@ -0,0 +1,179 @@ +import assert from 'node:assert/strict' +import fs from 'node:fs' +import { syncBuiltinESMExports } from 'node:module' +import os from 'node:os' +import path from 'node:path' +import test from 'node:test' +import zlib, { brotliCompressSync, gzipSync } from 'node:zlib' +import { measureFileSizes } from './compress.mjs' + +// Independent reference: compress both lists separately, as the CLI did before. +function legacySizes(baseDir, fileList) { + const result = { rawBytes: 0, gzipBytes: 0, brotliBytes: 0, files: [] } + for (const file of fileList) { + const content = fs.readFileSync(path.join(baseDir, file)) + const sizes = { + file, + rawBytes: content.byteLength, + gzipBytes: gzipSync(content).byteLength, + brotliBytes: brotliCompressSync(content).byteLength, + } + result.rawBytes += sizes.rawBytes + result.gzipBytes += sizes.gzipBytes + result.brotliBytes += sizes.brotliBytes + result.files.push(sizes) + } + return result +} + +function fixture(t) { + const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'bundle-compress-')) + t.after(() => fs.rmSync(dir, { recursive: true, force: true })) + for (const [file, content] of Object.entries({ + 'entry.js': 'import "./shared.mjs"; console.log("héllo 🌍");\n'.repeat(30), + 'shared.mjs': 'export const shared = "shared chunk";\n'.repeat(100), + 'lazy.js': 'export default "lazy route";\n'.repeat(20), + 'empty.js': '', + })) { + fs.writeFileSync(path.join(dir, file), content) + } + return dir +} + +test('matches legacy per-chunk compression and initial totals exactly', (t) => { + const dir = fixture(t) + const all = ['entry.js', 'shared.mjs', 'lazy.js', 'empty.js'] + for (const initial of [ + [], + ['entry.js'], + ['shared.mjs', 'entry.js'], + all, + ['empty.js'], + ]) { + assert.deepEqual(measureFileSizes(dir, all, initial), { + sizes: legacySizes(dir, all), + initialSizes: legacySizes(dir, initial), + }) + } + assert.deepEqual(measureFileSizes(dir, [], []), { + sizes: legacySizes(dir, []), + initialSizes: legacySizes(dir, []), + }) +}) + +test('preserves list order and multiplicity, including initial-only files', (t) => { + const dir = fixture(t) + const all = ['lazy.js', 'entry.js', 'entry.js'] + const initial = ['shared.mjs', 'entry.js', 'entry.js'] + assert.deepEqual(measureFileSizes(dir, all, initial), { + sizes: legacySizes(dir, all), + initialSizes: legacySizes(dir, initial), + }) +}) + +test('remeasures changed files on subsequent calls and propagates read errors', (t) => { + const dir = fixture(t) + const files = ['entry.js'] + const before = measureFileSizes(dir, files, files) + fs.writeFileSync(path.join(dir, 'entry.js'), 'export default "rebuilt"') + const after = measureFileSizes(dir, files, files) + assert.notDeepEqual(after, before) + assert.deepEqual(after, { + sizes: legacySizes(dir, files), + initialSizes: legacySizes(dir, files), + }) + assert.throws(() => measureFileSizes(dir, files, ['missing.js']), { + code: 'ENOENT', + }) +}) + +test('reports gzip and brotli separately without changing measured output', (t) => { + const dir = fixture(t) + const all = ['entry.js', 'shared.mjs', 'lazy.js'] + const initial = ['entry.js', 'shared.mjs'] + const timings = [] + const result = measureFileSizes(dir, all, initial, (phase, durationMs) => { + timings.push({ phase, durationMs }) + }) + assert.deepEqual(result, measureFileSizes(dir, all, initial)) + assert.deepEqual( + timings.map(({ phase }) => phase), + ['gzip', 'brotli'], + ) + for (const { durationMs } of timings) { + assert.ok(Number.isFinite(durationMs) && durationMs >= 0) + } +}) + +test('reads and compresses each distinct file only once per measurement', (t) => { + const dir = fixture(t) + const all = ['entry.js', 'shared.mjs', 'lazy.js', 'entry.js'] + const initial = ['shared.mjs', 'entry.js', 'empty.js', 'entry.js'] + const expected = { + sizes: legacySizes(dir, all), + initialSizes: legacySizes(dir, initial), + } + const read = t.mock.method(fs, 'readFileSync') + const gzip = t.mock.method(zlib, 'gzipSync') + const brotli = t.mock.method(zlib, 'brotliCompressSync') + syncBuiltinESMExports() + t.after(() => { + t.mock.restoreAll() + syncBuiltinESMExports() + }) + + for (let measurement = 1; measurement <= 2; measurement++) { + assert.deepEqual(measureFileSizes(dir, all, initial), expected) + for (const operation of [read, gzip, brotli]) { + assert.equal(operation.mock.callCount(), 4 * measurement) + } + } +}) + +test('reports completed compression time when a later file cannot be read', (t) => { + const dir = fixture(t) + let now = 10 + t.mock.method(performance, 'now', () => now++) + const timings = [] + assert.throws( + () => + measureFileSizes(dir, ['entry.js', 'missing.js'], [], (...entry) => { + timings.push(entry) + }), + { code: 'ENOENT' }, + ) + assert.deepEqual(timings, [ + ['gzip', 1], + ['brotli', 1], + ]) +}) + +for (const codec of ['gzipSync', 'brotliCompressSync']) { + test(`reports time spent in failed ${codec} and preserves the original exception`, (t) => { + const dir = fixture(t) + const failure = new Error('codec failed') + let now = 20 + t.mock.method(performance, 'now', () => now++) + t.mock.method(zlib, codec, () => { + throw failure + }) + syncBuiltinESMExports() + t.after(() => { + t.mock.restoreAll() + syncBuiltinESMExports() + }) + + const timings = [] + assert.throws( + () => + measureFileSizes(dir, ['entry.js'], [], (...entry) => { + timings.push(entry) + }), + (error) => error === failure, + ) + assert.deepEqual(timings, [ + ['gzip', 1], + ['brotli', codec === 'gzipSync' ? 0 : 1], + ]) + }) +} diff --git a/scripts/benchmarks/bundle-size/measure.mjs b/scripts/benchmarks/bundle-size/measure.mjs index d6ed9eeba9..73631eb90b 100644 --- a/scripts/benchmarks/bundle-size/measure.mjs +++ b/scripts/benchmarks/bundle-size/measure.mjs @@ -7,11 +7,12 @@ import path from 'node:path' import { fileURLToPath, pathToFileURL } from 'node:url' import { parseArgs as parseNodeArgs } from 'node:util' import vm from 'node:vm' -import { brotliCompressSync, gzipSync } from 'node:zlib' import { execFileSync } from 'node:child_process' import { build } from 'vite' import { writeReport } from './report.mjs' +import { measureFileSizes } from './compress.mjs' +import { createTimings } from './timings.mjs' const BENCHMARK_NAME = 'Bundle Size (gzip)' @@ -168,6 +169,7 @@ function parseArgs(argv) { sourcemap: { type: 'boolean' }, 'skip-package-builds': { type: 'boolean' }, 'measurements-only': { type: 'boolean' }, + timings: { type: 'boolean' }, }, }) @@ -182,6 +184,7 @@ function parseArgs(argv) { sourcemap: values.sourcemap === true, skipPackageBuilds: values['skip-package-builds'] === true, measurementsOnly: values['measurements-only'] === true, + timings: values.timings === true || process.env.BUNDLE_SIZE_TIMINGS === '1', } } @@ -313,38 +316,6 @@ function collectAllViteJsFiles(manifest) { return [...files].sort() } -function sizesForFiles(baseDir, fileList) { - let rawBytes = 0 - let gzipBytes = 0 - let brotliBytes = 0 - const files = [] - - for (const relativeFile of fileList) { - const fullPath = path.join(baseDir, relativeFile) - const content = fs.readFileSync(fullPath) - const rawByteLength = content.byteLength - const gzipByteLength = gzipSync(content).byteLength - const brotliByteLength = brotliCompressSync(content).byteLength - - rawBytes += rawByteLength - gzipBytes += gzipByteLength - brotliBytes += brotliByteLength - files.push({ - file: relativeFile, - rawBytes: rawByteLength, - gzipBytes: gzipByteLength, - brotliBytes: brotliByteLength, - }) - } - - return { - rawBytes, - gzipBytes, - brotliBytes, - files, - } -} - async function findManifestFiles(rootDir) { const manifestPaths = [] @@ -880,7 +851,16 @@ async function appendHistoryFile({ historyPath, measuredAtIso, sha, benches }) { async function main() { const args = parseArgs(process.argv.slice(2)) + const timings = args.timings ? createTimings() : undefined + const finishOverall = timings?.start('overall') + try { + await measure(args, timings) + } finally { + finishOverall?.() + } +} +async function measure(args, timings) { if ( args.measurementsOnly && (args.sha || args.measuredAt || args.appendHistory) @@ -905,11 +885,19 @@ async function main() { : new Date().toISOString() const startedAt = Date.now() const scenarios = filterScenarios(args.scenario) - const packageBuildProjects = buildRequiredPackages({ - repoRoot, - scenarios, - skipPackageBuilds: args.skipPackageBuilds, - }) + const finishPackageBuilds = args.skipPackageBuilds + ? undefined + : timings?.start('package-builds') + let packageBuildProjects + try { + packageBuildProjects = buildRequiredPackages({ + repoRoot, + scenarios, + skipPackageBuilds: args.skipPackageBuilds, + }) + } finally { + finishPackageBuilds?.() + } await fsp.mkdir(resultsDir, { recursive: true }) await fsp.mkdir(distDir, { recursive: true }) @@ -920,18 +908,32 @@ async function main() { const root = path.join(scenariosRoot, scenario.dir) const outDir = path.join(distDir, scenario.outDir || scenario.dir) - await buildScenario({ - root, - outDir, - scenario, - sourcemap: args.sourcemap || args.analysis, - }) + const finishBuild = timings?.start('scenario-build', scenario.id) + try { + await buildScenario({ + root, + outDir, + scenario, + sourcemap: args.sourcemap || args.analysis, + }) + } finally { + finishBuild?.() + } - const bundleInfo = await resolveBundleFiles({ outDir, scenario }) - const sizes = sizesForFiles(bundleInfo.manifestOutDir, bundleInfo.jsFiles) - const initialSizes = sizesForFiles( + const finishManifest = timings?.start('manifest-resolution', scenario.id) + let bundleInfo + try { + bundleInfo = await resolveBundleFiles({ outDir, scenario }) + } finally { + finishManifest?.() + } + const { sizes, initialSizes } = measureFileSizes( bundleInfo.manifestOutDir, + bundleInfo.jsFiles, bundleInfo.initialJsFiles, + timings + ? (phase, durationMs) => timings.record(phase, durationMs, scenario.id) + : undefined, ) const initialFileSet = new Set(bundleInfo.initialJsFiles) const files = sizes.files.map((file) => ({ @@ -961,10 +963,15 @@ async function main() { } if (args.analysis) { - metric.sources = sourceAttributionForFiles( - bundleInfo.manifestOutDir, - bundleInfo.jsFiles, - ) + const finishAnalysis = timings?.start('analysis', scenario.id) + try { + metric.sources = sourceAttributionForFiles( + bundleInfo.manifestOutDir, + bundleInfo.jsFiles, + ) + } finally { + finishAnalysis?.() + } } metrics.push(metric) @@ -977,7 +984,7 @@ async function main() { measuredAt: measuredAtIso, status: { state: 'success', - command: `node ${path.relative(repoRoot, fileURLToPath(import.meta.url))}${args.scenario ? ` --scenario ${args.scenario}` : ''}${args.analysis ? ' --analysis' : ''}${args.sourcemap ? ' --sourcemap' : ''}${args.skipPackageBuilds ? ' --skip-package-builds' : ''}`, + command: `node ${path.relative(repoRoot, fileURLToPath(import.meta.url))}${args.scenario ? ` --scenario ${args.scenario}` : ''}${args.analysis ? ' --analysis' : ''}${args.sourcemap ? ' --sourcemap' : ''}${args.timings ? ' --timings' : ''}${args.skipPackageBuilds ? ' --skip-package-builds' : ''}`, scenarioFilter: args.scenario || null, measuredScenarios: scenarios.map((scenario) => scenario.id), packageBuildProjects, diff --git a/scripts/benchmarks/bundle-size/run.mjs b/scripts/benchmarks/bundle-size/run.mjs index 3e9d67cbfe..74d44e9fb8 100644 --- a/scripts/benchmarks/bundle-size/run.mjs +++ b/scripts/benchmarks/bundle-size/run.mjs @@ -49,6 +49,7 @@ export function run(argv, execute = spawnSync) { 'dist-dir': { type: 'string' }, analysis: { type: 'boolean' }, sourcemap: { type: 'boolean' }, + timings: { type: 'boolean' }, 'skip-package-builds': { type: 'boolean' }, help: { type: 'boolean', short: 'h' }, }, @@ -65,6 +66,7 @@ export function run(argv, execute = spawnSync) { --dist-dir Override the emitted bundle directory --analysis Include source attribution in current.json --sourcemap Emit hidden source maps + --timings Record fresh phase timings in measure.log --skip-package-builds Reuse package builds only when they are unchanged Named runs use /runs//current.json. @@ -221,6 +223,7 @@ Arguments after -- go to the selected unit tests, not the measurement.`) for (const [option, value] of Object.entries({ analysis: values.analysis, sourcemap: values.sourcemap, + timings: values.timings, 'skip-package-builds': values['skip-package-builds'], })) { if (value) { diff --git a/scripts/benchmarks/bundle-size/run.test.mjs b/scripts/benchmarks/bundle-size/run.test.mjs index b4072d81de..a8b927da07 100644 --- a/scripts/benchmarks/bundle-size/run.test.mjs +++ b/scripts/benchmarks/bundle-size/run.test.mjs @@ -114,6 +114,7 @@ test('runs targeted tests before measurement and saves named results and logs', assert.equal(measure.args[0], measurePath) assert.ok(measure.args.includes('react-router.minimal,react-router.full')) assert.ok(!measure.args.includes('--skip-package-builds')) + assert.ok(!measure.args.includes('--timings')) assert.ok(!measure.args.includes('tests/path.test.ts')) for (const { options } of calls) { assert.equal(options.env.CI, '1') @@ -167,6 +168,7 @@ test('accepts an external baseline and forwards measurement options', (t) => { path.join(root, 'dist with spaces'), '--analysis', '--sourcemap', + '--timings', '--skip-package-builds', ], execute, @@ -178,8 +180,10 @@ test('accepts an external baseline and forwards measurement options', (t) => { path.join(root, 'dist with spaces'), '--analysis', '--sourcemap', + '--timings', '--skip-package-builds', ]) + assert.ok(calls.slice(1).every(({ args }) => !args.includes('--timings'))) assert.match(reports.join(''), /100 -> 90 \(-10\)/) }) @@ -285,6 +289,10 @@ test('reports help and argument errors through the CLI entry point', () => { }) assert.equal(help.status, 0) assert.match(help.stdout, /Usage: pnpm benchmark:bundle-size:run/) + assert.match( + help.stdout, + /--timings\s+Record fresh phase timings in measure\.log/, + ) const invalid = spawnSync(process.execPath, [scriptPath, '--unknown'], { encoding: 'utf8', }) diff --git a/scripts/benchmarks/bundle-size/timings.mjs b/scripts/benchmarks/bundle-size/timings.mjs new file mode 100644 index 0000000000..15d856f96b --- /dev/null +++ b/scripts/benchmarks/bundle-size/timings.mjs @@ -0,0 +1,20 @@ +// Timings are diagnostics only; never include them in cacheable size metrics. +export function createTimings(write = (line) => process.stderr.write(line)) { + function record(phase, durationMs, scenario) { + write( + `[bundle-size:timing] ${JSON.stringify({ + phase, + ...(scenario ? { scenario } : {}), + durationMs: Math.round(durationMs * 1000) / 1000, + })}\n`, + ) + } + + return { + record, + start(phase, scenario) { + const started = performance.now() + return () => record(phase, performance.now() - started, scenario) + }, + } +} diff --git a/scripts/benchmarks/bundle-size/timings.test.mjs b/scripts/benchmarks/bundle-size/timings.test.mjs new file mode 100644 index 0000000000..8d895aadc5 --- /dev/null +++ b/scripts/benchmarks/bundle-size/timings.test.mjs @@ -0,0 +1,35 @@ +import assert from 'node:assert/strict' +import test from 'node:test' +import { createTimings } from './timings.mjs' + +test('emits labelled JSON timing lines with scenario context when supplied', (t) => { + let now = 100 + t.mock.method(performance, 'now', () => now) + const lines = [] + const timings = createTimings((line) => lines.push(line)) + timings.record('gzip', 1.234567, 'react-router.minimal') + const finishOverall = timings.start('overall') + now = 112.345678 + const finishScenario = timings.start('scenario-build', 'react-router.minimal') + now = 123.456789 + finishScenario() + now = 150.123456 + finishOverall() + + const records = lines.map((line) => { + assert.ok(line.startsWith('[bundle-size:timing] ')) + assert.ok(line.endsWith('\n')) + return JSON.parse(line.slice('[bundle-size:timing] '.length)) + }) + assert.deepEqual(records[0], { + phase: 'gzip', + scenario: 'react-router.minimal', + durationMs: 1.235, + }) + assert.deepEqual(records[1], { + phase: 'scenario-build', + scenario: 'react-router.minimal', + durationMs: 11.111, + }) + assert.deepEqual(records[2], { phase: 'overall', durationMs: 50.123 }) +}) diff --git a/skills/bundle-size-optimization/SKILL.md b/skills/bundle-size-optimization/SKILL.md index d0f1ec574e..34f7494efe 100644 --- a/skills/bundle-size-optimization/SKILL.md +++ b/skills/bundle-size-optimization/SKILL.md @@ -147,3 +147,8 @@ Rolldown removes code only when unused and side-effect-free. Property reads may - Skipping behavior or benchmark tests because the change is “only bundle size.” - Skipping hunk-level attribution and keeping changes only because the full candidate improved. - Trading runtime performance, security, readability, or maintainability for bytes. + +## Meta work + +If you need to work on the bundle size measurements / workflow themselves, +read `benchmarks/bundle-size/README.md` From ac223be01377f09fa8fd70ff52c9ba4b5dbcddfc Mon Sep 17 00:00:00 2001 From: Flo Date: Thu, 17 Sep 2026 11:46:56 +0200 Subject: [PATCH 053/175] fix(benchmarks): limit targeted bundle reports to measured scenarios (#8456) --- benchmarks/bundle-size/README.md | 4 + scripts/benchmarks/bundle-size/diff.mjs | 5 +- scripts/benchmarks/bundle-size/run.mjs | 2 + scripts/benchmarks/bundle-size/run.test.mjs | 157 ++++++++++++++++++-- 4 files changed, 155 insertions(+), 13 deletions(-) diff --git a/benchmarks/bundle-size/README.md b/benchmarks/bundle-size/README.md index b5dfc9c4d9..b5f7404480 100644 --- a/benchmarks/bundle-size/README.md +++ b/benchmarks/bundle-size/README.md @@ -114,6 +114,8 @@ Without `--name`, runs replace `current.json` and the logs for the steps they ru Emitted bundles still use the shared `dist/` directory. To retain emitted bundles for a candidate, pass a separate `--dist-dir`. `--baseline` accepts a run name or a JSON file path, such as `--baseline ./baseline.json`. +With `--scenario`, the comparison reports only the scenarios measured in the current run, even when the baseline contains more scenarios. Selected scenarios missing from the baseline remain visible with `n/a` for their baseline and deltas. +Without `--scenario`, comparisons include scenarios from either result file. `--results-dir ` changes the results root, including the location of named runs. Use the same scenario selection and measurement flags for the baseline and candidate. @@ -131,6 +133,8 @@ pnpm benchmark:bundle-size:diff --baseline /tmp/base-current.json --id react-rou pnpm benchmark:bundle-size:history --id react-router.minimal --top-deltas 20 ``` +Use `pnpm benchmark:bundle-size:diff --baseline /tmp/base-current.json --current-only` to compare only scenarios present in the current results. This applies to both text and `--json` output; an explicit `--id` takes precedence. + For source attribution, run an analysis build. This uses hidden source maps and writes source estimates into `current.json`; those estimates are for investigation only, not tracking. ```bash diff --git a/scripts/benchmarks/bundle-size/diff.mjs b/scripts/benchmarks/bundle-size/diff.mjs index bd698bb9eb..154c43ccd5 100644 --- a/scripts/benchmarks/bundle-size/diff.mjs +++ b/scripts/benchmarks/bundle-size/diff.mjs @@ -13,6 +13,7 @@ const { values } = parseArgs({ default: 'benchmarks/bundle-size/results/current.json', }, id: { type: 'string' }, + 'current-only': { type: 'boolean' }, json: { type: 'boolean' }, }, }) @@ -33,7 +34,9 @@ const baselineById = byId(readCurrent(values.baseline)) const currentById = byId(readCurrent(values.current)) const ids = values.id ? [values.id] - : [...new Set([...baselineById.keys(), ...currentById.keys()])].sort() + : values['current-only'] + ? [...currentById.keys()].sort() + : [...new Set([...baselineById.keys(), ...currentById.keys()])].sort() const rows = ids.map((id) => { const baseline = baselineById.get(id) diff --git a/scripts/benchmarks/bundle-size/run.mjs b/scripts/benchmarks/bundle-size/run.mjs index 74d44e9fb8..2e6d42c977 100644 --- a/scripts/benchmarks/bundle-size/run.mjs +++ b/scripts/benchmarks/bundle-size/run.mjs @@ -72,6 +72,7 @@ export function run(argv, execute = spawnSync) { Named runs use /runs//current.json. Without --name, current.json is replaced in the results root. Logs stay beside current.json; failures print a bounded log tail. +With --scenario, comparisons report only the scenarios measured in this run. Arguments after -- go to the selected unit tests, not the measurement.`) return 0 } @@ -244,6 +245,7 @@ Arguments after -- go to the selected unit tests, not the measurement.`) '--current', currentPath, ...(baselinePath ? ['--baseline', baselinePath] : []), + ...(baselinePath && values.scenario ? ['--current-only'] : []), ], false, ) diff --git a/scripts/benchmarks/bundle-size/run.test.mjs b/scripts/benchmarks/bundle-size/run.test.mjs index a8b927da07..335455cb5a 100644 --- a/scripts/benchmarks/bundle-size/run.test.mjs +++ b/scripts/benchmarks/bundle-size/run.test.mjs @@ -11,26 +11,28 @@ const scriptPath = fileURLToPath(new URL('./run.mjs', import.meta.url)) const measurePath = fileURLToPath(new URL('./measure.mjs', import.meta.url)) /** @param {string} filePath */ -function writeCurrent(filePath, gzipBytes = 100) { +function writeCurrent( + filePath, + gzipBytes = 100, + ids = ['react-router.minimal'], +) { fs.mkdirSync(path.dirname(filePath), { recursive: true }) fs.writeFileSync( filePath, JSON.stringify({ - metrics: [ - { - id: 'react-router.minimal', - gzipBytes, - initialGzipBytes: gzipBytes, - rawBytes: gzipBytes * 3, - brotliBytes: gzipBytes - 10, - }, - ], + metrics: ids.map((id) => ({ + id, + gzipBytes, + initialGzipBytes: gzipBytes, + rawBytes: gzipBytes * 3, + brotliBytes: gzipBytes - 10, + })), }), ) } /** @param {import('node:test').TestContext} t */ -function fixture(t) { +function fixture(t, measuredIds = ['react-router.minimal']) { const root = fs.mkdtempSync(path.join(os.tmpdir(), 'bundle-runner-')) t.after(() => fs.rmSync(root, { recursive: true, force: true })) /** @type {Array<{command: string, args: string[], options: import('./run.mjs').CommandOptions}>} */ @@ -52,7 +54,7 @@ function fixture(t) { if (args[0] === measurePath) { const outputDir = args[args.indexOf('--results-dir') + 1] assert.ok(outputDir) - writeCurrent(path.join(outputDir, 'current.json'), 90) + writeCurrent(path.join(outputDir, 'current.json'), 90, measuredIds) } if (options.stdio !== 'inherit') { fs.writeSync(options.stdio[1], 'noisy stdout\n') @@ -187,6 +189,137 @@ test('accepts an external baseline and forwards measurement options', (t) => { assert.match(reports.join(''), /100 -> 90 \(-10\)/) }) +test('targeted comparisons omit unrequested scenarios from a broader baseline', async (t) => { + for (const [ + scenario, + measuredIds, + ] of /** @type {Array<[string, string[]]>} */ ([ + ['react-router.minimal', ['react-router.minimal']], + ['react-router-minimal', ['react-router.minimal']], + [ + ' solid-router.minimal, react-router.minimal ', + ['solid-router.minimal', 'react-router.minimal'], + ], + ])) { + await t.test(scenario, (t) => { + const { root, reports, execute } = fixture(t, measuredIds) + writeCurrent(path.join(root, 'runs/baseline/current.json'), 100, [ + 'react-router.full', + 'react-router.minimal', + 'solid-router.minimal', + ]) + + assert.equal( + run( + [ + '--results-dir', + root, + '--baseline', + 'baseline', + '--scenario', + scenario, + ], + execute, + ), + 0, + ) + assert.equal( + reports.join(''), + [...measuredIds] + .sort() + .map((id) => `${id} 100 -> 90 (-10) initial=-10 raw=-30 brotli=-10\n`) + .join(''), + ) + }) + } +}) + +test('targeted comparisons keep measured scenarios missing from the baseline', (t) => { + const { root, reports, execute } = fixture(t) + writeCurrent(path.join(root, 'runs/baseline/current.json'), 100, [ + 'react-router.full', + ]) + + assert.equal( + run( + [ + '--results-dir', + root, + '--baseline', + 'baseline', + '--scenario', + 'react-router.minimal', + ], + execute, + ), + 0, + ) + assert.equal( + reports.join(''), + 'react-router.minimal n/a -> 90 (n/a) initial=n/a raw=n/a brotli=n/a\n', + ) +}) + +test('unfiltered comparisons retain baseline-only scenarios', (t) => { + const { root, reports, execute } = fixture(t) + writeCurrent(path.join(root, 'runs/baseline/current.json'), 100, [ + 'react-router.full', + ]) + + assert.equal( + run(['--results-dir', root, '--baseline', 'baseline'], execute), + 0, + ) + assert.equal( + reports.join(''), + 'react-router.full 100 -> n/a (n/a) initial=n/a raw=n/a brotli=n/a\n' + + 'react-router.minimal n/a -> 90 (n/a) initial=n/a raw=n/a brotli=n/a\n', + ) +}) + +test('current-only diffs filter JSON output and preserve explicit ID selection', (t) => { + const { root } = fixture(t) + const baseline = path.join(root, 'baseline.json') + const current = path.join(root, 'current.json') + writeCurrent(baseline, 100, ['react-router.full', 'react-router.minimal']) + writeCurrent(current, 90, ['solid-router.minimal', 'react-router.minimal']) + const args = [ + fileURLToPath(new URL('./diff.mjs', import.meta.url)), + '--baseline', + baseline, + '--current', + current, + '--current-only', + '--json', + ] + const result = spawnSync(process.execPath, args, { encoding: 'utf8' }) + assert.equal(result.status, 0, result.stderr) + assert.deepEqual(JSON.parse(result.stdout), [ + { + id: 'react-router.minimal', + baseline: 100, + current: 90, + delta: -10, + initialDelta: -10, + rawDelta: -30, + brotliDelta: -10, + }, + { id: 'solid-router.minimal', current: 90 }, + ]) + + const selected = spawnSync( + process.execPath, + [...args, '--id', 'react-router.full'], + { + encoding: 'utf8', + }, + ) + assert.equal(selected.status, 0, selected.stderr) + assert.deepEqual(JSON.parse(selected.stdout), [ + { id: 'react-router.full', baseline: 100 }, + ]) +}) + test('stops on test failure, preserves its exit code, and prints only a bounded log tail', (t) => { const { root, messages } = fixture(t) let callCount = 0 From 222300b82fe6f2a5e7e7f460ae21a2e35c6230d7 Mon Sep 17 00:00:00 2001 From: Caleb Zearing Date: Mon, 21 Sep 2026 13:15:10 -0700 Subject: [PATCH 054/175] fix(start-plugin-core): restore per route stylesheets on Windows (#8202) fix(start-plugin-core): normalize rspack route module paths for the Start manifest Co-authored-by: Caleb Zearing Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> --- .changeset/rsbuild-windows-route-manifest.md | 5 ++ .../src/rsbuild/normalized-client-build.ts | 18 ++++- .../rsbuild/normalized-client-build.test.ts | 65 +++++++++++++++++++ 3 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 .changeset/rsbuild-windows-route-manifest.md diff --git a/.changeset/rsbuild-windows-route-manifest.md b/.changeset/rsbuild-windows-route-manifest.md new file mode 100644 index 0000000000..ec78789008 --- /dev/null +++ b/.changeset/rsbuild-windows-route-manifest.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Fix the Rsbuild Start manifest dropping every route's stylesheets and preloads on Windows by normalizing rspack module paths to the POSIX form the generated route tree uses. diff --git a/packages/start-plugin-core/src/rsbuild/normalized-client-build.ts b/packages/start-plugin-core/src/rsbuild/normalized-client-build.ts index 43a4fcd1ca..126f281f95 100644 --- a/packages/start-plugin-core/src/rsbuild/normalized-client-build.ts +++ b/packages/start-plugin-core/src/rsbuild/normalized-client-build.ts @@ -16,6 +16,15 @@ type RspackCompilation = Rspack.Compilation type RspackCompilationChunk = Rspack.Chunk type RspackModule = Rspack.Module +const backslashRegex = /\\/g + +/** + * Convert an OS native path to the POSIX form used by the generated route tree. + */ +function toPosixPath(filePath: string): string { + return filePath.replace(backslashRegex, '/') +} + /** * Extract route file paths from rspack module identifiers. * @@ -46,7 +55,14 @@ function getRouteFilePathsFromModules( if (!new URLSearchParams(query).has(tsrSplit)) continue const nameForCondition = mod.nameForCondition() - const routeFilePath = nameForCondition ?? resourcePart.slice(0, queryIndex) + + // rspack reports module paths using the OS separator, while the generated route + // tree records every route `filePath` with POSIX separators. Normalize before the + // path becomes a manifest key, otherwise no route matches its chunk on Windows and + // every route loses its stylesheets and preloads. + const routeFilePath = toPosixPath( + nameForCondition ?? resourcePart.slice(0, queryIndex), + ) if (seen?.has(routeFilePath)) continue diff --git a/packages/start-plugin-core/tests/rsbuild/normalized-client-build.test.ts b/packages/start-plugin-core/tests/rsbuild/normalized-client-build.test.ts index 72139f2727..14546022a4 100644 --- a/packages/start-plugin-core/tests/rsbuild/normalized-client-build.test.ts +++ b/packages/start-plugin-core/tests/rsbuild/normalized-client-build.test.ts @@ -42,6 +42,46 @@ function makeCompilation(readCss: () => string | Uint8Array) { return compilation } +// Rspack reports module paths using the OS native separator on Windows +// (e.g. `C:\app\src\routes\posts.tsx`), while the generated route tree always +// records `filePath` with POSIX separators. This compilation mimics that +// Windows output so we can verify the route still keys its chunk correctly. +function makeWindowsCompilation(readCss: () => string | Uint8Array) { + const entryChunk = { + name: 'index', + files: new Set(['index.js', 'root.css']), + auxiliaryFiles: new Set(), + groupsIterable: new Set(), + } + const routeChunk = { + files: new Set(['posts.js']), + auxiliaryFiles: new Set(['posts.css']), + groupsIterable: new Set(), + } + const getAssets = () => [ + { name: 'root.css', source: { source: readCss } }, + { name: 'posts.css', source: { source: readCss } }, + ] + const compilation = { + entrypoints: new Map([['index', { chunks: [entryChunk] }]]), + chunks: new Set([entryChunk, routeChunk]), + chunkGraph: { + getChunkModules: (chunk: unknown) => + chunk === routeChunk + ? [ + { + identifier: () => + 'builtin:swc-loader??ruleSet[0]!C:\\app\\src\\routes\\posts.tsx?tsr-split=component', + nameForCondition: () => 'C:\\app\\src\\routes\\posts.tsx', + }, + ] + : [], + }, + getAssets, + } as unknown as Rspack.Compilation + return compilation +} + describe('normalizeRspackClientBuild', () => { test('keeps route stylesheet links with inline CSS disabled by default', () => { const compilation = makeCompilation(() => '.card{color:red}') @@ -106,4 +146,29 @@ describe('normalizeRspackClientBuild', () => { } }, ) + + test('keys the route chunk by a POSIX path when rspack reports OS native module paths', () => { + const compilation = makeWindowsCompilation(() => '.card{color:red}') + const clientBuild = normalizeRspackClientBuild(compilation) + + expect( + clientBuild.chunksByFileName.get('posts.js')?.routeFilePaths, + ).toEqual(['C:/app/src/routes/posts.tsx']) + }) + + test('gives a route its stylesheet and preload when rspack reports OS native module paths', () => { + const compilation = makeWindowsCompilation(() => '.card{color:red}') + const clientBuild = normalizeRspackClientBuild(compilation) + const manifest = buildStartManifest({ + clientBuild, + routeTreeRoutes: { + __root__: {}, + '/posts': { filePath: 'C:/app/src/routes/posts.tsx' }, + }, + basePath: '/assets', + }) + + expect(manifest.routes['/posts']?.css).toEqual(['/assets/posts.css']) + expect(manifest.routes['/posts']?.preloads).toEqual(['/assets/posts.js']) + }) }) From fe7f1fd0e6ef73c3f341dd2338b406749538a85d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 22:20:15 +0200 Subject: [PATCH 055/175] ci: Version Packages (#8477) ci: changeset release Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/rsbuild-windows-route-manifest.md | 5 ----- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-authjs/package.json | 2 +- examples/react/start-basic-cloudflare/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsbuild/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-bun/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-i18n-paraglide/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-next-migration/package.json | 2 +- examples/react/start-rscs/package.json | 2 +- .../package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/solid/start-basic-auth/package.json | 2 +- examples/solid/start-basic-authjs/package.json | 2 +- examples/solid/start-basic-cloudflare/package.json | 2 +- examples/solid/start-basic-netlify/package.json | 2 +- examples/solid/start-basic-nitro/package.json | 2 +- examples/solid/start-basic-solid-query/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- examples/solid/start-bun/package.json | 2 +- examples/solid/start-convex-better-auth/package.json | 2 +- examples/solid/start-counter/package.json | 2 +- examples/solid/start-i18n-paraglide/package.json | 2 +- examples/solid/start-large/package.json | 2 +- .../package.json | 2 +- examples/solid/start-supabase-basic/package.json | 2 +- examples/solid/start-tailwind-v4/package.json | 2 +- packages/react-start-rsc/CHANGELOG.md | 7 +++++++ packages/react-start-rsc/package.json | 2 +- packages/react-start/CHANGELOG.md | 8 ++++++++ packages/react-start/package.json | 2 +- packages/solid-start/CHANGELOG.md | 7 +++++++ packages/solid-start/package.json | 2 +- packages/start-plugin-core/CHANGELOG.md | 6 ++++++ packages/start-plugin-core/package.json | 2 +- packages/vue-start/CHANGELOG.md | 7 +++++++ packages/vue-start/package.json | 2 +- 49 files changed, 78 insertions(+), 48 deletions(-) delete mode 100644 .changeset/rsbuild-windows-route-manifest.md diff --git a/.changeset/rsbuild-windows-route-manifest.md b/.changeset/rsbuild-windows-route-manifest.md deleted file mode 100644 index ec78789008..0000000000 --- a/.changeset/rsbuild-windows-route-manifest.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/start-plugin-core': patch ---- - -Fix the Rsbuild Start manifest dropping every route's stylesheets and preloads on Windows by normalizing rspack module paths to the POSIX form the generated route tree uses. diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index ce3a89fd68..197481022e 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "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 72710a9d50..81f0c83208 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index 5332a96d16..dd0507fafa 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "react": "^19.0.0", "react-dom": "^19.0.0", "start-authjs": "^1.0.0", diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index 0c96dd0ca9..66746d5b9d 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index daf7c83170..a56fad4cbf 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -16,7 +16,7 @@ "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json index ff6f97a1a4..da56a79f60 100644 --- a/examples/react/start-basic-rsbuild/package.json +++ b/examples/react/start-basic-rsbuild/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "react": "^19.2.3", "react-dom": "^19.2.3", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 9276c1665b..e1bd3b958a 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "@tanstack/start-static-server-functions": "^1.167.37", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 48b48dade3..72dbecf15e 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index a204b130e3..58d64d6541 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -18,7 +18,7 @@ "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "@tanstack/router-plugin": "^1.168.40", "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 97c2f818b8..d574a0432c 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index b086e1361e..a74c6296da 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.38", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index ca42a88d13..f162d4e4ca 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "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 fa951ceb07..691291f332 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "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 0f1a3359bb..63fc5cd0c9 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -15,7 +15,7 @@ "@tanstack/react-query": "^5.102.0", "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "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 82a68c4775..c66291fb17 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json index 48a5db46d1..c59375f2db 100644 --- a/examples/react/start-next-migration/package.json +++ b/examples/react/start-next-migration/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@tanstack/react-router": "^1.170.38", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "iron-session": "^9.0.0", "next": "16.3.4", "react": "^19.2.3", diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index 9a7960ed25..6c92fb248c 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "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 b43b1b8861..f07e1656e2 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "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 8bf094d0ed..4a056a37ec 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 675f3db646..e8540a8a73 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "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 76c362eb4b..1fba60f4e9 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -15,7 +15,7 @@ "@tanstack/react-router": "^1.170.38", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 1d68e74632..c912ef8e12 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.38", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.56", + "@tanstack/react-start": "^1.168.57", "@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 79c9d3ecdb..6d447f50e7 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index 49511a05ad..679723e9de 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "solid-js": "^1.9.10", "start-authjs": "^1.0.0", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json index 3e5a2ef79e..d42bf4f2cd 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json index f2cf549404..eb5509fe35 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json index ef3fa3a998..373f8e3f42 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json index ce09a1f67e..504fd1e767 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.36", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 20f43dd6e5..649beed13b 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "@tanstack/start-static-server-functions": "^1.167.37", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 61fe51dec7..c12b6f5245 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index a4cc5eb8cb..9a8122e752 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -18,7 +18,7 @@ "@tanstack/solid-router": "^1.170.36", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "@tanstack/router-plugin": "^1.168.40", "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 2f7db4ed88..60881b59ad 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "better-auth": "^1.6.19", "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 9950628bcd..957831f21b 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "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 e304a0fbd1..29a01c3200 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index 3adcaf907a..7493ce627d 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "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 a51e5b7829..48cdbea77c 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "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 c2df01371d..17fe16afb9 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "solid-js": "^1.9.9", "redaxios": "^0.5.1" }, diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json index 4dd8e97c08..4947a8d930 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.36", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.54", + "@tanstack/solid-start": "^1.168.55", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index 2919c4e879..ca44b1a31d 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/react-start-rsc +## 0.1.56 + +### Patch Changes + +- Updated dependencies [[`222300b`](https://github.com/TanStack/router/commit/222300b82fe6f2a5e7e7f460ae21a2e35c6230d7)]: + - @tanstack/start-plugin-core@1.171.47 + ## 0.1.55 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index ae593ed6f7..97b0c83185 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.55", + "version": "0.1.56", "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 18d437117f..387e26fb56 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,5 +1,13 @@ # @tanstack/react-start +## 1.168.57 + +### Patch Changes + +- Updated dependencies [[`222300b`](https://github.com/TanStack/router/commit/222300b82fe6f2a5e7e7f460ae21a2e35c6230d7)]: + - @tanstack/start-plugin-core@1.171.47 + - @tanstack/react-start-rsc@0.1.56 + ## 1.168.56 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 6ac67a4dbd..5a26227e26 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.168.56", + "version": "1.168.57", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/CHANGELOG.md b/packages/solid-start/CHANGELOG.md index d234f8f514..16bf8e9704 100644 --- a/packages/solid-start/CHANGELOG.md +++ b/packages/solid-start/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/solid-start +## 1.168.55 + +### Patch Changes + +- Updated dependencies [[`222300b`](https://github.com/TanStack/router/commit/222300b82fe6f2a5e7e7f460ae21a2e35c6230d7)]: + - @tanstack/start-plugin-core@1.171.47 + ## 1.168.54 ### Patch Changes diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index a7e22858ec..7162f6edc7 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.168.54", + "version": "1.168.55", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/CHANGELOG.md b/packages/start-plugin-core/CHANGELOG.md index 7236af6571..9e444715c2 100644 --- a/packages/start-plugin-core/CHANGELOG.md +++ b/packages/start-plugin-core/CHANGELOG.md @@ -1,5 +1,11 @@ # @tanstack/start-plugin-core +## 1.171.47 + +### Patch Changes + +- [#8202](https://github.com/TanStack/router/pull/8202) [`222300b`](https://github.com/TanStack/router/commit/222300b82fe6f2a5e7e7f460ae21a2e35c6230d7) - Fix the Rsbuild Start manifest dropping every route's stylesheets and preloads on Windows by normalizing rspack module paths to the POSIX form the generated route tree uses. + ## 1.171.46 ### Patch Changes diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index dc88254aeb..ac3af33d38 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.46", + "version": "1.171.47", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start/CHANGELOG.md b/packages/vue-start/CHANGELOG.md index 872b188fb1..40b54afc04 100644 --- a/packages/vue-start/CHANGELOG.md +++ b/packages/vue-start/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/vue-start +## 1.168.54 + +### Patch Changes + +- Updated dependencies [[`222300b`](https://github.com/TanStack/router/commit/222300b82fe6f2a5e7e7f460ae21a2e35c6230d7)]: + - @tanstack/start-plugin-core@1.171.47 + ## 1.168.53 ### Patch Changes diff --git a/packages/vue-start/package.json b/packages/vue-start/package.json index babdb4e20d..4c962af10e 100644 --- a/packages/vue-start/package.json +++ b/packages/vue-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start", - "version": "1.168.53", + "version": "1.168.54", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", From 73bfc153eef460e9b670556215a5adb2b5cbf542 Mon Sep 17 00:00:00 2001 From: Flo Date: Wed, 23 Sep 2026 14:00:26 +0200 Subject: [PATCH 056/175] perf(react-router): avoid redundant link hydration updates (#8435) * perf(react-router): avoid redundant link hydration updates * refactor(react-router): hide hydration flag behind internal overload --- .changeset/large-rockets-push.md | 5 + packages/react-router/src/ClientOnly.tsx | 16 +- packages/react-router/src/link.tsx | 2 +- .../tests/link-hydration.test.tsx | 203 ++++++++++++++++++ 4 files changed, 223 insertions(+), 3 deletions(-) create mode 100644 .changeset/large-rockets-push.md create mode 100644 packages/react-router/tests/link-hydration.test.tsx diff --git a/.changeset/large-rockets-push.md b/.changeset/large-rockets-push.md new file mode 100644 index 0000000000..99f158c890 --- /dev/null +++ b/.changeset/large-rockets-push.md @@ -0,0 +1,5 @@ +--- +'@tanstack/react-router': patch +--- + +Avoid hydration-triggered rerenders for links that do not compare URL hashes while preserving hash-sensitive active state and ClientOnly behavior. diff --git a/packages/react-router/src/ClientOnly.tsx b/packages/react-router/src/ClientOnly.tsx index c139b05d0a..010a6d3117 100644 --- a/packages/react-router/src/ClientOnly.tsx +++ b/packages/react-router/src/ClientOnly.tsx @@ -56,8 +56,20 @@ export function ClientOnly({ children, fallback = null }: ClientOnlyProps) { * ``` * @returns True if the JS has been hydrated already, false otherwise. */ -export function useHydrated(): boolean { - return React.useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot) +export function useHydrated(): boolean +/** + * @internal + * callers whose output does not depend on hydration can keep the + * same snapshot on both sides, avoiding an unnecessary post-hydration render. + */ +export function useHydrated(enabled: boolean): boolean +/** @internal */ +export function useHydrated(enabled = true): boolean { + return React.useSyncExternalStore( + subscribe, + getSnapshot, + enabled ? getServerSnapshot : getSnapshot, + ) } function subscribe() { diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 26ec05a848..94bf0f5ad1 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -257,7 +257,7 @@ export function useLinkProps< } = options as typeof options & { to?: string } // eslint-disable-next-line react-hooks/rules-of-hooks - const isHydrated = useHydrated() + const isHydrated = useHydrated(!!activeOptions?.includeHash) // eslint-disable-next-line react-hooks/rules-of-hooks const [stableSearch, stableParams, stableActiveOptions] = useStableValues( diff --git a/packages/react-router/tests/link-hydration.test.tsx b/packages/react-router/tests/link-hydration.test.tsx new file mode 100644 index 0000000000..497464b3f8 --- /dev/null +++ b/packages/react-router/tests/link-hydration.test.tsx @@ -0,0 +1,203 @@ +import React from 'react' +import { renderToString } from 'react-dom/server' +import { hydrateRoot } from 'react-dom/client' +import { act } from '@testing-library/react' +import { expect, test, vi } from 'vitest' +import { + Link, + RouterContextProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, +} from '../src' + +test('only hash-sensitive links need a second hydration render', async () => { + const rootRoute = createRootRoute() + const router = createRouter({ + routeTree: rootRoute.addChildren([ + createRoute({ getParentRoute: () => rootRoute, path: '/target' }), + ]), + history: createMemoryHistory({ initialEntries: ['/target#section'] }), + }) + await router.load() + const serverRouter = createRouter({ + routeTree: router.routeTree, + history: createMemoryHistory({ initialEntries: ['/target'] }), + isServer: true, + }) + await serverRouter.load() + const ordinary = vi.fn(({ isActive }: { isActive: boolean }) => + String(isActive), + ) + const hashSensitive = vi.fn(({ isActive }: { isActive: boolean }) => + String(isActive), + ) + const tree = (includeHash = false, contextRouter = router) => ( + + + {ordinary} + + + {hashSensitive} + + + ) + const container = document.createElement('div') + document.body.append(container) + container.innerHTML = renderToString(tree(false, serverRouter)) + expect(container.querySelector('[data-testid="ordinary"]')?.textContent).toBe( + 'true', + ) + expect(container.querySelector('[data-testid="hash"]')?.textContent).toBe( + 'false', + ) + ordinary.mockClear() + hashSensitive.mockClear() + const onRecoverableError = vi.fn() + const diagnostics = vi.spyOn(console, 'error').mockImplementation(() => {}) + const serverAnchor = container.querySelector('[data-testid="ordinary"]') + let root: ReturnType | undefined + try { + await act(() => { + root = hydrateRoot(container, tree(), { onRecoverableError }) + }) + expect(ordinary).toHaveBeenCalledTimes(1) + expect(container.querySelector('[data-testid="ordinary"]')).toBe( + serverAnchor, + ) + expect(hashSensitive.mock.calls.map(([state]) => state.isActive)).toEqual([ + false, + true, + ]) + expect(container.querySelector('[data-testid="hash"]')).toHaveAttribute( + 'aria-current', + 'page', + ) + expect(container.querySelector('[data-testid="hash"]')).toHaveAttribute( + 'title', + 'active', + ) + await act(() => root!.render(tree(true))) + expect( + container.querySelector('[data-testid="ordinary"]'), + ).not.toHaveAttribute('aria-current') + expect(container.querySelector('[data-testid="ordinary"]')).toHaveAttribute( + 'title', + 'inactive', + ) + await act(() => root!.render(tree(false))) + expect(container.querySelector('[data-testid="ordinary"]')).toHaveAttribute( + 'aria-current', + 'page', + ) + expect(onRecoverableError).not.toHaveBeenCalled() + expect(diagnostics).not.toHaveBeenCalled() + } finally { + await act(() => root?.unmount()) + router.history.destroy() + serverRouter.history.destroy() + diagnostics.mockRestore() + container.remove() + } +}) + +test('hash-sensitive links retain the server snapshot in a delayed hydration boundary', async () => { + const rootRoute = createRootRoute() + const routeTree = rootRoute.addChildren([ + createRoute({ getParentRoute: () => rootRoute, path: '/target' }), + ]) + const serverRouter = createRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/target'] }), + isServer: true, + }) + const clientRouter = createRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/target#section'] }), + }) + await Promise.all([serverRouter.load(), clientRouter.load()]) + let ready = true + let resolve!: () => void + const pending = new Promise((done) => { + resolve = done + }) + const ordinary = vi.fn(() => 'ordinary') + const hashSensitive = vi.fn(({ isActive }: { isActive: boolean }) => + String(isActive), + ) + function DeferredLinks() { + if (!ready) { + throw pending + } + return ( + <> + {ordinary} + + {hashSensitive} + + + ) + } + const tree = (router: typeof clientRouter) => ( + + Loading

}> + +
+
+ ) + const container = document.createElement('div') + document.body.append(container) + container.innerHTML = renderToString(tree(serverRouter)) + const serverAnchor = container.querySelector('a') + ordinary.mockClear() + hashSensitive.mockClear() + ready = false + const onRecoverableError = vi.fn() + const diagnostics = vi.spyOn(console, 'error').mockImplementation(() => {}) + let root: ReturnType | undefined + try { + await act(() => { + root = hydrateRoot(container, tree(clientRouter), { onRecoverableError }) + }) + expect(ordinary).not.toHaveBeenCalled() + expect(hashSensitive).not.toHaveBeenCalled() + await act(async () => { + ready = true + resolve() + await pending + }) + expect(ordinary).toHaveBeenCalledTimes(1) + expect(hashSensitive.mock.calls.map(([state]) => state.isActive)).toEqual([ + false, + true, + ]) + expect(container.querySelector('a')).toBe(serverAnchor) + expect(container.querySelectorAll('a')[1]).toHaveAttribute( + 'aria-current', + 'page', + ) + expect(onRecoverableError).not.toHaveBeenCalled() + expect(diagnostics).not.toHaveBeenCalled() + } finally { + await act(() => root?.unmount()) + serverRouter.history.destroy() + clientRouter.history.destroy() + diagnostics.mockRestore() + container.remove() + } +}) From ddad69a4a4b18c19e3fcc510ac1e21f9dab883a7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2026 15:28:58 +0200 Subject: [PATCH 057/175] ci: Version Packages (#8486) ci: changeset release Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/large-rockets-push.md | 5 ----- .../react/authenticated-routes-firebase/package.json | 2 +- examples/react/authenticated-routes/package.json | 2 +- .../react/basic-default-search-params/package.json | 2 +- examples/react/basic-devtools-panel/package.json | 2 +- examples/react/basic-file-based/package.json | 2 +- examples/react/basic-non-nested-devtools/package.json | 2 +- .../react/basic-react-query-file-based/package.json | 2 +- examples/react/basic-react-query/package.json | 2 +- examples/react/basic-ssr-file-based/package.json | 2 +- .../react/basic-ssr-streaming-file-based/package.json | 2 +- examples/react/basic-virtual-file-based/package.json | 2 +- .../react/basic-virtual-inside-file-based/package.json | 2 +- examples/react/basic/package.json | 2 +- examples/react/deferred-data/package.json | 2 +- examples/react/i18n-paraglide/package.json | 2 +- examples/react/kitchen-sink-file-based/package.json | 2 +- .../kitchen-sink-react-query-file-based/package.json | 2 +- examples/react/kitchen-sink-react-query/package.json | 2 +- examples/react/kitchen-sink/package.json | 2 +- examples/react/large-file-based/package.json | 2 +- examples/react/location-masking/package.json | 2 +- examples/react/navigation-blocking/package.json | 2 +- .../react/quickstart-esbuild-file-based/package.json | 2 +- examples/react/quickstart-file-based/package.json | 2 +- .../react/quickstart-rspack-file-based/package.json | 2 +- .../react/quickstart-webpack-file-based/package.json | 2 +- examples/react/quickstart/package.json | 2 +- .../react/router-monorepo-react-query/package.json | 2 +- .../packages/router/package.json | 2 +- .../react/router-monorepo-simple-lazy/package.json | 2 +- .../packages/router/package.json | 2 +- examples/react/router-monorepo-simple/package.json | 2 +- .../packages/router/package.json | 2 +- examples/react/scroll-restoration/package.json | 2 +- examples/react/search-validator-adapters/package.json | 2 +- examples/react/start-bare/package.json | 4 ++-- examples/react/start-basic-auth/package.json | 4 ++-- examples/react/start-basic-authjs/package.json | 4 ++-- examples/react/start-basic-cloudflare/package.json | 4 ++-- examples/react/start-basic-react-query/package.json | 4 ++-- examples/react/start-basic-rsbuild/package.json | 4 ++-- examples/react/start-basic-static/package.json | 4 ++-- examples/react/start-basic/package.json | 4 ++-- examples/react/start-bun/package.json | 4 ++-- examples/react/start-clerk-basic/package.json | 4 ++-- examples/react/start-convex-trellaux/package.json | 4 ++-- examples/react/start-counter/package.json | 4 ++-- examples/react/start-i18n-paraglide/package.json | 4 ++-- examples/react/start-large/package.json | 4 ++-- examples/react/start-material-ui/package.json | 4 ++-- examples/react/start-next-migration/package.json | 4 ++-- examples/react/start-rscs/package.json | 4 ++-- .../package.json | 4 ++-- examples/react/start-supabase-basic/package.json | 4 ++-- examples/react/start-tailwind-v4/package.json | 4 ++-- examples/react/start-trellaux/package.json | 4 ++-- examples/react/start-workos/package.json | 4 ++-- examples/react/view-transitions/package.json | 2 +- examples/react/with-framer-motion/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- packages/react-router/CHANGELOG.md | 6 ++++++ packages/react-router/package.json | 2 +- packages/react-start-client/CHANGELOG.md | 7 +++++++ packages/react-start-client/package.json | 2 +- packages/react-start-rsc/CHANGELOG.md | 7 +++++++ packages/react-start-rsc/package.json | 2 +- packages/react-start-server/CHANGELOG.md | 7 +++++++ packages/react-start-server/package.json | 2 +- packages/react-start/CHANGELOG.md | 10 ++++++++++ packages/react-start/package.json | 2 +- 72 files changed, 125 insertions(+), 93 deletions(-) delete mode 100644 .changeset/large-rockets-push.md diff --git a/.changeset/large-rockets-push.md b/.changeset/large-rockets-push.md deleted file mode 100644 index 99f158c890..0000000000 --- a/.changeset/large-rockets-push.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/react-router': patch ---- - -Avoid hydration-triggered rerenders for links that do not compare URL hashes while preserving hash-sensitive active state and ClientOnly behavior. diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 5a2dd24144..73fa665077 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "firebase": "^11.4.0", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index ac4c79626d..b958329866 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index c09f5a4e42..b3d020db16 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 01127e38ee..9cb9638a8d 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.67.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 32597ca25d..317d8378c8 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 5cd3457922..a8dfcdc76b 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 2a4148c136..623ad075d4 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index b314bfc5c4..64eea90b33 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.json index 19c34de508..6bbdac76b1 100644 --- a/examples/react/basic-ssr-file-based/package.json +++ b/examples/react/basic-ssr-file-based/package.json @@ -11,7 +11,7 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/router-plugin": "^1.168.40", "compression": "^1.8.0", "express": "^5.2.1", diff --git a/examples/react/basic-ssr-streaming-file-based/package.json b/examples/react/basic-ssr-streaming-file-based/package.json index 190f226f66..a72fa5c3f8 100644 --- a/examples/react/basic-ssr-streaming-file-based/package.json +++ b/examples/react/basic-ssr-streaming-file-based/package.json @@ -11,7 +11,7 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/router-plugin": "^1.168.40", "compression": "^1.8.0", "express": "^5.2.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 681a77c011..9881a1a322 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "@tanstack/virtual-file-routes": "^1.162.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 5b739b829f..157c32c0a9 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "@tanstack/virtual-file-routes": "^1.162.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 501c432f16..460cae32f4 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 35f3af4399..02d9aeffd9 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/i18n-paraglide/package.json b/examples/react/i18n-paraglide/package.json index fac0be9548..014a0f2378 100644 --- a/examples/react/i18n-paraglide/package.json +++ b/examples/react/i18n-paraglide/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/router-plugin": "^1.168.40", "react": "^19.1.1", "react-dom": "^19.1.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index f1992c0157..ce4bc0eec5 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "immer": "^10.1.1", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 40f1866e31..ee69914c6a 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "immer": "^10.1.1", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 92ae795961..2778c1c1e9 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 23b489366a..38a99e95ba 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 32f14c0d79..c9eeb1c1b3 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -13,7 +13,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 5d755394f1..1104cdd075 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -12,7 +12,7 @@ "@radix-ui/react-dialog": "^1.1.6", "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index ae9bac9a06..f2a8b477a5 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 7fd805bce2..f0ee7663c0 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,7 +9,7 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 732790fb1c..d9b2530d1e 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 12df148bf3..633269b165 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "postcss": "^8.5.1", "react": "^19.0.0", diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 83438e8eb5..1a5bd570f3 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,7 +7,7 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0" diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index c159029401..fcd2da032a 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 52f15cd866..08d38884b7 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 6806a7961c..4b3313c57e 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -11,7 +11,7 @@ "@router-mono-react-query/post-query": "workspace:*", "@tanstack/history": "^1.162.4", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 1ac497e230..46f0b2e271 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,7 +8,7 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index e9ed02c574..96910e4f39 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,7 +9,7 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 78c38fa25c..be2c12d34a 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,7 +8,7 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 926f2b1db3..cb8222f91d 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,7 +9,7 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index dfd65f61b2..99eed8b357 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-virtual": "^3.13.0", "react": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 5ec3a48650..231b268bdc 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -13,7 +13,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "@tanstack/valibot-adapter": "^1.167.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 197481022e..6fa39c3423 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "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 81f0c83208..af1c40f4fe 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index dd0507fafa..a5e58de81c 100644 --- a/examples/react/start-basic-authjs/package.json +++ b/examples/react/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "react": "^19.0.0", "react-dom": "^19.0.0", "start-authjs": "^1.0.0", diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index 66746d5b9d..a4d17b909b 100644 --- a/examples/react/start-basic-cloudflare/package.json +++ b/examples/react/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index a56fad4cbf..54cbeeab85 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -13,10 +13,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json index da56a79f60..bb2c175c32 100644 --- a/examples/react/start-basic-rsbuild/package.json +++ b/examples/react/start-basic-rsbuild/package.json @@ -10,9 +10,9 @@ "start": "srvx --prod -s ../client dist/server/index.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "react": "^19.2.3", "react-dom": "^19.2.3", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index e1bd3b958a..3574c5cea0 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "@tanstack/start-static-server-functions": "^1.167.37", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 72dbecf15e..961d21451a 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index 58d64d6541..34956d9ff6 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -15,10 +15,10 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "@tanstack/router-plugin": "^1.168.40", "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 d574a0432c..090593c7cc 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "^0.27.14", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index a74c6296da..fb9ce5bee4 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -15,10 +15,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index f162d4e4ca..b7dcf18aec 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "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 691291f332..c8b714368b 100644 --- a/examples/react/start-i18n-paraglide/package.json +++ b/examples/react/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "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 63fc5cd0c9..ef3221f15d 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "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 c66291fb17..120b5deff1 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,9 +15,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json index c59375f2db..87d6633c68 100644 --- a/examples/react/start-next-migration/package.json +++ b/examples/react/start-next-migration/package.json @@ -12,8 +12,8 @@ "test:e2e": "playwright test" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-router": "^1.170.39", + "@tanstack/react-start": "^1.168.58", "iron-session": "^9.0.0", "next": "16.3.4", "react": "^19.2.3", diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index 6c92fb248c..c4af666482 100644 --- a/examples/react/start-rscs/package.json +++ b/examples/react/start-rscs/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "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 f07e1656e2..c134912d54 100644 --- a/examples/react/start-streaming-data-from-server-functions/package.json +++ b/examples/react/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "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 4a056a37ec..1db4e6dd6a 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index e8540a8a73..b1eb226102 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "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 1fba60f4e9..65b0629c2b 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index c912ef8e12..5d58c347b4 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.3.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.57", + "@tanstack/react-start": "^1.168.58", "@workos/authkit-tanstack-react-start": "^0.5.0", "react": "^19.0.0", "react-dom": "^19.0.0" diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 986add9cb8..ee48312eb4 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "react": "^19.0.0", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 12b55bf048..7f6bca1157 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "framer-motion": "^11.18.2", "react": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 8f4fc275b6..94e69c6992 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "@trpc/client": "^11.4.3", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index f1632d8133..13a419b0de 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.38", + "@tanstack/react-router": "^1.170.39", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/router-plugin": "^1.168.40", "@trpc/client": "^11.4.3", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 94d54a4bd7..9d0d463bc3 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,11 @@ # @tanstack/react-router +## 1.170.39 + +### Patch Changes + +- [#8435](https://github.com/TanStack/router/pull/8435) [`73bfc15`](https://github.com/TanStack/router/commit/73bfc153eef460e9b670556215a5adb2b5cbf542) - Avoid hydration-triggered rerenders for links that do not compare URL hashes while preserving hash-sensitive active state and ClientOnly behavior. + ## 1.170.38 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 63624917f5..a1cc6e0f2e 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.170.38", + "version": "1.170.39", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/CHANGELOG.md b/packages/react-start-client/CHANGELOG.md index 15995d2c0f..1155719836 100644 --- a/packages/react-start-client/CHANGELOG.md +++ b/packages/react-start-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/react-start-client +## 1.168.37 + +### Patch Changes + +- Updated dependencies [[`73bfc15`](https://github.com/TanStack/router/commit/73bfc153eef460e9b670556215a5adb2b5cbf542)]: + - @tanstack/react-router@1.170.39 + ## 1.168.36 ### Patch Changes diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index b6ff394f09..0a60883f1f 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.168.36", + "version": "1.168.37", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index ca44b1a31d..7867be3565 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/react-start-rsc +## 0.1.57 + +### Patch Changes + +- Updated dependencies [[`73bfc15`](https://github.com/TanStack/router/commit/73bfc153eef460e9b670556215a5adb2b5cbf542)]: + - @tanstack/react-router@1.170.39 + ## 0.1.56 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index 97b0c83185..f698c78588 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.56", + "version": "0.1.57", "description": "React Server Components support for TanStack Start", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/CHANGELOG.md b/packages/react-start-server/CHANGELOG.md index 5bc820d2cb..857ed88089 100644 --- a/packages/react-start-server/CHANGELOG.md +++ b/packages/react-start-server/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/react-start-server +## 1.167.44 + +### Patch Changes + +- Updated dependencies [[`73bfc15`](https://github.com/TanStack/router/commit/73bfc153eef460e9b670556215a5adb2b5cbf542)]: + - @tanstack/react-router@1.170.39 + ## 1.167.43 ### Patch Changes diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 20d4704d95..c756eee40f 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.167.43", + "version": "1.167.44", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/CHANGELOG.md b/packages/react-start/CHANGELOG.md index 387e26fb56..11cf3a6c31 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,5 +1,15 @@ # @tanstack/react-start +## 1.168.58 + +### Patch Changes + +- Updated dependencies [[`73bfc15`](https://github.com/TanStack/router/commit/73bfc153eef460e9b670556215a5adb2b5cbf542)]: + - @tanstack/react-router@1.170.39 + - @tanstack/react-start-client@1.168.37 + - @tanstack/react-start-rsc@0.1.57 + - @tanstack/react-start-server@1.167.44 + ## 1.168.57 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 5a26227e26..bae48b3dbe 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.168.57", + "version": "1.168.58", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47 Mon Sep 17 00:00:00 2001 From: Flo Date: Fri, 25 Sep 2026 16:16:41 +0200 Subject: [PATCH 058/175] fix(router-core): retire invalidated loader reservations (#8460) --- .changeset/retire-invalidated-reservations.md | 5 ++ packages/router-core/src/router.ts | 11 +++- .../invalidation-reserved-flight.test.ts | 55 +++++++++++++++++++ 3 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 .changeset/retire-invalidated-reservations.md create mode 100644 packages/router-core/tests/invalidation-reserved-flight.test.ts diff --git a/.changeset/retire-invalidated-reservations.md b/.changeset/retire-invalidated-reservations.md new file mode 100644 index 0000000000..ed37b81e13 --- /dev/null +++ b/.changeset/retire-invalidated-reservations.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Abort reserved loader generations with no remaining owners when invalidation removes them from discovery, ensuring their public abort signals are retired. diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 1974690b39..97e060fd57 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -2516,11 +2516,11 @@ export class RouterCore< this._cache.forEach(consider) preloads?.forEach((matches) => matches.forEach(consider)) this._tx?.[3 /* matches */].forEach(consider) - const discardedPreloads: Array = [] + const abort: Array = [] for (const [controller, matches] of preloads ?? []) { if (matches.some((match) => invalidIds.has(match.id))) { preloads!.delete(controller) - discardedPreloads.push(controller) + abort.push(controller) } } const invalidate = (d: MakeRouteMatch) => { @@ -2557,9 +2557,14 @@ export class RouterCore< // The superseding load must not discover any same-ID generation selected // for replacement. Existing owners release it in their normal order. for (const id of invalidIds) { + const flight = this._flights?.get(id) this._flights?.delete(id) + // A reserved discovery has no remaining match owner to retire it later. + if (flight && !flight[2 /* leases */]) { + abort.push(flight[1 /* controller */]) + } } - for (const controller of discardedPreloads) { + for (const controller of abort) { controller.abort() } diff --git a/packages/router-core/tests/invalidation-reserved-flight.test.ts b/packages/router-core/tests/invalidation-reserved-flight.test.ts new file mode 100644 index 0000000000..d9f3aff105 --- /dev/null +++ b/packages/router-core/tests/invalidation-reserved-flight.test.ts @@ -0,0 +1,55 @@ +import { expect, test, vi } from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { BaseRootRoute, BaseRoute, createControlledPromise } from '../src' +import { createTestRouter } from './routerTestUtils' + +test('invalidation retires a zero-owner reservation before a blocked successor completes', async () => { + const started = createControlledPromise() + const data = createControlledPromise() + const entered = createControlledPromise() + const before = createControlledPromise() + let signal: AbortSignal | undefined + const root = new BaseRootRoute({}) + const home = new BaseRoute({ getParentRoute: () => root, path: '/' }) + const target = new BaseRoute({ + getParentRoute: () => root, + path: '/target', + validateSearch: (search: Record) => ({ + blocked: !!search.blocked, + }), + beforeLoad: ({ search }) => { + if (search.blocked) { + entered.resolve() + return before + } + return undefined + }, + loader: ({ abortController }) => { + signal = abortController.signal + started.resolve() + return data + }, + }) + const router = createTestRouter({ + routeTree: root.addChildren([home, target]), + history: createMemoryHistory({ initialEntries: ['/'] }), + }) + await router.load() + const first = router.navigate({ to: '/target', search: { blocked: false } }) + await started + const second = router.navigate({ to: '/target', search: { blocked: true } }) + await entered + expect(signal?.aborted).toBe(false) + const aborted = vi.fn() + signal!.addEventListener('abort', aborted) + const invalidation = router.invalidate({ + filter: (match) => match.routeId === target.id, + }) + await router.navigate({ to: '/' }) + before.resolve() + data.resolve('obsolete data') + await Promise.all([first, second, invalidation]) + expect(signal?.aborted).toBe(true) + expect(aborted).toHaveBeenCalledOnce() + expect(router.state.location.pathname).toBe('/') +}) From 76a7c0bfadb42d5f7fe7b9e1748acc7333178c91 Mon Sep 17 00:00:00 2001 From: Sarah Gerrard Date: Fri, 25 Sep 2026 07:34:47 -0700 Subject: [PATCH 059/175] perf(start-client-core): avoid unused middleware array (#8353) --- .changeset/start-middleware-registration.md | 5 ++ .../start-client-core/src/createServerFn.ts | 11 ++-- .../tests/createServerFn.test.ts | 54 +++++++++++++++++++ 3 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 .changeset/start-middleware-registration.md create mode 100644 packages/start-client-core/tests/createServerFn.test.ts diff --git a/.changeset/start-middleware-registration.md b/.changeset/start-middleware-registration.md new file mode 100644 index 0000000000..a8a8e30b27 --- /dev/null +++ b/.changeset/start-middleware-registration.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-client-core': patch +--- + +Avoid an unused array when registering server-function middleware. diff --git a/packages/start-client-core/src/createServerFn.ts b/packages/start-client-core/src/createServerFn.ts index bfa48039cf..c363fdad78 100644 --- a/packages/start-client-core/src/createServerFn.ts +++ b/packages/start-client-core/src/createServerFn.ts @@ -102,13 +102,14 @@ export const createServerFn: CreateServerFn = (options, __opts) => { // this is primarily useful for letting users create their own abstractions on top of `createServerFn` const newMiddleware = [...(resolvedOptions.middleware || [])] - middleware.map((m) => { - if (TSS_SERVER_FUNCTION_FACTORY in m) { - if (m.options.middleware) { - newMiddleware.push(...m.options.middleware) + // forEach skips holes and ignores items appended during iteration + middleware.forEach((item) => { + if (TSS_SERVER_FUNCTION_FACTORY in item) { + if (item.options.middleware) { + newMiddleware.push(...item.options.middleware) } } else { - newMiddleware.push(m) + newMiddleware.push(item) } }) diff --git a/packages/start-client-core/tests/createServerFn.test.ts b/packages/start-client-core/tests/createServerFn.test.ts new file mode 100644 index 0000000000..5958720a7b --- /dev/null +++ b/packages/start-client-core/tests/createServerFn.test.ts @@ -0,0 +1,54 @@ +import { expect, test } from 'vitest' +import { createMiddleware } from '../src/createMiddleware' +import { createServerFn } from '../src/createServerFn' + +test('appends factory middleware in order without changing source builders', () => { + const first = createMiddleware({ type: 'function' }) + const second = createMiddleware({ type: 'function' }) + const third = createMiddleware({ type: 'function' }) + const factory = createServerFn().middleware([second]) + const base = createServerFn({ method: 'POST' }).middleware([first]) + const middlewares = Object.freeze([factory, third, second]) + + const combined = base.middleware(middlewares) + + expect(combined.options.middleware).toEqual([first, second, third, second]) + expect(combined.options.method).toBe('POST') + expect(base.options.middleware).toEqual([first]) + expect(factory.options.middleware).toEqual([second]) + expect(middlewares).toEqual([factory, third, second]) + expect(combined.middleware([]).options.middleware).toEqual([ + first, + second, + third, + second, + ]) +}) + +test('ignores empty slots in a middleware array', () => { + const middleware = createMiddleware({ type: 'function' }) + const middlewares: Array = [] + middlewares[1] = middleware + + expect(createServerFn().middleware(middlewares).options.middleware).toEqual([ + middleware, + ]) + expect(0 in middlewares).toBe(false) +}) + +test('does not register middleware appended while reading the input', () => { + const first = createMiddleware({ type: 'function' }) + const second = createMiddleware({ type: 'function' }) + const middlewares = [first] + Object.defineProperty(middlewares, 0, { + get() { + middlewares.push(second) + return first + }, + }) + + expect(createServerFn().middleware(middlewares).options.middleware).toEqual([ + first, + ]) + expect(middlewares).toHaveLength(2) +}) From f5ffd3884ba26778a2a8ce53b379a5bded231676 Mon Sep 17 00:00:00 2001 From: Flo Date: Fri, 25 Sep 2026 16:45:51 +0200 Subject: [PATCH 060/175] perf(router): skip unused link preload cleanup across adapters (#8436) * perf(react-router): skip unused link preload cleanup * perf(react-router): use timer-only cleanup for intent preloading * Revert "perf(react-router): use timer-only cleanup for intent preloading" This reverts commit b5f46eac5fc8c74ff2e2618362973fd2f8540255. * perf(react-router): skip unused link preload cleanup [Self-Healing CI Rerun] * perf(solid-router,vue-router): skip unused preload cleanup --------- Co-authored-by: nx-cloud[bot] <71083854+nx-cloud[bot]@users.noreply.github.com> --- .changeset/brown-dots-grab.md | 7 ++ packages/react-router/src/link.tsx | 13 ++- packages/react-router/tests/link.test.tsx | 29 ++++++ packages/solid-router/src/link.tsx | 8 +- packages/solid-router/src/utils.ts | 20 +++- packages/solid-router/tests/link.test.tsx | 111 ++++++++++++++++++++ packages/vue-router/src/link.tsx | 2 + packages/vue-router/src/utils.ts | 13 ++- packages/vue-router/tests/link.test.tsx | 117 ++++++++++++++++++++++ 9 files changed, 311 insertions(+), 9 deletions(-) create mode 100644 .changeset/brown-dots-grab.md diff --git a/.changeset/brown-dots-grab.md b/.changeset/brown-dots-grab.md new file mode 100644 index 0000000000..d43d6e6a28 --- /dev/null +++ b/.changeset/brown-dots-grab.md @@ -0,0 +1,7 @@ +--- +'@tanstack/react-router': patch +'@tanstack/solid-router': patch +'@tanstack/vue-router': patch +--- + +Skip unused Link preload cleanup when preloading is disabled and ignore queued viewport notifications after their effect has been cleaned up. diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 94bf0f5ad1..aa958ef31c 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -383,10 +383,15 @@ export function useLinkProps< // the element. The cleanup also cancels a pending intent timer. // eslint-disable-next-line react-hooks/rules-of-hooks React.useEffect(() => { + // Disabled preloading creates neither an observer nor an intent timer. + if (!preload) { + return + } if (preload === 'render' && !hasRenderFetched.current) { hasRenderFetched.current = true preloadLink(router, _options) } + let active = true let observer: IntersectionObserver | undefined if ( preload === 'viewport' && @@ -394,12 +399,18 @@ export function useLinkProps< typeof IntersectionObserver === 'function' ) { observer = new IntersectionObserver( - (entries) => enqueuePreload(entries.pop()), + (entries) => { + // A queued observer notification can arrive after disconnect(). + if (active) { + enqueuePreload(entries.pop()) + } + }, { rootMargin: '100px' }, ) observer.observe(innerRef.current) } return () => { + active = false observer?.disconnect() cancelPreload(innerRef) } diff --git a/packages/react-router/tests/link.test.tsx b/packages/react-router/tests/link.test.tsx index 897b6d9414..46e6cb8685 100644 --- a/packages/react-router/tests/link.test.tsx +++ b/packages/react-router/tests/link.test.tsx @@ -5426,6 +5426,35 @@ describe('Link', () => { fireEvent.mouseLeave(viewportLink) await vi.advanceTimersByTimeAsync(50) expect(preloadRouteSpy).not.toHaveBeenCalled() + + // An effect with preloading disabled owns no resources. Re-enabling it + // must still install cancellation for a newly scheduled intent timer. + fireEvent.click(screen.getByRole('button', { name: 'Use intent' })) + fireEvent.mouseEnter(viewportLink) + await vi.advanceTimersByTimeAsync(49) + expect(preloadRouteSpy).not.toHaveBeenCalled() + fireEvent.click(screen.getByRole('button', { name: 'Disable preload' })) + await vi.advanceTimersByTimeAsync(1) + expect(preloadRouteSpy).not.toHaveBeenCalled() + + fireEvent.click(screen.getByRole('button', { name: 'Use intent' })) + fireEvent.mouseEnter(viewportLink) + await vi.advanceTimersByTimeAsync(50) + expect(preloadRouteSpy).toHaveBeenCalledTimes(1) + + preloadRouteSpy.mockClear() + fireEvent.click(screen.getByRole('button', { name: 'Disable preload' })) + initialIoCallback( + [ + { + isIntersecting: true, + target: viewportLink, + } as unknown as IntersectionObserverEntry, + ], + {} as IntersectionObserver, + ) + await vi.advanceTimersByTimeAsync(50) + expect(preloadRouteSpy).not.toHaveBeenCalled() }) test("Router.preload='render', should trigger the route loader on render", async () => { diff --git a/packages/solid-router/src/link.tsx b/packages/solid-router/src/link.tsx index a5fc4bca57..a26483706c 100644 --- a/packages/solid-router/src/link.tsx +++ b/packages/solid-router/src/link.tsx @@ -373,7 +373,13 @@ export function useLinkProps< } } - useIntersectionObserver(ref, enqueuePreload, () => preload() !== 'viewport') + useIntersectionObserver( + ref, + enqueuePreload, + () => preload() !== 'viewport', + // Intent preloading still needs timer cleanup without an observer. + () => !!preload(), + ) Solid.createEffect(() => { if (hasRenderFetched) { diff --git a/packages/solid-router/src/utils.ts b/packages/solid-router/src/utils.ts index 5d38caca31..f4a2067a6b 100644 --- a/packages/solid-router/src/utils.ts +++ b/packages/solid-router/src/utils.ts @@ -10,6 +10,7 @@ import * as Solid from 'solid-js' * @param ref - The ref to observe * @param callback - The callback to call when the intersection changes * @param disabled - Whether observation is disabled + * @param cleanupWhenDisabled - Whether cleanup is needed without an observer (defaults to true) * @returns The IntersectionObserver instance * @example * ```tsx @@ -27,6 +28,7 @@ export function useIntersectionObserver( ref: Solid.Accessor, callback: (entry?: IntersectionObserverEntry) => void, disabled: Solid.Accessor, + cleanupWhenDisabled?: Solid.Accessor, ): Solid.Accessor { const isIntersectionObserverAvailable = typeof IntersectionObserver === 'function' @@ -35,21 +37,29 @@ export function useIntersectionObserver( Solid.createEffect(() => { const r = ref() if (disabled() || !r || !isIntersectionObserverAvailable) { - Solid.onCleanup(() => callback()) + if (cleanupWhenDisabled?.() ?? true) { + Solid.onCleanup(() => callback()) + } return } - observerRef = new IntersectionObserver( + let active = true + const observer = new IntersectionObserver( (entries) => { - callback(entries.pop()) + // Queued notifications can arrive after this effect has cleaned up. + if (active) { + callback(entries.pop()) + } }, { rootMargin: '100px' }, ) - observerRef.observe(r) + observerRef = observer + observer.observe(r) Solid.onCleanup(() => { - observerRef?.disconnect() + active = false + observer.disconnect() callback() }) }) diff --git a/packages/solid-router/tests/link.test.tsx b/packages/solid-router/tests/link.test.tsx index 0ac4042149..78c4b02347 100644 --- a/packages/solid-router/tests/link.test.tsx +++ b/packages/solid-router/tests/link.test.tsx @@ -34,6 +34,7 @@ import { useRouteContext, useSearch, } from '../src' +import { useIntersectionObserver } from '../src/utils' import { getIntersectionObserverMock, getSearchParamsFromURI, @@ -5291,6 +5292,116 @@ describe('Link', () => { expect(ioDisconnectMock).not.toHaveBeenCalled() // it should not disconnect again }) + test.each([undefined, false, true])( + 'disabled observers honor the cleanup condition (%s)', + (cleanupWhenDisabled) => { + const callback = vi.fn() + const view = render(() => { + const [element, setElement] = Solid.createSignal(null) + useIntersectionObserver( + element, + callback, + () => true, + cleanupWhenDisabled === undefined + ? undefined + : () => cleanupWhenDisabled, + ) + return
+ }) + callback.mockClear() + view.unmount() + if (cleanupWhenDisabled === false) { + expect(callback).not.toHaveBeenCalled() + } else { + expect(callback).toHaveBeenCalledWith() + } + }, + ) + + test.each(['intent', 'viewport'] as const)( + 'preserves %s timer cleanup across mode changes and unmount', + async (mode) => { + const [preload, setPreload] = Solid.createSignal< + false | 'intent' | 'viewport' + >() + const rootRoute = createRootRoute() + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => ( + + Preload Link + + ), + }) + const aboutRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/about', + }) + const router = createRouter({ + routeTree: rootRoute.addChildren([indexRoute, aboutRoute]), + history, + }) + const preloadRouteSpy = vi.spyOn(router, 'preloadRoute') + const view = render(() => ) + const link = await screen.findByRole('link', { name: 'Preload Link' }) + const notify = (callback: IntersectionObserverCallback) => { + callback( + [ + { + isIntersecting: true, + target: link, + } as unknown as IntersectionObserverEntry, + ], + {} as IntersectionObserver, + ) + } + const trigger = () => { + if (mode === 'intent') { + fireEvent.mouseEnter(link) + } else { + notify(ioCallback) + } + } + vi.useFakeTimers() + + setPreload(mode) + await Promise.resolve() + const oldObserver = mode === 'viewport' ? ioCallback : undefined + trigger() + await vi.advanceTimersByTimeAsync(49) + setPreload(false) + await Promise.resolve() + if (oldObserver) { + notify(oldObserver) + } + await vi.advanceTimersByTimeAsync(50) + expect(preloadRouteSpy).not.toHaveBeenCalled() + + setPreload(mode) + await Promise.resolve() + if (oldObserver) { + // The mode matches again, but the previous observer is still obsolete. + notify(oldObserver) + } + await vi.advanceTimersByTimeAsync(50) + expect(preloadRouteSpy).not.toHaveBeenCalled() + trigger() + await vi.advanceTimersByTimeAsync(50) + expect(preloadRouteSpy).toHaveBeenCalledOnce() + + preloadRouteSpy.mockClear() + trigger() + const lastObserver = mode === 'viewport' ? ioCallback : undefined + view.unmount() + if (lastObserver) { + notify(lastObserver) + } + await vi.advanceTimersByTimeAsync(50) + expect(preloadRouteSpy).not.toHaveBeenCalled() + }, + ) + test('Link.preload="viewport" should respect preloadDelay', async () => { const rootRoute = createRootRoute() const indexRoute = createRoute({ diff --git a/packages/vue-router/src/link.tsx b/packages/vue-router/src/link.tsx index 6d2fea690c..cb964c7381 100644 --- a/packages/vue-router/src/link.tsx +++ b/packages/vue-router/src/link.tsx @@ -298,6 +298,8 @@ function useLinkPropsImpl( ref, enqueuePreload, () => preload.value !== 'viewport', + // Intent preloading still needs timer cleanup without an observer. + () => !!preload.value, ) Vue.watchEffect(() => { diff --git a/packages/vue-router/src/utils.ts b/packages/vue-router/src/utils.ts index 8787649d8b..c5e3796384 100644 --- a/packages/vue-router/src/utils.ts +++ b/packages/vue-router/src/utils.ts @@ -33,6 +33,7 @@ export const usePrevious = (fn: () => boolean) => { * @param ref - The ref to observe * @param callback - The callback to call when the intersection changes * @param disabled - Whether observation is disabled + * @param cleanupWhenDisabled - Whether cleanup is needed without an observer (defaults to true) * @returns The IntersectionObserver instance * @example * ```tsx @@ -50,6 +51,7 @@ export function useIntersectionObserver( ref: Vue.Ref, callback: (entry?: IntersectionObserverEntry) => void, disabled: () => boolean, + cleanupWhenDisabled?: () => boolean, ): Vue.Ref { const isIntersectionObserverAvailable = typeof IntersectionObserver === 'function' @@ -59,13 +61,19 @@ export function useIntersectionObserver( Vue.watchEffect((onCleanup) => { const r = ref.value if (disabled() || !r || !isIntersectionObserverAvailable) { - onCleanup(() => callback()) + if (cleanupWhenDisabled?.() ?? true) { + onCleanup(() => callback()) + } return } + let active = true const observer = new IntersectionObserver( (entries) => { - callback(entries.pop()) + // Queued notifications can arrive after this effect has cleaned up. + if (active) { + callback(entries.pop()) + } }, { rootMargin: '100px' }, ) @@ -74,6 +82,7 @@ export function useIntersectionObserver( observer.observe(r) onCleanup(() => { + active = false observer.disconnect() observerRef.value = null callback() diff --git a/packages/vue-router/tests/link.test.tsx b/packages/vue-router/tests/link.test.tsx index e80aec01ef..48fe82e2bb 100644 --- a/packages/vue-router/tests/link.test.tsx +++ b/packages/vue-router/tests/link.test.tsx @@ -5545,6 +5545,123 @@ describe('Link', () => { expect(ioDisconnectMock).not.toHaveBeenCalled() // it should not disconnect again }) + test.each([undefined, false, true])( + 'disabled observers honor the cleanup condition (%s)', + async (cleanupWhenDisabled) => { + const callback = vi.fn() + const TestComponent = Vue.defineComponent({ + setup() { + const element = Vue.ref(null) + useIntersectionObserver( + element, + callback, + () => true, + cleanupWhenDisabled === undefined + ? undefined + : () => cleanupWhenDisabled, + ) + return () =>
+ }, + }) + const view = render() + await Vue.nextTick() + callback.mockClear() + view.unmount() + if (cleanupWhenDisabled === false) { + expect(callback).not.toHaveBeenCalled() + } else { + expect(callback).toHaveBeenCalledWith() + } + }, + ) + + test.each(['intent', 'viewport'] as const)( + 'preserves %s timer cleanup across mode changes and unmount', + async (mode) => { + const preload = Vue.ref() + const RouteComponent = Vue.defineComponent({ + setup() { + return () => ( + + Preload Link + + ) + }, + }) + const rootRoute = createRootRoute() + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: RouteComponent, + }) + const aboutRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/about', + }) + const router = createRouter({ + routeTree: rootRoute.addChildren([indexRoute, aboutRoute]), + history, + }) + const preloadRouteSpy = vi.spyOn(router, 'preloadRoute') + const view = render() + const link = await screen.findByRole('link', { name: 'Preload Link' }) + const notify = (callback: IntersectionObserverCallback) => { + callback( + [ + { + isIntersecting: true, + target: link, + } as unknown as IntersectionObserverEntry, + ], + {} as IntersectionObserver, + ) + } + const trigger = async () => { + if (mode === 'intent') { + await fireEvent.mouseEnter(link) + } else { + notify(ioCallback) + } + } + vi.useFakeTimers() + + preload.value = mode + await Vue.nextTick() + const oldObserver = mode === 'viewport' ? ioCallback : undefined + await trigger() + await vi.advanceTimersByTimeAsync(49) + preload.value = false + await Vue.nextTick() + if (oldObserver) { + notify(oldObserver) + } + await vi.advanceTimersByTimeAsync(50) + expect(preloadRouteSpy).not.toHaveBeenCalled() + + preload.value = mode + await Vue.nextTick() + if (oldObserver) { + // The mode matches again, but the previous observer is still obsolete. + notify(oldObserver) + } + await vi.advanceTimersByTimeAsync(50) + expect(preloadRouteSpy).not.toHaveBeenCalled() + await trigger() + await vi.advanceTimersByTimeAsync(50) + expect(preloadRouteSpy).toHaveBeenCalledOnce() + + preloadRouteSpy.mockClear() + await trigger() + const lastObserver = mode === 'viewport' ? ioCallback : undefined + view.unmount() + if (lastObserver) { + notify(lastObserver) + } + await vi.advanceTimersByTimeAsync(50) + expect(preloadRouteSpy).not.toHaveBeenCalled() + }, + ) + test('Link.preload="viewport" should respect preloadDelay', async () => { const rootRoute = createRootRoute() const indexRoute = createRoute({ From e81845ff1e4fc66d4e4a87f086be65906f7adb94 Mon Sep 17 00:00:00 2001 From: Flo Date: Fri, 25 Sep 2026 17:02:09 +0200 Subject: [PATCH 061/175] fix(start): parse path params before server route handlers (#8434) --- .changeset/hungry-cooks-go.md | 5 + .../server-routes/src/routeTree.gen.ts | 52 +++++++++++ .../routes/api/parsed-params.$id.$childId.tsx | 51 ++++++++++ .../src/routes/api/parsed-params.$id.ts | 16 ++++ .../server-routes/tests/server-routes.spec.ts | 40 ++++++++ .../src/createStartHandler.ts | 53 ++++++++--- .../tests/createStartHandler.test.ts | 93 +++++++++++++++++++ 7 files changed, 295 insertions(+), 15 deletions(-) create mode 100644 .changeset/hungry-cooks-go.md create mode 100644 e2e/react-start/server-routes/src/routes/api/parsed-params.$id.$childId.tsx create mode 100644 e2e/react-start/server-routes/src/routes/api/parsed-params.$id.ts diff --git a/.changeset/hungry-cooks-go.md b/.changeset/hungry-cooks-go.md new file mode 100644 index 0000000000..5bf60c3afc --- /dev/null +++ b/.changeset/hungry-cooks-go.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-server-core': patch +--- + +Apply route path parameter parsers, including parent-route parsers, before invoking server route handlers so runtime parameters agree with their inferred types. diff --git a/e2e/react-start/server-routes/src/routeTree.gen.ts b/e2e/react-start/server-routes/src/routeTree.gen.ts index 2454c3bb32..7ae1e4f551 100644 --- a/e2e/react-start/server-routes/src/routeTree.gen.ts +++ b/e2e/react-start/server-routes/src/routeTree.gen.ts @@ -20,7 +20,9 @@ import { Route as ApiOnlyAnyRouteImport } from './routes/api/only-any' import { Route as MethodsIndexRouteImport } from './routes/methods/index' import { Route as MethodsOnlyAnyRouteImport } from './routes/methods/only-any' import { Route as ApiParamsFooRouteRouteImport } from './routes/api/params/$foo/route' +import { Route as ApiParsedParamsIdRouteImport } from './routes/api/parsed-params.$id' import { Route as ApiParamsFooBarRouteImport } from './routes/api/params/$foo/$bar' +import { Route as ApiParsedParamsIdChildIdRouteImport } from './routes/api/parsed-params.$id.$childId' const IndexRoute = IndexRouteImport.update({ id: '/', @@ -77,11 +79,22 @@ const ApiParamsFooRouteRoute = ApiParamsFooRouteRouteImport.update({ path: '/api/params/$foo', getParentRoute: () => rootRouteImport, } as any) +const ApiParsedParamsIdRoute = ApiParsedParamsIdRouteImport.update({ + id: '/api/parsed-params/$id', + path: '/api/parsed-params/$id', + getParentRoute: () => rootRouteImport, +} as any) const ApiParamsFooBarRoute = ApiParamsFooBarRouteImport.update({ id: '/$bar', path: '/$bar', getParentRoute: () => ApiParamsFooRouteRoute, } as any) +const ApiParsedParamsIdChildIdRoute = + ApiParsedParamsIdChildIdRouteImport.update({ + id: '/$childId', + path: '/$childId', + getParentRoute: () => ApiParsedParamsIdRoute, + } as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -95,7 +108,9 @@ export interface FileRoutesByFullPath { '/methods/only-any': typeof MethodsOnlyAnyRoute '/methods/': typeof MethodsIndexRoute '/api/params/$foo': typeof ApiParamsFooRouteRouteWithChildren + '/api/parsed-params/$id': typeof ApiParsedParamsIdRouteWithChildren '/api/params/$foo/$bar': typeof ApiParamsFooBarRoute + '/api/parsed-params/$id/$childId': typeof ApiParsedParamsIdChildIdRoute } export interface FileRoutesByTo { '/': typeof IndexRoute @@ -108,7 +123,9 @@ export interface FileRoutesByTo { '/methods/only-any': typeof MethodsOnlyAnyRoute '/methods': typeof MethodsIndexRoute '/api/params/$foo': typeof ApiParamsFooRouteRouteWithChildren + '/api/parsed-params/$id': typeof ApiParsedParamsIdRouteWithChildren '/api/params/$foo/$bar': typeof ApiParamsFooBarRoute + '/api/parsed-params/$id/$childId': typeof ApiParsedParamsIdChildIdRoute } export interface FileRoutesById { __root__: typeof rootRouteImport @@ -123,7 +140,9 @@ export interface FileRoutesById { '/methods/only-any': typeof MethodsOnlyAnyRoute '/methods/': typeof MethodsIndexRoute '/api/params/$foo': typeof ApiParamsFooRouteRouteWithChildren + '/api/parsed-params/$id': typeof ApiParsedParamsIdRouteWithChildren '/api/params/$foo/$bar': typeof ApiParamsFooBarRoute + '/api/parsed-params/$id/$childId': typeof ApiParsedParamsIdChildIdRoute } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath @@ -139,7 +158,9 @@ export interface FileRouteTypes { | '/methods/only-any' | '/methods/' | '/api/params/$foo' + | '/api/parsed-params/$id' | '/api/params/$foo/$bar' + | '/api/parsed-params/$id/$childId' fileRoutesByTo: FileRoutesByTo to: | '/' @@ -152,7 +173,9 @@ export interface FileRouteTypes { | '/methods/only-any' | '/methods' | '/api/params/$foo' + | '/api/parsed-params/$id' | '/api/params/$foo/$bar' + | '/api/parsed-params/$id/$childId' id: | '__root__' | '/' @@ -166,7 +189,9 @@ export interface FileRouteTypes { | '/methods/only-any' | '/methods/' | '/api/params/$foo' + | '/api/parsed-params/$id' | '/api/params/$foo/$bar' + | '/api/parsed-params/$id/$childId' fileRoutesById: FileRoutesById } export interface RootRouteChildren { @@ -179,6 +204,7 @@ export interface RootRouteChildren { ApiMiddlewareContextRoute: typeof ApiMiddlewareContextRoute ApiOnlyAnyRoute: typeof ApiOnlyAnyRoute ApiParamsFooRouteRoute: typeof ApiParamsFooRouteRouteWithChildren + ApiParsedParamsIdRoute: typeof ApiParsedParamsIdRouteWithChildren } declare module '@tanstack/react-router' { @@ -260,6 +286,13 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ApiParamsFooRouteRouteImport parentRoute: typeof rootRouteImport } + '/api/parsed-params/$id': { + id: '/api/parsed-params/$id' + path: '/api/parsed-params/$id' + fullPath: '/api/parsed-params/$id' + preLoaderRoute: typeof ApiParsedParamsIdRouteImport + parentRoute: typeof rootRouteImport + } '/api/params/$foo/$bar': { id: '/api/params/$foo/$bar' path: '/$bar' @@ -267,6 +300,13 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ApiParamsFooBarRouteImport parentRoute: typeof ApiParamsFooRouteRoute } + '/api/parsed-params/$id/$childId': { + id: '/api/parsed-params/$id/$childId' + path: '/$childId' + fullPath: '/api/parsed-params/$id/$childId' + preLoaderRoute: typeof ApiParsedParamsIdChildIdRouteImport + parentRoute: typeof ApiParsedParamsIdRoute + } } } @@ -295,6 +335,17 @@ const ApiParamsFooRouteRouteChildren: ApiParamsFooRouteRouteChildren = { const ApiParamsFooRouteRouteWithChildren = ApiParamsFooRouteRoute._addFileChildren(ApiParamsFooRouteRouteChildren) +interface ApiParsedParamsIdRouteChildren { + ApiParsedParamsIdChildIdRoute: typeof ApiParsedParamsIdChildIdRoute +} + +const ApiParsedParamsIdRouteChildren: ApiParsedParamsIdRouteChildren = { + ApiParsedParamsIdChildIdRoute: ApiParsedParamsIdChildIdRoute, +} + +const ApiParsedParamsIdRouteWithChildren = + ApiParsedParamsIdRoute._addFileChildren(ApiParsedParamsIdRouteChildren) + const rootRouteChildren: RootRouteChildren = { IndexRoute: IndexRoute, MethodsRouteRoute: MethodsRouteRouteWithChildren, @@ -305,6 +356,7 @@ const rootRouteChildren: RootRouteChildren = { ApiMiddlewareContextRoute: ApiMiddlewareContextRoute, ApiOnlyAnyRoute: ApiOnlyAnyRoute, ApiParamsFooRouteRoute: ApiParamsFooRouteRouteWithChildren, + ApiParsedParamsIdRoute: ApiParsedParamsIdRouteWithChildren, } export const routeTree = rootRouteImport ._addFileChildren(rootRouteChildren) diff --git a/e2e/react-start/server-routes/src/routes/api/parsed-params.$id.$childId.tsx b/e2e/react-start/server-routes/src/routes/api/parsed-params.$id.$childId.tsx new file mode 100644 index 0000000000..06697a22cc --- /dev/null +++ b/e2e/react-start/server-routes/src/routes/api/parsed-params.$id.$childId.tsx @@ -0,0 +1,51 @@ +import { createFileRoute } from '@tanstack/react-router' +import { createMiddleware } from '@tanstack/react-start' + +const handleInvalidParams = createMiddleware().server(async ({ next }) => { + try { + return await next() + } catch (error) { + if (error instanceof Error && error.message === 'Invalid child id') { + return new Response(error.message, { status: 400 }) + } + throw error + } +}) + +export const Route = createFileRoute('/api/parsed-params/$id/$childId')({ + params: { + parse: (params) => { + const childId = Number(params.childId) + if (!Number.isFinite(childId)) { + throw new Error('Invalid child id') + } + return { childId } + }, + stringify: (params) => ({ childId: String(params.childId) }), + }, + server: { + handlers: ({ createHandlers }) => + createHandlers({ + GET: { + middleware: [handleInvalidParams], + handler: ({ params, request, next }) => { + if (new URL(request.url).searchParams.has('render')) { + return next({ context: { handlerParams: params } }) + } + const id: number = params.id + const childId: number = params.childId + return Response.json({ id, childId }) + }, + }, + }), + }, + loader: ({ params, serverContext }) => ({ + loaderParams: params, + handlerParams: serverContext?.handlerParams, + }), + component: () => ( +
+      {JSON.stringify(Route.useLoaderData())}
+    
+ ), +}) diff --git a/e2e/react-start/server-routes/src/routes/api/parsed-params.$id.ts b/e2e/react-start/server-routes/src/routes/api/parsed-params.$id.ts new file mode 100644 index 0000000000..0e5f0ab8a9 --- /dev/null +++ b/e2e/react-start/server-routes/src/routes/api/parsed-params.$id.ts @@ -0,0 +1,16 @@ +import { createFileRoute } from '@tanstack/react-router' + +export const Route = createFileRoute('/api/parsed-params/$id')({ + params: { + parse: (params) => ({ id: Number(params.id) }), + stringify: (params) => ({ id: String(params.id) }), + }, + server: { + handlers: { + GET: ({ params }) => { + const id: number = params.id + return Response.json({ id }) + }, + }, + }, +}) diff --git a/e2e/react-start/server-routes/tests/server-routes.spec.ts b/e2e/react-start/server-routes/tests/server-routes.spec.ts index 97249fd733..0ede9eaac8 100644 --- a/e2e/react-start/server-routes/tests/server-routes.spec.ts +++ b/e2e/react-start/server-routes/tests/server-routes.spec.ts @@ -1,6 +1,46 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +test('server handlers receive parsed path params (issue #8431)', async ({ + request, +}) => { + const response = await request.get('/api/parsed-params/44') + + expect(response.status()).toBe(200) + expect(await response.json()).toEqual({ id: 44 }) +}) + +test('createHandlers receives parsed parent and child path params', async ({ + request, +}) => { + const response = await request.get('/api/parsed-params/44/2') + + expect(response.status()).toBe(200) + expect(await response.json()).toEqual({ id: 44, childId: 2 }) +}) + +test('handler middleware can catch path parameter parsing errors', async ({ + request, +}) => { + const response = await request.get('/api/parsed-params/44/invalid') + + expect(response.status()).toBe(400) + expect(await response.text()).toBe('Invalid child id') +}) + +test('parsed path params agree when a server handler defers to rendering', async ({ + page, +}) => { + await page.goto('/api/parsed-params/44/2?render') + + const result = page.getByTestId('parsed-params') + await expect(result).toBeVisible() + expect(JSON.parse((await result.textContent())!)).toEqual({ + loaderParams: { id: 44, childId: 2 }, + handlerParams: { id: 44, childId: 2 }, + }) +}) + test('merge-middleware-context', async ({ page }) => { await page.goto('/merge-middleware-context') diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index 84af2d4558..4c3ba81eca 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -45,6 +45,7 @@ import type { AnyRequestMiddleware, AnyStartInstanceOptions, RouteMethod, + RouteMethodHandlerFn, RouterEntry, StartEntry, } from '@tanstack/start-client-core' @@ -906,6 +907,32 @@ async function handleRedirectResponse( return ssrResponse } +function withParsedParams( + handler: RouteMethodHandlerFn, + matchedRoutes: ReadonlyArray, +): TODO { + if ( + !matchedRoutes.some( + (route) => route.options.params?.parse ?? route.options.parseParams, + ) + ) { + return handler + } + + return (ctx: TODO) => { + // Parse inside the pipeline so middleware can catch errors. Keep the raw + // params for app-router validation when the handler defers to rendering. + const params = Object.assign(Object.create(null), ctx.params) + for (const route of matchedRoutes) { + const parse = route.options.params?.parse ?? route.options.parseParams + if (parse) { + Object.assign(params, parse(params)) + } + } + return handler({ ...ctx, params }) + } +} + async function handleServerRoutes({ getRouter, request, @@ -975,27 +1002,23 @@ async function handleServerRoutes({ if (handler) { const mayDefer = !!foundRoute.options.component - if (typeof handler === 'function') { - if (!mayDefer) { - terminalHandler = handler - terminalNext = throwIfMayNotDefer - } else { - routeMiddlewares.push(handler) - } - } else { + if (typeof handler !== 'function') { if (handler.middleware?.length) { const handlerMiddlewares = flattenMiddlewares(handler.middleware) for (const m of handlerMiddlewares) { routeMiddlewares.push(m.options.server) } } - if (handler.handler) { - if (!mayDefer) { - terminalHandler = handler.handler - terminalNext = throwIfMayNotDefer - } else { - routeMiddlewares.push(handler.handler) - } + } + const routeHandler = + typeof handler === 'function' ? handler : handler.handler + if (routeHandler) { + const parsedHandler = withParsedParams(routeHandler, matchedRoutes) + if (!mayDefer) { + terminalHandler = parsedHandler + terminalNext = throwIfMayNotDefer + } else { + routeMiddlewares.push(parsedHandler) } } } diff --git a/packages/start-server-core/tests/createStartHandler.test.ts b/packages/start-server-core/tests/createStartHandler.test.ts index 18bbbcb9f2..8044b6b52f 100644 --- a/packages/start-server-core/tests/createStartHandler.test.ts +++ b/packages/start-server-core/tests/createStartHandler.test.ts @@ -1626,6 +1626,99 @@ describe('createStartHandler direct server routes', () => { expect(render).not.toHaveBeenCalled() }) + it.each( + [false, true].flatMap((component) => + ['function', 'object'].flatMap((handlerKind) => + ['params.parse', 'parseParams'].map((parserKind) => ({ + component, + handlerKind, + parserKind, + })), + ), + ), + )( + 'parses server handler params (component=$component, handler=$handlerKind, parser=$parserKind)', + async ({ component, handlerKind, parserKind }) => { + const parse = (params: { itemId: string }) => ({ + itemId: Number(params.itemId), + }) + const routeHandler = vi.fn(({ params }: any) => Response.json(params)) + startMocks.router = makeRouter({ + path: '/items/$itemId', + component: component ? () => null : undefined, + ...(parserKind === 'params.parse' + ? { params: { parse } } + : { parseParams: parse }), + server: { + handlers: { + GET: + handlerKind === 'function' + ? routeHandler + : { handler: routeHandler }, + }, + }, + }) + const render = vi.fn(() => new Response('must not render')) + const handler = createStartHandler(render) + + const response = await handler( + new Request('http://localhost/items/42'), + {}, + ) + + expect(response.status).toBe(200) + await expect(response.json()).resolves.toEqual({ itemId: 42 }) + expect(routeHandler).toHaveBeenCalledOnce() + expect(render).not.toHaveBeenCalled() + }, + ) + + it.each(['route', 'handler'] as const)( + 'lets %s middleware catch terminal handler parameter parsing errors', + async (placement) => { + const error = new Error('Invalid item id') + const middleware = createMiddleware().server(async ({ next }) => { + try { + return await next() + } catch (caught) { + expect(caught).toBe(error) + return new Response(error.message, { status: 400 }) + } + }) + const routeHandler = vi.fn(() => new Response('must not run')) + startMocks.router = makeRouter({ + path: '/items/$itemId', + component: undefined, + params: { + parse: () => { + throw error + }, + }, + server: { + ...(placement === 'route' ? { middleware: [middleware] } : {}), + handlers: { + GET: + placement === 'handler' + ? { middleware: [middleware], handler: routeHandler } + : routeHandler, + }, + }, + }) + const render = vi.fn(() => new Response('must not render')) + const handler = createStartHandler(render) + + const response = await handler( + new Request('http://localhost/items/nope'), + {}, + ) + + expect(response.status).toBe(400) + await expect(response.text()).resolves.toBe('Invalid item id') + expect(routeHandler).not.toHaveBeenCalled() + expect(render).not.toHaveBeenCalled() + }, + ) + it.each(['route', 'handler'] as const)( 'runs %s middleware instead of incorrectly taking the direct path', async (placement) => { From bb4423e09872aee4f2544600d0eba3303fc7db56 Mon Sep 17 00:00:00 2001 From: Flo Date: Fri, 25 Sep 2026 20:43:16 +0200 Subject: [PATCH 062/175] bench(client-nav): add React and Solid hydration scenarios (#8439) * bench(client-nav): add React hydration scenario * fix(benchmarks): await React hydration completion under instrumentation * bench(client-nav): add Solid and Vue hydration scenarios * ci: apply automated fixes * bench(client-nav): split Vue hydration into a separate PR --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- benchmarks/README.md | 5 +- benchmarks/client-nav/README.md | 81 ++++- benchmarks/client-nav/package.json | 4 + .../scenarios/hydration/react/fixture.ts | 31 ++ .../hydration/react/generate-fixture.mjs | 23 ++ .../hydration/react/hydration.test.ts | 106 ++++++ .../scenarios/hydration/react/project.json | 40 +++ .../scenarios/hydration/react/settle.ts | 35 ++ .../scenarios/hydration/react/setup.ts | 307 ++++++++++++++++ .../scenarios/hydration/react/speed.bench.ts | 23 ++ .../scenarios/hydration/react/src/app.tsx | 216 +++++++++++ .../scenarios/hydration/react/src/client.tsx | 83 +++++ .../scenarios/hydration/react/src/server.tsx | 29 ++ .../scenarios/hydration/react/tsconfig.json | 10 + .../scenarios/hydration/react/vite.config.ts | 36 ++ .../hydration/react/vite.server.config.ts | 26 ++ .../scenarios/hydration/solid/fixture.ts | 35 ++ .../hydration/solid/generate-fixture.mjs | 30 ++ .../hydration/solid/hydration.test.ts | 85 +++++ .../scenarios/hydration/solid/project.json | 40 +++ .../scenarios/hydration/solid/setup.ts | 339 ++++++++++++++++++ .../scenarios/hydration/solid/speed.bench.ts | 23 ++ .../scenarios/hydration/solid/src/app.tsx | 213 +++++++++++ .../scenarios/hydration/solid/src/client.tsx | 91 +++++ .../scenarios/hydration/solid/src/server.tsx | 40 +++ .../scenarios/hydration/solid/tsconfig.json | 10 + .../scenarios/hydration/solid/vite.config.ts | 38 ++ .../hydration/solid/vite.server.config.ts | 29 ++ 28 files changed, 2020 insertions(+), 8 deletions(-) create mode 100644 benchmarks/client-nav/scenarios/hydration/react/fixture.ts create mode 100644 benchmarks/client-nav/scenarios/hydration/react/generate-fixture.mjs create mode 100644 benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts create mode 100644 benchmarks/client-nav/scenarios/hydration/react/project.json create mode 100644 benchmarks/client-nav/scenarios/hydration/react/settle.ts create mode 100644 benchmarks/client-nav/scenarios/hydration/react/setup.ts create mode 100644 benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts create mode 100644 benchmarks/client-nav/scenarios/hydration/react/src/app.tsx create mode 100644 benchmarks/client-nav/scenarios/hydration/react/src/client.tsx create mode 100644 benchmarks/client-nav/scenarios/hydration/react/src/server.tsx create mode 100644 benchmarks/client-nav/scenarios/hydration/react/tsconfig.json create mode 100644 benchmarks/client-nav/scenarios/hydration/react/vite.config.ts create mode 100644 benchmarks/client-nav/scenarios/hydration/react/vite.server.config.ts create mode 100644 benchmarks/client-nav/scenarios/hydration/solid/fixture.ts create mode 100644 benchmarks/client-nav/scenarios/hydration/solid/generate-fixture.mjs create mode 100644 benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts create mode 100644 benchmarks/client-nav/scenarios/hydration/solid/project.json create mode 100644 benchmarks/client-nav/scenarios/hydration/solid/setup.ts create mode 100644 benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts create mode 100644 benchmarks/client-nav/scenarios/hydration/solid/src/app.tsx create mode 100644 benchmarks/client-nav/scenarios/hydration/solid/src/client.tsx create mode 100644 benchmarks/client-nav/scenarios/hydration/solid/src/server.tsx create mode 100644 benchmarks/client-nav/scenarios/hydration/solid/tsconfig.json create mode 100644 benchmarks/client-nav/scenarios/hydration/solid/vite.config.ts create mode 100644 benchmarks/client-nav/scenarios/hydration/solid/vite.server.config.ts diff --git a/benchmarks/README.md b/benchmarks/README.md index 96cd63f850..7e9a5f4248 100644 --- a/benchmarks/README.md +++ b/benchmarks/README.md @@ -1,6 +1,7 @@ # CPU simulation benchmarks -`client-nav` measures navigation in Node/jsdom; `ssr` measures server requests. +`client-nav` measures navigation, mounting, and React/Solid hydration in +Node/jsdom; `ssr` measures server requests. Both suites run through the CodSpeed Vitest integration in CPU simulation mode. ## Worker runtime @@ -81,7 +82,7 @@ gh workflow run client-nav-benchmarks.yml --ref Wait for each workflow run to finish before dispatching the next repetition at the same commit. The workflow also runs memory benchmarks; exclude those results when assessing CPU repeatability. Check that every repetition has all expected -CPU results (currently 132), rather than inherited results from an earlier run. +CPU results (currently 134), rather than inherited results from an earlier run. Compare each benchmark's minimum and maximum across repetitions; keep input data, navigation/request counts, builds, dependencies and Node version fixed when testing runtime configuration changes. diff --git a/benchmarks/client-nav/README.md b/benchmarks/client-nav/README.md index c8ebbf06bc..b49bc02376 100644 --- a/benchmarks/client-nav/README.md +++ b/benchmarks/client-nav/README.md @@ -9,10 +9,11 @@ Cross-framework client-side CPU benchmarks for: The benchmarks run in jsdom against production builds of real apps, and are tracked in CI by CodSpeed (simulation mode). -> **Scope:** these benchmarks cover the standalone client router only. The -> client side of TanStack Start (hydration of a server-rendered document, -> streamed payload consumption, server-function calls from the client, ...) is -> not covered here; the server side of Start is covered by `benchmarks/ssr`. +> **Scope:** these benchmarks cover the client router. The hydration +> scenarios also cover DOM hydration and the Router state-restoration path +> used by Start. Start-specific entry-point initialization, streamed payload +> arrival and client server-function calls are not included. Server request work +> is covered by `benchmarks/ssr`. ## Layout @@ -38,7 +39,7 @@ scenarios/// routes/ ``` -Scenario apps use file-based routing (`@tanstack/router-plugin`) with a +Navigation scenario apps use file-based routing (`@tanstack/router-plugin`) with a generated `routeTree.gen.ts`, like a regular user app. Each scenario uses one app per framework instead of sharing routes in the baseline app. This keeps route-tree size and router options isolated so one scenario cannot shift @@ -57,9 +58,10 @@ be attributed to a specific feature area. | `control-flow` | Loader-thrown `redirect` (including a 2-hop chain), `notFound()` with `notFoundComponent`, loader errors with `errorComponent`, and boundary reset on recovery navigation. | | `head` | `HeadContent` per-navigation work: nested route `head()` evaluation, title/meta/link dedupe across matches, and head tag DOM updates during navigation. | | `history` | History push/replace/back/forward traversal, location masking, registered-but-never-blocking `useBlocker`, and `useCanGoBack`/`useLocation` subscriptions. | +| `hydration` | Initial DOM hydration: execute the SSR payload, restore `beforeLoad` context and loader data, and hydrate 192 ordinary and eight hash-sensitive Links through their follow-up effects in React and Solid. | | `links` | Per-navigation cost of ~200 mounted ``s: link prop building, active-state recompute across `activeOptions` variants, `activeProps` swaps, and `useMatchRoute` probes (the `MatchRoute` component is avoided: vue-router's implementation leaks one subscription per render). | | `loaders` | Client loader dispatch: always-stale re-runs (`staleTime: 0`), cached revisits (re-run once per lap by the `invalidate` step), `loaderDeps`-keyed caching, `router.invalidate()`, and `useLoaderData` selectors. | -| `mount` | Cold start: `createRouter` (route-tree processing) + first render + initial `router.load()` + unmount, with a fresh router per mount. The only scenario measuring router creation. | +| `mount` | Cold start: `createRouter` (route-tree processing) + first render + initial `router.load()` + unmount, with a fresh router per mount. | | `nested-params` | Deep nesting (8 dynamic levels): per-level `params.parse`/`stringify`, `beforeLoad` context accumulation across matches, and per-level `useParams`/`useRouteContext` subscriptions. Param values include characters requiring percent-encoding (as do `route-tree-scale`'s), so segment encode/decode paths run on every navigation. | | `preload` | Intent preloading from hover events, programmatic `router.preloadRoute`, deterministic preload cache behavior (`defaultPreloadStaleTime: 0`), and commit-time cache maintenance. | | `rewrites` | Composed client-side location rewrites: router `basepath` plus a locale input/output rewrite pair, running on every href build and location parse (the client analog of the SSR `rewrites` scenario). | @@ -68,6 +70,9 @@ be attributed to a specific feature area. ## Conventions +The hydration scenario has the separate lifecycle described below. The other +scenarios follow these navigation/mount conventions: + - Apps are built with `NODE_ENV=production` (`minify: false`) into `dist/app.js`; benches import the built bundle, so production package builds and production JSX output are measured, not dev transforms. - Scenarios behave like a real user app: navigation happens through `` clicks dispatched on real anchor elements (unless a scenario specifically measures the imperative API), the router uses the default browser history, and `scrollRestoration` is enabled. - Each benchmark iteration advances a fixed, circular sequence of steps; every step awaits the router's `onRendered` event, so render work is included and steps cannot overlap. No two consecutive steps may target the same location, and the sequence ends back on the initial route. @@ -116,6 +121,70 @@ Typecheck benchmark sources (baseline + scenarios): CI=1 NX_DAEMON=false pnpm nx run @benchmarks/client-nav:test:types --outputStyle=stream --skipRemoteCache ``` +## Hydration + +`scenarios/hydration/{react,solid}` provide the same initial-hydration +workload: 192 ordinary Links, eight hash-sensitive Links, and three matched +routes with three `beforeLoad` contexts and two loader results. The server URL +has no fragment; the client URL has `#details`, matching half of the hash-sensitive Links. + +```bash +CI=1 NX_DAEMON=false pnpm nx run @benchmarks/client-nav-hydration-react:test:perf --outputStyle=stream --skipRemoteCache +CI=1 NX_DAEMON=false pnpm nx run @benchmarks/client-nav-hydration-react:test:unit --outputStyle=stream --skipRemoteCache +CI=1 NX_DAEMON=false pnpm nx run @benchmarks/client-nav-hydration-react:test:types:client --outputStyle=stream --skipRemoteCache +``` + +Replace `react` with `solid` to run the other adapter. + +The build generates static HTML and its real Router SSR bootstrap scripts once +with `createRequestHandler` and the adapter's streaming renderer. Generation +fully consumes the response and runs outside the CodSpeed action. The measured +worker only reads these artifacts; it does not import a server renderer or start a server. + +Each invocation uses a fresh jsdom window and a fresh evaluation of the complete +production client bundle in that window's realm. HTML parsing, bundle evaluation, +and the initial document lifecycle finish in untimed setup. This resets module +state as well as the DOM, avoiding cached hydration promises and cross-realm +payload objects. The bundle and bootstrap scripts are compiled once, so this +measures a fresh application with warm code, not JavaScript download/parse cost. + +The timed region executes the serialized payload, creates the router and its +small code-based route tree, calls the public client `hydrate` API, and hydrates +the existing DOM with the framework's native renderer: + +- **React:** a separate completion component signals from its post-hydration + effect, after the same snapshot transition as hash-sensitive Links. The harness + awaits that signal and two idle React scheduler turns, then checks the expected + active links. Concurrent hydration can take as many turns as needed under CPU + instrumentation, with a 60-second failure watchdog. +- **Solid:** execute the native hydration bootstrap and retain the server's + component/key hierarchy. Wait for mount, the router's rendered event, active-link + effects, and two idle turns. DOM identity assertions include every workload + element so template fallback cannot silently replace server nodes. + +Solid bounds settlement to 100 turns. Ending at the hydration call or the +first mount would miss post-hydration Link updates. +Timer turns use `setImmediate`; scrolling is a no-op +because this is CPU simulation rather than browser layout/paint measurement. + +Untimed assertions verify restored contexts and every loader row, zero client +`beforeLoad`/loader calls, expected hrefs/active state, original DOM-node identity, +working event handlers, and absence of hydration errors. Root unmount, pending +task cancellation, and window disposal also run outside measurement. Diagnostic +tests count Link renders or reactive evaluations and check they stop before the +measured region ends; counting is disabled in the timed workload. + +CodSpeed uses suite `beforeEach`/`afterEach` hooks. Ordinary Vitest instead +installs Tinybench's public Task iteration hooks from its stage-level `setup`. +Using only stage-level setup would let later iterations reuse an already +hydrated document. The hydration unit tests cover fresh-state setup through +both paths. + +Each scenario is included in its framework's aggregate build and CodSpeed run. +Land the benchmark independently to establish main's baseline before comparing a +hydration optimization. Regenerate each revision's artifacts with identical +fixture data and dependencies; do not pin an old hydration wire format forever. + ## Isolated route-tree construction `scenarios/route-tree-scale` measures navigation over an existing tree, not diff --git a/benchmarks/client-nav/package.json b/benchmarks/client-nav/package.json index 84f0dc9807..0b2a4cd5b3 100644 --- a/benchmarks/client-nav/package.json +++ b/benchmarks/client-nav/package.json @@ -64,6 +64,7 @@ "@benchmarks/client-nav-control-flow-react", "@benchmarks/client-nav-head-react", "@benchmarks/client-nav-history-react", + "@benchmarks/client-nav-hydration-react", "@benchmarks/client-nav-links-react", "@benchmarks/client-nav-loaders-react", "@benchmarks/client-nav-mount-react", @@ -92,6 +93,7 @@ "@benchmarks/client-nav-control-flow-solid", "@benchmarks/client-nav-head-solid", "@benchmarks/client-nav-history-solid", + "@benchmarks/client-nav-hydration-solid", "@benchmarks/client-nav-links-solid", "@benchmarks/client-nav-loaders-solid", "@benchmarks/client-nav-mount-solid", @@ -201,6 +203,8 @@ "@benchmarks/client-nav-history-react", "@benchmarks/client-nav-history-solid", "@benchmarks/client-nav-history-vue", + "@benchmarks/client-nav-hydration-react", + "@benchmarks/client-nav-hydration-solid", "@benchmarks/client-nav-links-react", "@benchmarks/client-nav-links-solid", "@benchmarks/client-nav-links-vue", diff --git a/benchmarks/client-nav/scenarios/hydration/react/fixture.ts b/benchmarks/client-nav/scenarios/hydration/react/fixture.ts new file mode 100644 index 0000000000..950c870a1c --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/fixture.ts @@ -0,0 +1,31 @@ +export const ordinaryLinkCount = 192 +export const hashLinkCount = 8 +export const serverUrl = '/teams/team-7/items/item-42?view=summary' +export const clientUrl = `${serverUrl}#details` + +export interface Diagnostics { + beforeLoads: number + loaders: number + mounted: boolean + clicks: number + ordinaryRenders: number + hashRenders: number + countRenders: boolean +} + +export function createDiagnostics(countRenders = false): Diagnostics { + return { + beforeLoads: 0, + loaders: 0, + mounted: false, + clicks: 0, + ordinaryRenders: 0, + hashRenders: 0, + countRenders, + } +} + +export interface FixtureArtifact { + html: string + scripts: Array +} diff --git a/benchmarks/client-nav/scenarios/hydration/react/generate-fixture.mjs b/benchmarks/client-nav/scenarios/hydration/react/generate-fixture.mjs new file mode 100644 index 0000000000..fbc67c5a08 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/generate-fixture.mjs @@ -0,0 +1,23 @@ +import assert from 'node:assert/strict' +import { writeFile } from 'node:fs/promises' +import { JSDOM } from 'jsdom' + +if (process.env.NODE_ENV !== 'production') { + throw new Error('Generate the hydration fixture in production mode') +} +const { renderFixture } = await import('./dist/server/server.js') +const html = await renderFixture() +const dom = new JSDOM(html) +try { + const scriptElements = [...dom.window.document.querySelectorAll('script')] + assert.ok(scriptElements.length > 0) + assert.ok(scriptElements.every((script) => !script.src)) + const scripts = scriptElements.map((script) => script.textContent) + assert.ok(scripts.some((script) => script.includes('$_TSR'))) + await writeFile( + new URL('./dist/fixture.json', import.meta.url), + JSON.stringify({ html, scripts }), + ) +} finally { + dom.window.close() +} diff --git a/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts b/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts new file mode 100644 index 0000000000..295f9ceb80 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts @@ -0,0 +1,106 @@ +import { expect, test } from 'vitest' +import { hashLinkCount, ordinaryLinkCount } from './fixture' +import { setup } from './setup' +import { settleHydration } from './settle' + +const turn = () => new Promise((resolve) => setImmediate(resolve)) + +test('restores data and context into fresh DOMs and includes follow-up renders', async () => { + const scenario = setup({ countRenders: true }) + for (let iteration = 0; iteration < 3; iteration++) { + await scenario.before() + try { + expect(scenario.snapshot().diagnostics.mounted).toBe(false) + expect(scenario.snapshot().matches).toBeUndefined() + await scenario.run() + const completed = scenario.snapshot() + // Supports both main's extra Link update and the optimized snapshot. + expect([ordinaryLinkCount, ordinaryLinkCount * 2]).toContain( + completed.diagnostics.ordinaryRenders, + ) + expect(completed.diagnostics.hashRenders).toBeGreaterThanOrEqual( + hashLinkCount + hashLinkCount / 2, + ) + for (let index = 0; index < 4; index++) { + await turn() + } + expect(scenario.snapshot()).toEqual(completed) + await expect(scenario.run()).rejects.toThrow('newly prepared sample') + } finally { + await scenario.after() + } + } +}) + +test('installs per-iteration preparation for the ordinary Vitest runner', async () => { + const scenario = setup() + const task: Parameters[0] = { + opts: {}, + } + scenario.installIterationHooks(task) + for (let iteration = 0; iteration < 2; iteration++) { + await task.opts.beforeEach!() + try { + expect(scenario.snapshot().diagnostics.mounted).toBe(false) + await scenario.run() + } finally { + await task.opts.afterEach!() + } + } +}) + +test('rejects an empty measurement and still releases its sample', async () => { + const scenario = setup() + await scenario.before() + await expect(scenario.after()).rejects.toThrow( + 'Hydration sample was not completed', + ) + await scenario.before() + try { + await scenario.run() + } finally { + await scenario.after() + } +}) + +test('waits for a commit and scheduler work lasting more than 100 turns', async () => { + let committed = false + const commit = (async () => { + for (let index = 0; index < 150; index++) { + await turn() + } + committed = true + })() + let remainingCallbacks = 150 + await settleHydration( + commit, + () => { + expect(committed).toBe(true) + return remainingCallbacks-- <= 0 + }, + () => 'delayed commit', + ) + expect(remainingCallbacks).toBeLessThan(0) +}) + +test('retains a watchdog for a commit that never completes', async () => { + await expect( + settleHydration( + new Promise(() => {}), + () => true, + () => 'commit pending', + 10, + ), + ).rejects.toThrow('Hydration did not settle within 10ms: commit pending') +}) + +test('retains a watchdog when scheduler work never becomes idle', async () => { + await expect( + settleHydration( + Promise.resolve(), + () => false, + () => 'callbacks pending', + 10, + ), + ).rejects.toThrow('Hydration did not settle within 10ms: callbacks pending') +}) diff --git a/benchmarks/client-nav/scenarios/hydration/react/project.json b/benchmarks/client-nav/scenarios/hydration/react/project.json new file mode 100644 index 0000000000..ece8f2de66 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/project.json @@ -0,0 +1,40 @@ +{ + "name": "@benchmarks/client-nav-hydration-react", + "projectType": "application", + "targets": { + "build:client": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": [ + { "projects": ["@tanstack/react-router"], "target": "build" } + ], + "options": { + "command": "NODE_ENV=production vite build --config {projectRoot}/vite.server.config.ts && NODE_ENV=production node {projectRoot}/generate-fixture.mjs && NODE_ENV=production vite build --config {projectRoot}/vite.config.ts" + } + }, + "test:unit": { + "executor": "nx:run-commands", + "dependsOn": ["build:client"], + "options": { + "command": "vitest run --config ./scenarios/hydration/react/vite.config.ts", + "cwd": "benchmarks/client-nav" + } + }, + "test:perf": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": ["build:client"], + "options": { + "command": "NODE_ENV=production vitest bench --run --config ./scenarios/hydration/react/vite.config.ts", + "cwd": "benchmarks/client-nav" + } + }, + "test:types:client": { + "executor": "nx:run-commands", + "dependsOn": [ + { "projects": ["@tanstack/react-router"], "target": "build" } + ], + "options": { "command": "tsc -p {projectRoot}/tsconfig.json --noEmit" } + } + } +} diff --git a/benchmarks/client-nav/scenarios/hydration/react/settle.ts b/benchmarks/client-nav/scenarios/hydration/react/settle.ts new file mode 100644 index 0000000000..cc4c09a72d --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/settle.ts @@ -0,0 +1,35 @@ +const turn = () => new Promise((resolve) => setImmediate(resolve)) + +export async function settleHydration( + committed: Promise, + isIdle: () => boolean, + describeProgress: () => string, + timeoutMs = 60_000, +) { + let timeoutError: Error | undefined + let watchdog: ReturnType | undefined + const timeout = new Promise((_, reject) => { + watchdog = setTimeout(() => { + timeoutError = new Error( + `Hydration did not settle within ${timeoutMs}ms: ${describeProgress()}`, + ) + reject(timeoutError) + }, timeoutMs) + }) + try { + // Concurrent hydration can need many more scheduler turns under CPU + // instrumentation. Await its commit instead of limiting successful work + // to an arbitrary number of event-loop polls. + await Promise.race([committed, timeout]) + let idleTurns = 0 + while (idleTurns < 2) { + await turn() + if (timeoutError) { + throw timeoutError + } + idleTurns = isIdle() ? idleTurns + 1 : 0 + } + } finally { + clearTimeout(watchdog) + } +} diff --git a/benchmarks/client-nav/scenarios/hydration/react/setup.ts b/benchmarks/client-nav/scenarios/hydration/react/setup.ts new file mode 100644 index 0000000000..caaa539991 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/setup.ts @@ -0,0 +1,307 @@ +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { fileURLToPath } from 'node:url' +import { Script } from 'node:vm' +import { JSDOM, VirtualConsole } from 'jsdom' +import { clientUrl, hashLinkCount, ordinaryLinkCount } from './fixture' +import { settleHydration } from './settle' +import type { FixtureArtifact } from './fixture' +import type * as Client from './src/client' + +type ClientApp = typeof Client +type TaskHooks = { + opts: { + beforeEach?: () => void | Promise + afterEach?: () => void | Promise + } +} + +const turn = () => new Promise((resolve) => setImmediate(resolve)) + +export function setup({ countRenders = false } = {}) { + // Compile once, outside measurement. Evaluation below creates fresh objects + // in each window's realm; neither the payload nor module state is reused. + const artifact: FixtureArtifact = JSON.parse( + readFileSync(new URL('./dist/fixture.json', import.meta.url), 'utf8'), + ) + const clientPath = new URL('./dist/client/client.js', import.meta.url) + const clientScript = new Script(readFileSync(clientPath, 'utf8'), { + filename: fileURLToPath(clientPath), + }) + const bootstrapScripts = artifact.scripts.map( + (source, index) => + new Script(source, { + filename: `hydration-bootstrap-${index}.js`, + }), + ) + let current: Awaited> | undefined + + async function prepare() { + const errors: Array = [] + const virtualConsole = new VirtualConsole() + virtualConsole.on('jsdomError', (error) => errors.push(String(error))) + virtualConsole.on('error', (...args) => + errors.push(args.map(String).join(' ')), + ) + const dom = new JSDOM(artifact.html, { + url: `http://localhost${clientUrl}`, + runScripts: 'outside-only', + virtualConsole, + }) + const immediates = new Set() + try { + Object.assign(dom.window, { + TextEncoder, + TextDecoder, + ReadableStream, + WritableStream, + TransformStream, + // Let React's production scheduler use the same task-turn primitive as + // the existing Node client benchmarks, without a real-delay timer. + setImmediate( + callback: (...args: Array) => void, + ...args: Array + ) { + const handle = setImmediate(() => { + immediates.delete(handle) + callback(...args) + }) + immediates.add(handle) + return handle + }, + clearImmediate(handle: NodeJS.Immediate) { + immediates.delete(handle) + clearImmediate(handle) + }, + fetch() { + throw new Error('Hydration attempted a network request') + }, + scrollTo() {}, + }) + const context = dom.getInternalVMContext() + // jsdom has no layout/scroll implementation; only hydration CPU is measured. + dom.window.HTMLElement.prototype.scrollIntoView = () => {} + clientScript.runInContext(context) + const app = (dom.window as unknown as { HydrationBenchmark: ClientApp }) + .HydrationBenchmark + assert.equal(app.serverEnvironment, false) + const anchors = Array.from(dom.window.document.querySelectorAll('a')) + const scriptElements = Array.from( + dom.window.document.querySelectorAll('script'), + ) + const executingScript = { current: null as HTMLScriptElement | null } + Object.defineProperty(dom.window.document, 'currentScript', { + configurable: true, + get: () => executingScript.current, + }) + assert.equal(anchors.length, ordinaryLinkCount + hashLinkCount) + const content = dom.window.document.getElementById('hydration-content') + assert.ok(content) + // Finish jsdom's initial document lifecycle before opening the measure. + await turn() + assert.equal(dom.window.document.readyState, 'complete') + assert.equal(app.ready(), false) + return { + dom, + context, + app, + anchors, + content, + scriptElements, + executingScript, + immediates, + errors, + started: false, + completed: false, + failed: false, + } + } catch (error) { + for (const handle of immediates) { + clearImmediate(handle) + } + dom.window.close() + throw error + } + } + + async function before() { + if (current) { + throw new Error('Previous hydration sample was not disposed') + } + current = await prepare() + } + + async function run() { + const sample = current + if (!sample || sample.started) { + throw new Error('Hydration requires a newly prepared sample') + } + sample.started = true + try { + // HTML parsing/module evaluation are already done. Payload execution, + // router initialization/restoration and React hydration are measured. + for (let index = 0; index < bootstrapScripts.length; index++) { + // SSR bootstrap scripts remove their own script element after running. + sample.executingScript.current = sample.scriptElements[index]! + try { + bootstrapScripts[index]!.runInContext(sample.context) + } finally { + sample.executingScript.current = null + } + } + await settleHydration( + sample.app.start(countRenders), + () => sample.immediates.size === 0, + () => { + const progress = sample.app.snapshot() + return JSON.stringify({ + diagnostics: progress.diagnostics, + errors: [...sample.errors, ...progress.errors], + restoredMatches: progress.matches?.length, + pendingSchedulerCallbacks: sample.immediates.size, + }) + }, + ) + if (sample.errors.length) { + throw new Error(sample.errors.join('\n')) + } + assert.ok( + sample.app.ready(), + 'Hydration committed without the expected active links', + ) + sample.completed = true + } catch (error) { + sample.failed = true + throw error + } + } + + function snapshot() { + if (!current) { + throw new Error('No hydration sample') + } + // Normalize realm prototypes only for untimed assertions. + return JSON.parse(JSON.stringify(current.app.snapshot())) as ReturnType< + ClientApp['snapshot'] + > + } + + function validate() { + assert.ok(current?.started) + const { dom, anchors, content, errors } = current + const doc = dom.window.document + const result = snapshot() + assert.deepEqual(errors, []) + assert.deepEqual(result.errors, []) + assert.equal(result.diagnostics.beforeLoads, 0) + assert.equal(result.diagnostics.loaders, 0) + assert.equal(result.diagnostics.mounted, true) + assert.equal(result.location, clientUrl) + assert.equal(result.matches?.length, 3) + for (const match of result.matches) { + assert.equal(match.status, 'success') + assert.deepEqual(match.context.viewer, { + id: 'viewer-3', + name: 'Ada', + role: 'editor', + }) + } + assert.deepEqual(result.matches[1]!.context.team, { + id: 'team-7', + member: 'viewer-3', + }) + assert.deepEqual(result.matches[2]!.context.permissions, { edit: true }) + assert.deepEqual(result.matches[1]!.loaderData, { + title: 'Team team-7', + categories: ['open', 'closed'], + }) + const data = result.matches[2]!.loaderData as { + owner: string + selected: string + rows: Array<{ + id: string + label: string + details: { score: number; open: boolean } + }> + } + assert.equal(data.owner, 'viewer-3') + assert.equal(data.selected, 'item-42') + assert.equal(data.rows.length, ordinaryLinkCount) + assert.equal(doc.getElementById('hydration-content'), content) + assert.equal(doc.querySelectorAll('a').length, anchors.length) + assert.equal(doc.getElementById('viewer')?.textContent, 'Ada') + assert.equal(doc.getElementById('permission')?.textContent, 'Editable') + for (const anchor of anchors) { + assert.equal(doc.getElementById(anchor.id), anchor) + } + for (let index = 0; index < ordinaryLinkCount; index++) { + const anchor = doc.getElementById(`ordinary-item-${index}`)! + assert.equal( + anchor.getAttribute('href'), + `/teams/team-7/items/item-${index}?view=summary`, + ) + assert.equal(anchor.textContent, `Item ${index}`) + assert.equal( + anchor.getAttribute('data-status'), + index === 42 ? 'active' : null, + ) + assert.deepEqual(data.rows[index], { + id: `item-${index}`, + label: `Item ${index}`, + details: { score: index * 3, open: index % 2 === 0 }, + }) + } + for (let index = 0; index < hashLinkCount; index++) { + assert.equal( + doc.getElementById(`hash-${index}`)?.getAttribute('data-status'), + index % 2 === 0 ? 'active' : null, + ) + } + doc + .getElementById('interactive')! + .dispatchEvent(new dom.window.MouseEvent('click', { bubbles: true })) + assert.equal( + current.app.snapshot().diagnostics.clicks, + result.diagnostics.clicks + 1, + ) + } + + async function after() { + const sample = current + if (!sample) { + return + } + try { + if (!sample.failed) { + assert.ok(sample.completed, 'Hydration sample was not completed') + validate() + } + } finally { + current = undefined + try { + sample.app.dispose() + // Unmount work and its scheduled effects stay outside the measure. + await turn() + await turn() + } finally { + for (const handle of sample.immediates) { + clearImmediate(handle) + } + sample.dom.window.close() + } + } + } + + return { + before, + run, + after, + snapshot, + // Vitest passes setup to the Tinybench Bench, where it runs once per + // warmup/run stage. Install the Task's public per-iteration hooks there. + installIterationHooks(task: TaskHooks) { + task.opts.beforeEach = before + task.opts.afterEach = after + }, + } +} diff --git a/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts b/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts new file mode 100644 index 0000000000..6f6142b9de --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts @@ -0,0 +1,23 @@ +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { setup } from './setup' + +describe('client-hydration', () => { + const scenario = setup() + // CodSpeed uses suite hooks; ordinary Vitest uses the Tinybench Task hooks + // installed below. Both prepare and dispose every sample outside timing. + beforeEach(scenario.before) + afterEach(scenario.after) + bench( + 'hydrate restored route state and mixed Links (react)', + async () => { + await scenario.run() + }, + { + setup: scenario.installIterationHooks, + time: 5000, + warmupTime: 1000, + warmupIterations: 20, + throws: true, + }, + ) +}) diff --git a/benchmarks/client-nav/scenarios/hydration/react/src/app.tsx b/benchmarks/client-nav/scenarios/hydration/react/src/app.tsx new file mode 100644 index 0000000000..e9797f71fa --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/src/app.tsx @@ -0,0 +1,216 @@ +import { useEffect } from 'react' +import { + HeadContent, + Link, + Outlet, + Scripts, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, + useHydrated, +} from '@tanstack/react-router' +import { + clientUrl, + hashLinkCount, + ordinaryLinkCount, + serverUrl, +} from '../fixture' +import type { ReactNode } from 'react' +import type { Diagnostics } from '../fixture' + +export function createFixtureRouter( + server: boolean, + diagnostics: Diagnostics, + onHydrated: () => void = () => {}, +) { + function beforeLoad() { + diagnostics.beforeLoads++ + if (!server) { + throw new Error('Hydration reran beforeLoad instead of restoring context') + } + } + + function loader() { + diagnostics.loaders++ + if (!server) { + throw new Error('Hydration reran a loader instead of restoring data') + } + } + + const root = createRootRoute({ + beforeLoad: () => { + beforeLoad() + return { viewer: { id: 'viewer-3', name: 'Ada', role: 'editor' } } + }, + head: () => ({ + meta: [{ charSet: 'utf-8' }, { title: 'Hydration benchmark' }], + }), + shellComponent: Document, + }) + const team = createRoute({ + getParentRoute: () => root, + path: '/teams/$teamId', + beforeLoad: ({ context, params }) => { + beforeLoad() + return { team: { id: params.teamId, member: context.viewer.id } } + }, + loader: ({ context }) => { + loader() + return { + title: `Team ${context.team.id}`, + categories: ['open', 'closed'], + } + }, + component: Team, + }) + const items = createRoute({ + getParentRoute: () => team, + path: 'items/$itemId', + validateSearch: (search: Record) => ({ + view: search.view === 'details' ? 'details' : 'summary', + }), + beforeLoad: ({ context }) => { + beforeLoad() + return { permissions: { edit: context.viewer.role === 'editor' } } + }, + loader: ({ context, params }) => { + loader() + return { + selected: params.itemId, + owner: context.team.member, + rows: Array.from({ length: ordinaryLinkCount }, (_, index) => ({ + id: `item-${index}`, + label: `Item ${index}`, + details: { score: index * 3, open: index % 2 === 0 }, + })), + } + }, + component: Items, + }) + + function Document({ children }: { children: ReactNode }) { + return ( + + + + + + {children} + + + + ) + } + + function Team() { + const context = team.useRouteContext() + const data = team.useLoaderData() + return ( +
+

{data.title}

+

{context.viewer.name}

+ +
+ ) + } + + function Items() { + const data = items.useLoaderData() + const context = items.useRouteContext() + useEffect(() => { + diagnostics.mounted = true + }, []) + return ( + <> +

+ {context.permissions.edit ? 'Editable' : 'Read only'} +

+ + + + {data.rows.map((row) => ( + + + + + + ))} + +
{row.id}{row.details.score} + + {diagnostics.countRenders + ? () => { + diagnostics.ordinaryRenders++ + return row.label + } + : row.label} + +
+ +
Details
+ + + ) + } + + function HydrationComplete() { + const hydrated = useHydrated() + useEffect(() => { + if (hydrated) { + onHydrated() + } + }, [hydrated]) + return null + } + + return createRouter({ + routeTree: root.addChildren([team.addChildren([items])]), + history: createMemoryHistory({ + initialEntries: [server ? serverUrl : clientUrl], + }), + isServer: server, + scrollRestoration: false, + defaultHashScrollIntoView: false, + defaultPreload: false, + }) +} + +declare module '@tanstack/react-router' { + interface Register { + router: ReturnType + } +} diff --git a/benchmarks/client-nav/scenarios/hydration/react/src/client.tsx b/benchmarks/client-nav/scenarios/hydration/react/src/client.tsx new file mode 100644 index 0000000000..42c5a5104e --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/src/client.tsx @@ -0,0 +1,83 @@ +import { startTransition } from 'react' +import { hydrateRoot } from 'react-dom/client' +import { RouterProvider } from '@tanstack/react-router' +import { hydrate } from '@tanstack/react-router/ssr/client' +import { isServer } from '@tanstack/router-core/isServer' +import { createDiagnostics, hashLinkCount } from '../fixture' +import { createFixtureRouter } from './app' + +export const serverEnvironment = isServer +let router: ReturnType | undefined +let root: ReturnType | undefined +let diagnostics = createDiagnostics() +const errors: Array = [] + +export async function start(countRenders = false) { + if (router) { + throw new Error('A hydration sample must use a fresh client realm') + } + if (!window.$_TSR?.router) { + throw new Error('Missing SSR hydration payload') + } + diagnostics = createDiagnostics(countRenders) + let resolveHydrated!: () => void + let rejectHydrated!: (error: unknown) => void + const hydrated = new Promise((resolve, reject) => { + resolveHydrated = resolve + rejectHydrated = reject + }) + router = createFixtureRouter(false, diagnostics, resolveHydrated) + // This is the same restoration path used by Start, without a module-cached + // RouterClient/StartClient promise or a live server in the worker. + await hydrate(router) + window.$_TSR.h() + startTransition(() => { + root = hydrateRoot(document, , { + onRecoverableError: (error) => { + errors.push(String(error)) + rejectHydrated(error) + }, + onUncaughtError: (error) => { + errors.push(String(error)) + rejectHydrated(error) + }, + }) + }) + await hydrated +} + +export function ready() { + if (!diagnostics.mounted) { + return false + } + // Matching hash Links only become active in the follow-up hydration commit. + // Ending at the first mount effect would miss the work this scenario targets. + for (let index = 0; index < hashLinkCount; index += 2) { + if ( + document.getElementById(`hash-${index}`)?.getAttribute('data-status') !== + 'active' + ) { + return false + } + } + return true +} + +export function snapshot() { + const matches = router?.stores.matches.get() + return { + diagnostics: { ...diagnostics }, + errors: [...errors], + location: router?.stores.location.get().href, + matches: matches?.map((match) => ({ + status: match.status, + context: match.context, + loaderData: match.loaderData, + })), + } +} + +export function dispose() { + root?.unmount() + router?.history.destroy() +} diff --git a/benchmarks/client-nav/scenarios/hydration/react/src/server.tsx b/benchmarks/client-nav/scenarios/hydration/react/src/server.tsx new file mode 100644 index 0000000000..713b0a77f2 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/src/server.tsx @@ -0,0 +1,29 @@ +import { + createRequestHandler, + defaultStreamHandler, +} from '@tanstack/react-router/ssr/server' +import { isServer } from '@tanstack/router-core/isServer' +import { createDiagnostics, serverUrl } from '../fixture' +import { createFixtureRouter } from './app' + +export async function renderFixture() { + if ((isServer as boolean | undefined) !== true) { + throw new Error('Fixture generation requires the production server build') + } + const diagnostics = createDiagnostics() + const response = await createRequestHandler({ + createRouter: () => createFixtureRouter(true, diagnostics), + request: new Request(`http://localhost${serverUrl}`), + })(defaultStreamHandler) + const html = await response.text() + if ( + response.status !== 200 || + diagnostics.beforeLoads !== 3 || + diagnostics.loaders !== 2 + ) { + throw new Error( + 'SSR fixture did not execute its beforeLoad and loader functions', + ) + } + return html +} diff --git a/benchmarks/client-nav/scenarios/hydration/react/tsconfig.json b/benchmarks/client-nav/scenarios/hydration/react/tsconfig.json new file mode 100644 index 0000000000..23dd08de8b --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/tsconfig.json @@ -0,0 +1,10 @@ +{ + "extends": "../../../../../tsconfig.json", + "compilerOptions": { + "jsx": "react-jsx", + "jsxImportSource": "react", + "allowImportingTsExtensions": true, + "types": ["node", "vite/client", "vitest/globals"] + }, + "include": ["./*.ts", "./src/**/*"] +} diff --git a/benchmarks/client-nav/scenarios/hydration/react/vite.config.ts b/benchmarks/client-nav/scenarios/hydration/react/vite.config.ts new file mode 100644 index 0000000000..62ab87115b --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/vite.config.ts @@ -0,0 +1,36 @@ +import { fileURLToPath } from 'node:url' +import { defineConfig } from 'vitest/config' +import react from '@vitejs/plugin-react' +import codspeedPlugin from '@codspeed/vitest-plugin' +import { cpuSimulationExecArgv } from '../../../../cpu-simulation' + +export default defineConfig({ + root: fileURLToPath(new URL('.', import.meta.url)), + define: { 'process.env.NODE_ENV': JSON.stringify('production') }, + plugins: [ + !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) && + codspeedPlugin(), + react(), + ], + resolve: { conditions: ['browser', 'production'] }, + build: { + outDir: './dist/client', + emptyOutDir: true, + minify: false, + lib: { + entry: './src/client.tsx', + name: 'HydrationBenchmark', + formats: ['iife'], + fileName: () => 'client.js', + }, + }, + test: { + execArgv: cpuSimulationExecArgv(), + name: '@benchmarks/client-nav hydration (react)', + watch: false, + environment: 'node', + isolate: true, + include: ['hydration.test.ts'], + benchmark: { include: ['speed.bench.ts'] }, + }, +}) diff --git a/benchmarks/client-nav/scenarios/hydration/react/vite.server.config.ts b/benchmarks/client-nav/scenarios/hydration/react/vite.server.config.ts new file mode 100644 index 0000000000..fbf6a149b9 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/react/vite.server.config.ts @@ -0,0 +1,26 @@ +import { fileURLToPath } from 'node:url' +import { defineConfig } from 'vite' +import react from '@vitejs/plugin-react' + +export default defineConfig({ + root: fileURLToPath(new URL('.', import.meta.url)), + define: { 'process.env.NODE_ENV': JSON.stringify('production') }, + plugins: [react()], + resolve: { conditions: ['node', 'production'] }, + ssr: { noExternal: true }, + build: { + ssr: true, + outDir: './dist/server', + emptyOutDir: true, + minify: false, + lib: { + entry: './src/server.tsx', + formats: ['es'], + fileName: () => 'server.js', + }, + rolldownOptions: { + platform: 'node', + external: [/^node:/, /^react(?:\/|$)/, /^react-dom(?:\/|$)/], + }, + }, +}) diff --git a/benchmarks/client-nav/scenarios/hydration/solid/fixture.ts b/benchmarks/client-nav/scenarios/hydration/solid/fixture.ts new file mode 100644 index 0000000000..4c86d0e2f4 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/solid/fixture.ts @@ -0,0 +1,35 @@ +export { + clientUrl, + hashLinkCount, + ordinaryLinkCount, + serverUrl, +} from '../react/fixture' +export type { FixtureArtifact } from '../react/fixture' + +export interface Diagnostics { + beforeLoads: number + loaders: number + mounted: boolean + rendered: number + clicks: number + countUpdates: boolean + ordinaryEvaluations: number + hashEvaluations: number + initialHashStates: Array + hashStates: Array +} + +export function createDiagnostics(countUpdates = false): Diagnostics { + return { + beforeLoads: 0, + loaders: 0, + mounted: false, + rendered: 0, + clicks: 0, + countUpdates, + ordinaryEvaluations: 0, + hashEvaluations: 0, + initialHashStates: [], + hashStates: [], + } +} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/generate-fixture.mjs b/benchmarks/client-nav/scenarios/hydration/solid/generate-fixture.mjs new file mode 100644 index 0000000000..63647e1be7 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/solid/generate-fixture.mjs @@ -0,0 +1,30 @@ +import assert from 'node:assert/strict' +import { writeFile } from 'node:fs/promises' +import { JSDOM } from 'jsdom' + +if (process.env.NODE_ENV !== 'production') { + throw new Error('Generate the hydration fixture in production mode') +} +const { renderFixture } = await import('./dist/server/server.js') +const html = await renderFixture() +const dom = new JSDOM(html) +try { + const doc = dom.window.document + const scriptElements = [...doc.querySelectorAll('script')] + assert.ok(scriptElements.length > 0) + assert.ok(scriptElements.every((script) => !script.src)) + const scripts = scriptElements.map((script) => script.textContent) + assert.ok(scripts.some((script) => script.includes('$_TSR'))) + assert.ok(scripts.some((script) => script.includes('_$HY'))) + assert.ok(doc.documentElement.hasAttribute('data-hk')) + assert.ok(doc.getElementById('hydration-content')?.hasAttribute('data-hk')) + assert.ok( + [...doc.querySelectorAll('a')].every((a) => a.hasAttribute('data-hk')), + ) + await writeFile( + new URL('./dist/fixture.json', import.meta.url), + JSON.stringify({ html, scripts }), + ) +} finally { + dom.window.close() +} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts b/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts new file mode 100644 index 0000000000..ca519d98bb --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts @@ -0,0 +1,85 @@ +import { expect, test } from 'vitest' +import { hashLinkCount, ordinaryLinkCount } from './fixture' +import { setup } from './setup' + +const turn = () => new Promise((resolve) => setImmediate(resolve)) + +test('restores fresh DOMs and route state and completes hash-link reactivity', async () => { + const scenario = setup({ countUpdates: true }) + let previous: ReturnType | undefined + for (let iteration = 0; iteration < 3; iteration++) { + await scenario.before() + try { + const initial = scenario.snapshot() + expect(initial.matches).toBeUndefined() + expect(initial.diagnostics.mounted).toBe(false) + expect(initial.diagnostics.rendered).toBe(0) + expect(initial.diagnostics.clicks).toBe(0) + expect(initial.diagnostics.ordinaryEvaluations).toBe(0) + expect(initial.diagnostics.hashEvaluations).toBe(0) + expect(initial.diagnostics.initialHashStates).toEqual([]) + await scenario.run() + const completed = scenario.snapshot() + expect(completed.diagnostics.ordinaryEvaluations).toBeGreaterThanOrEqual( + ordinaryLinkCount, + ) + expect(completed.diagnostics.initialHashStates).toEqual( + Array.from({ length: hashLinkCount }, () => false), + ) + expect(completed.diagnostics.hashStates).toEqual( + Array.from({ length: hashLinkCount }, (_, index) => index % 2 === 0), + ) + expect(completed.diagnostics.hashEvaluations).toBeGreaterThanOrEqual( + hashLinkCount + hashLinkCount / 2, + ) + expect(completed.hydrating).toBe(false) + for (let index = 0; index < 4; index++) { + await turn() + } + expect(scenario.snapshot()).toEqual(completed) + if (previous) { + expect(completed).toEqual(previous) + } + previous = completed + await expect(scenario.run()).rejects.toThrow('newly prepared sample') + } finally { + // Untimed assertions include DOM identity, all restored data/context, + // native event handling, and the absence of hydration diagnostics. + await scenario.after() + } + } +}) + +test('installs per-iteration preparation for the ordinary Vitest runner', async () => { + const scenario = setup() + const task: Parameters[0] = { + opts: {}, + } + scenario.installIterationHooks(task) + for (let iteration = 0; iteration < 2; iteration++) { + await task.opts.beforeEach!() + try { + expect(scenario.snapshot().diagnostics.mounted).toBe(false) + expect(scenario.snapshot().diagnostics.clicks).toBe(0) + await scenario.run() + expect(scenario.snapshot().diagnostics.hashEvaluations).toBe(0) + } finally { + await task.opts.afterEach!() + } + } +}) + +test('rejects an empty measurement and still releases its sample', async () => { + const scenario = setup() + await scenario.before() + await expect(scenario.after()).rejects.toThrow( + 'Hydration sample was not completed', + ) + await scenario.before() + try { + await expect(scenario.before()).rejects.toThrow('was not disposed') + await scenario.run() + } finally { + await scenario.after() + } +}) diff --git a/benchmarks/client-nav/scenarios/hydration/solid/project.json b/benchmarks/client-nav/scenarios/hydration/solid/project.json new file mode 100644 index 0000000000..978fdc6bf7 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/solid/project.json @@ -0,0 +1,40 @@ +{ + "name": "@benchmarks/client-nav-hydration-solid", + "projectType": "application", + "targets": { + "build:client": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": [ + { "projects": ["@tanstack/solid-router"], "target": "build" } + ], + "options": { + "command": "NODE_ENV=production vite build --config {projectRoot}/vite.server.config.ts && NODE_ENV=production node {projectRoot}/generate-fixture.mjs && NODE_ENV=production vite build --config {projectRoot}/vite.config.ts" + } + }, + "test:unit": { + "executor": "nx:run-commands", + "dependsOn": ["build:client"], + "options": { + "command": "vitest run --config ./scenarios/hydration/solid/vite.config.ts", + "cwd": "benchmarks/client-nav" + } + }, + "test:perf": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": ["build:client"], + "options": { + "command": "NODE_ENV=production vitest bench --run --config ./scenarios/hydration/solid/vite.config.ts", + "cwd": "benchmarks/client-nav" + } + }, + "test:types:client": { + "executor": "nx:run-commands", + "dependsOn": [ + { "projects": ["@tanstack/solid-router"], "target": "build" } + ], + "options": { "command": "tsc -p {projectRoot}/tsconfig.json --noEmit" } + } + } +} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/setup.ts b/benchmarks/client-nav/scenarios/hydration/solid/setup.ts new file mode 100644 index 0000000000..29a86d6743 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/solid/setup.ts @@ -0,0 +1,339 @@ +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { fileURLToPath } from 'node:url' +import { Script } from 'node:vm' +import { JSDOM, VirtualConsole } from 'jsdom' +import { clientUrl, hashLinkCount, ordinaryLinkCount } from './fixture' +import type { FixtureArtifact } from './fixture' +import type * as Client from './src/client' + +type ClientApp = typeof Client +type TaskHooks = { + opts: { + beforeEach?: () => void | Promise + afterEach?: () => void | Promise + } +} + +const turn = () => new Promise((resolve) => setImmediate(resolve)) +const maxSettleTurns = 100 + +export function setup({ countUpdates = false } = {}) { + // Compile once, outside measurement; evaluate the entire production bundle + // anew in every window, including Solid's module-level hydration state. + const artifact: FixtureArtifact = JSON.parse( + readFileSync(new URL('./dist/fixture.json', import.meta.url), 'utf8'), + ) + const clientPath = new URL('./dist/client/client.js', import.meta.url) + const clientScript = new Script(readFileSync(clientPath, 'utf8'), { + filename: fileURLToPath(clientPath), + }) + const bootstrapScripts = artifact.scripts.map( + (source, index) => + new Script(source, { + filename: `solid-hydration-bootstrap-${index}.js`, + }), + ) + let current: Awaited> | undefined + + async function prepare() { + const errors: Array = [] + const virtualConsole = new VirtualConsole() + virtualConsole.on('jsdomError', (error) => errors.push(String(error))) + for (const event of ['error', 'warn'] as const) { + virtualConsole.on(event, (...args) => + errors.push(args.map(String).join(' ')), + ) + } + const dom = new JSDOM(artifact.html, { + url: `http://localhost${clientUrl}`, + runScripts: 'outside-only', + virtualConsole, + }) + const immediates = new Set() + try { + Object.assign(dom.window, { + TextEncoder, + TextDecoder, + ReadableStream, + WritableStream, + TransformStream, + setImmediate( + callback: (...args: Array) => void, + ...args: Array + ) { + const handle = setImmediate(() => { + immediates.delete(handle) + callback(...args) + }) + immediates.add(handle) + return handle + }, + clearImmediate(handle: NodeJS.Immediate) { + immediates.delete(handle) + clearImmediate(handle) + }, + fetch() { + throw new Error('Hydration attempted a network request') + }, + scrollTo() {}, + }) + dom.window.addEventListener('unhandledrejection', (event) => { + errors.push(String(event.reason)) + }) + dom.window.HTMLElement.prototype.scrollIntoView = () => {} + const context = dom.getInternalVMContext() + clientScript.runInContext(context) + const app = (dom.window as unknown as { HydrationBenchmark: ClientApp }) + .HydrationBenchmark + assert.equal(app.serverEnvironment, false) + assert.equal(app.solidServerEnvironment, false) + const doc = dom.window.document + const anchors = Array.from(doc.querySelectorAll('a')) + const scriptElements = Array.from(doc.querySelectorAll('script')) + assert.equal(scriptElements.length, bootstrapScripts.length) + const executingScript = { current: null as HTMLScriptElement | null } + Object.defineProperty(doc, 'currentScript', { + configurable: true, + get: () => executingScript.current, + }) + assert.equal(anchors.length, ordinaryLinkCount + hashLinkCount) + const content = doc.getElementById('hydration-content') + assert.ok(content) + assert.ok(content.hasAttribute('data-hk')) + assert.ok(anchors.every((anchor) => anchor.hasAttribute('data-hk'))) + for (let index = 0; index < hashLinkCount; index++) { + assert.equal( + doc.getElementById(`hash-${index}`)?.getAttribute('data-status'), + null, + ) + } + // Production Solid can fall back to templates for missing hydration keys. + // Retain every workload element, not only the parent and the anchors. + const elements = Array.from(content.querySelectorAll('*')) + const documentElement = doc.documentElement + await turn() + assert.equal(doc.readyState, 'complete') + assert.equal(app.ready(), false) + assert.deepEqual(errors, []) + return { + dom, + context, + app, + anchors, + content, + elements, + documentElement, + scriptElements, + executingScript, + immediates, + errors, + started: false, + completed: false, + failed: false, + } + } catch (error) { + for (const handle of immediates) { + clearImmediate(handle) + } + dom.window.close() + throw error + } + } + + async function before() { + if (current) { + throw new Error('Previous hydration sample was not disposed') + } + current = await prepare() + } + + async function run() { + const sample = current + if (!sample || sample.started) { + throw new Error('Hydration requires a newly prepared sample') + } + sample.started = true + try { + // Parsing/evaluation are done. Execute both native Solid bootstrap and + // Router payload, then create/restore the router and hydrate the DOM. + for (let index = 0; index < bootstrapScripts.length; index++) { + // Router scripts remove document.currentScript. Keep the original + // script nodes and order, including Solid's bootstrap and markers. + sample.executingScript.current = sample.scriptElements[index]! + try { + bootstrapScripts[index]!.runInContext(sample.context) + } finally { + sample.executingScript.current = null + } + } + await sample.app.start(countUpdates) + let idleTurns = 0 + for (let index = 0; index < maxSettleTurns; index++) { + await turn() + if (sample.errors.length) { + throw new Error(sample.errors.join('\n')) + } + if (sample.app.ready() && sample.immediates.size === 0) { + if (++idleTurns === 2) { + sample.completed = true + return + } + } else { + idleTurns = 0 + } + } + throw new Error( + `Hydration did not settle: ${JSON.stringify(sample.app.snapshot())}`, + ) + } catch (error) { + sample.failed = true + throw error + } + } + + function snapshot() { + if (!current) { + throw new Error('No hydration sample') + } + // Normalize realm prototypes only for untimed assertions. + return JSON.parse(JSON.stringify(current.app.snapshot())) as ReturnType< + ClientApp['snapshot'] + > + } + + function validate() { + assert.ok(current?.started) + const { dom, anchors, content, elements, documentElement, errors } = current + const doc = dom.window.document + const result = snapshot() + assert.deepEqual(errors, []) + assert.equal(result.diagnostics.beforeLoads, 0) + assert.equal(result.diagnostics.loaders, 0) + assert.equal(result.diagnostics.mounted, true) + assert.ok(result.diagnostics.rendered > 0) + assert.equal(result.hydrating, false) + assert.equal(result.location, clientUrl) + assert.equal(result.resolvedLocation, clientUrl) + assert.equal(result.matches?.length, 3) + for (const match of result.matches) { + assert.equal(match.status, 'success') + assert.deepEqual(match.context.viewer, { + id: 'viewer-3', + name: 'Ada', + role: 'editor', + }) + } + const teamContext = { id: 'team-7', member: 'viewer-3' } + assert.deepEqual(result.matches[1]!.context.team, teamContext) + assert.deepEqual(result.matches[2]!.context.team, teamContext) + assert.deepEqual(result.matches[2]!.context.permissions, { edit: true }) + assert.deepEqual(result.matches[1]!.loaderData, { + title: 'Team team-7', + categories: ['open', 'closed'], + }) + const data = result.matches[2]!.loaderData as { + owner: string + selected: string + rows: Array<{ + id: string + label: string + details: { score: number; open: boolean } + }> + } + assert.equal(data.owner, 'viewer-3') + assert.equal(data.selected, 'item-42') + assert.equal(data.rows.length, ordinaryLinkCount) + assert.equal(doc.documentElement, documentElement) + assert.equal(doc.getElementById('hydration-content'), content) + const hydratedElements = Array.from(content.querySelectorAll('*')) + assert.equal(hydratedElements.length, elements.length) + elements.forEach((element, index) => { + assert.equal(hydratedElements[index], element) + }) + assert.equal(doc.querySelectorAll('a').length, anchors.length) + assert.equal(doc.title, 'Hydration benchmark') + assert.equal(content.querySelector('h1')?.textContent, 'Team team-7') + assert.equal(doc.getElementById('viewer')?.textContent, 'Ada') + assert.equal(doc.getElementById('permission')?.textContent, 'Editable') + for (const anchor of anchors) { + assert.equal(doc.getElementById(anchor.id), anchor) + } + for (let index = 0; index < ordinaryLinkCount; index++) { + const anchor = doc.getElementById(`ordinary-item-${index}`)! + assert.equal( + anchor.getAttribute('href'), + `/teams/team-7/items/item-${index}?view=summary`, + ) + assert.equal(anchor.textContent, `Item ${index}`) + assert.equal( + anchor.getAttribute('data-status'), + index === 42 ? 'active' : null, + ) + assert.deepEqual(data.rows[index], { + id: `item-${index}`, + label: `Item ${index}`, + details: { score: index * 3, open: index % 2 === 0 }, + }) + } + for (let index = 0; index < hashLinkCount; index++) { + const anchor = doc.getElementById(`hash-${index}`)! + assert.equal( + anchor.getAttribute('data-status'), + index % 2 === 0 ? 'active' : null, + ) + assert.equal( + anchor.getAttribute('href'), + `/teams/team-7/items/item-42?view=summary#${index % 2 === 0 ? 'details' : 'other'}`, + ) + assert.equal(anchor.textContent, `Section ${index}`) + } + assert.equal(result.diagnostics.clicks, 0) + doc + .getElementById('interactive')! + .dispatchEvent(new dom.window.MouseEvent('click', { bubbles: true })) + assert.equal(current.app.snapshot().diagnostics.clicks, 1) + assert.deepEqual(errors, []) + } + + async function after() { + const sample = current + if (!sample) { + return + } + try { + if (!sample.failed) { + assert.ok(sample.completed, 'Hydration sample was not completed') + validate() + } + } finally { + current = undefined + try { + sample.app.dispose() + await turn() + await turn() + if (!sample.failed) { + assert.deepEqual(sample.errors, []) + } + } finally { + for (const handle of sample.immediates) { + clearImmediate(handle) + } + sample.dom.window.close() + } + } + } + + return { + before, + run, + after, + snapshot, + // Vitest's Bench setup runs once per warmup/run stage. Install Tinybench's + // public Task hooks to prepare and dispose outside every measured call. + installIterationHooks(task: TaskHooks) { + task.opts.beforeEach = before + task.opts.afterEach = after + }, + } +} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts new file mode 100644 index 0000000000..1f91ec00f3 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts @@ -0,0 +1,23 @@ +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { setup } from './setup' + +describe('client-hydration', () => { + const scenario = setup() + // CodSpeed uses suite hooks; ordinary Vitest uses the Tinybench Task hooks + // installed below. Both prepare and dispose every sample outside timing. + beforeEach(scenario.before) + afterEach(scenario.after) + bench( + 'hydrate restored route state and mixed Links (solid)', + async () => { + await scenario.run() + }, + { + setup: scenario.installIterationHooks, + time: 5000, + warmupTime: 1000, + warmupIterations: 20, + throws: true, + }, + ) +}) diff --git a/benchmarks/client-nav/scenarios/hydration/solid/src/app.tsx b/benchmarks/client-nav/scenarios/hydration/solid/src/app.tsx new file mode 100644 index 0000000000..cb772d6b5b --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/solid/src/app.tsx @@ -0,0 +1,213 @@ +import { For, onMount } from 'solid-js' +import { HydrationScript } from 'solid-js/web' +import { + HeadContent, + Link, + Outlet, + Scripts, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, +} from '@tanstack/solid-router' +import { + clientUrl, + hashLinkCount, + ordinaryLinkCount, + serverUrl, +} from '../fixture' +import type { JSX } from 'solid-js' +import type { Diagnostics } from '../fixture' + +export function createFixtureRouter(server: boolean, diagnostics: Diagnostics) { + function beforeLoad() { + diagnostics.beforeLoads++ + if (!server) { + throw new Error('Hydration reran beforeLoad instead of restoring context') + } + } + + function loader() { + diagnostics.loaders++ + if (!server) { + throw new Error('Hydration reran a loader instead of restoring data') + } + } + + const root = createRootRoute({ + beforeLoad: () => { + beforeLoad() + return { viewer: { id: 'viewer-3', name: 'Ada', role: 'editor' } } + }, + head: () => ({ + meta: [{ charset: 'utf-8' }, { title: 'Hydration benchmark' }], + }), + shellComponent: Document, + }) + const team = createRoute({ + getParentRoute: () => root, + path: '/teams/$teamId', + beforeLoad: ({ context, params }) => { + beforeLoad() + return { team: { id: params.teamId, member: context.viewer.id } } + }, + loader: ({ context }) => { + loader() + return { + title: `Team ${context.team.id}`, + categories: ['open', 'closed'], + } + }, + component: Team, + }) + const items = createRoute({ + getParentRoute: () => team, + path: 'items/$itemId', + validateSearch: (search: Record) => ({ + view: search.view === 'details' ? 'details' : 'summary', + }), + beforeLoad: ({ context }) => { + beforeLoad() + return { permissions: { edit: context.viewer.role === 'editor' } } + }, + loader: ({ context, params }) => { + loader() + return { + selected: params.itemId, + owner: context.team.member, + rows: Array.from({ length: ordinaryLinkCount }, (_, index) => ({ + id: `item-${index}`, + label: `Item ${index}`, + details: { score: index * 3, open: index % 2 === 0 }, + })), + } + }, + component: Items, + }) + + function Document(props: { children: JSX.Element }) { + return ( + + + + + + + {props.children} + + + + ) + } + + function Team() { + const context = team.useRouteContext() + const data = team.useLoaderData() + return ( +
+

{data().title}

+

{context().viewer.name}

+ +
+ ) + } + + function Items() { + const data = items.useLoaderData() + const context = items.useRouteContext() + onMount(() => { + diagnostics.mounted = true + }) + return ( + <> +

+ {context().permissions.edit ? 'Editable' : 'Read only'} +

+ + + + + {(row) => ( + + + + + + )} + + +
{row.id}{row.details.score} + + {diagnostics.countUpdates + ? (state) => { + // Read the getter so this unit-only probe observes + // Link reactivity, rather than component execution. + void state.isActive + diagnostics.ordinaryEvaluations++ + return row.label + } + : row.label} + +
+ +
Details
+ + ) + } + + return createRouter({ + routeTree: root.addChildren([team.addChildren([items])]), + history: createMemoryHistory({ + initialEntries: [server ? serverUrl : clientUrl], + }), + isServer: server, + scrollRestoration: false, + defaultHashScrollIntoView: false, + defaultPreload: false, + }) +} + +declare module '@tanstack/solid-router' { + interface Register { + router: ReturnType + } +} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/src/client.tsx b/benchmarks/client-nav/scenarios/hydration/solid/src/client.tsx new file mode 100644 index 0000000000..ef0f5268d6 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/solid/src/client.tsx @@ -0,0 +1,91 @@ +import { sharedConfig } from 'solid-js' +import { hydrate as hydrateDOM, isServer as solidIsServer } from 'solid-js/web' +import { RouterProvider } from '@tanstack/solid-router' +import { hydrate } from '@tanstack/router-core/ssr/client' +import { isServer } from '@tanstack/router-core/isServer' +import { createDiagnostics, hashLinkCount } from '../fixture' +import { createFixtureRouter } from './app' + +export const serverEnvironment = isServer +export const solidServerEnvironment = solidIsServer +let router: ReturnType | undefined +let disposeRoot: (() => void) | undefined +let unsubscribe: (() => void) | undefined +let diagnostics = createDiagnostics() + +type HydrationWindow = Window & { + _$HY?: { done?: boolean; events?: Array; r: object } +} + +export async function start(countUpdates = false) { + if (router) { + throw new Error('A hydration sample must use a fresh client realm') + } + if (!window.$_TSR?.router) { + throw new Error('Missing SSR hydration payload') + } + const bootstrap = (window as HydrationWindow)._$HY + if (!bootstrap || bootstrap.done || sharedConfig.context) { + throw new Error('Missing or already consumed Solid hydration bootstrap') + } + diagnostics = createDiagnostics(countUpdates) + router = createFixtureRouter(false, diagnostics) + unsubscribe = router.subscribe('onRendered', () => { + diagnostics.rendered++ + }) + // Solid's RouterClient uses this core restoration API. Await it directly so + // the shell has the same component/key hierarchy as the server provider. + await hydrate(router) + window.$_TSR.h() + disposeRoot = hydrateDOM(() => , document) +} + +export function ready() { + if ( + !diagnostics.mounted || + !diagnostics.rendered || + sharedConfig.context || + router?.stores.status.get() === 'pending' + ) { + return false + } + // Each Link's onMount updates its hydration signal. Solid updates attributes + // through fine-grained effects, without rerendering the route components. + for (let index = 0; index < hashLinkCount; index++) { + const anchor = document.getElementById(`hash-${index}`) + if ( + !anchor || + anchor.getAttribute('data-status') !== (index % 2 === 0 ? 'active' : null) + ) { + return false + } + } + return true +} + +export function snapshot() { + return { + diagnostics: { + ...diagnostics, + initialHashStates: [...diagnostics.initialHashStates], + hashStates: [...diagnostics.hashStates], + }, + hydrating: !!sharedConfig.context, + location: router?.stores.location.get().href, + resolvedLocation: router?.stores.resolvedLocation.get()?.href, + matches: router?.stores.matches.get().map((match) => ({ + status: match.status, + context: match.context, + loaderData: match.loaderData, + })), + } +} + +export function dispose() { + try { + disposeRoot?.() + } finally { + unsubscribe?.() + router?.history.destroy() + } +} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/src/server.tsx b/benchmarks/client-nav/scenarios/hydration/solid/src/server.tsx new file mode 100644 index 0000000000..6052c48eac --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/solid/src/server.tsx @@ -0,0 +1,40 @@ +import { RouterProvider } from '@tanstack/solid-router' +import { + createRequestHandler, + renderRouterToStream, +} from '@tanstack/solid-router/ssr/server' +import { isServer } from '@tanstack/router-core/isServer' +import { isServer as solidIsServer } from 'solid-js/web' +import { createDiagnostics, serverUrl } from '../fixture' +import { createFixtureRouter } from './app' + +export async function renderFixture() { + if ((isServer as boolean | undefined) !== true || !solidIsServer) { + throw new Error('Fixture generation requires the production server build') + } + const diagnostics = createDiagnostics() + const response = await createRequestHandler({ + createRouter: () => createFixtureRouter(true, diagnostics), + request: new Request(`http://localhost${serverUrl}`), + })(({ request, router, responseHeaders }) => + renderRouterToStream({ + request, + router, + responseHeaders, + // The route shell owns the document, as in Solid Start. Using the same + // provider tree on both sides preserves Solid's hydration key sequence. + children: () => , + }), + ) + const html = await response.text() + if ( + response.status !== 200 || + diagnostics.beforeLoads !== 3 || + diagnostics.loaders !== 2 + ) { + throw new Error( + 'SSR fixture did not execute its beforeLoad and loader functions', + ) + } + return html +} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/tsconfig.json b/benchmarks/client-nav/scenarios/hydration/solid/tsconfig.json new file mode 100644 index 0000000000..daf27ddf12 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/solid/tsconfig.json @@ -0,0 +1,10 @@ +{ + "extends": "../../../../../tsconfig.json", + "compilerOptions": { + "jsx": "preserve", + "jsxImportSource": "solid-js", + "allowImportingTsExtensions": true, + "types": ["node", "vite/client", "vitest/globals"] + }, + "include": ["./*.ts", "./src/**/*"] +} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/vite.config.ts b/benchmarks/client-nav/scenarios/hydration/solid/vite.config.ts new file mode 100644 index 0000000000..16e5ff95aa --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/solid/vite.config.ts @@ -0,0 +1,38 @@ +import { fileURLToPath } from 'node:url' +import { defineConfig } from 'vitest/config' +import solid from 'vite-plugin-solid' +import codspeedPlugin from '@codspeed/vitest-plugin' +import { cpuSimulationExecArgv } from '../../../../cpu-simulation' + +export default defineConfig({ + root: fileURLToPath(new URL('.', import.meta.url)), + define: { 'process.env.NODE_ENV': JSON.stringify('production') }, + plugins: [ + !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) && + codspeedPlugin(), + // The Node worker evaluates the prebuilt bundle and needs no JSX transform + // or browser test setup injected by vite-plugin-solid. + !process.env.VITEST && solid({ ssr: true, hot: false, dev: false }), + ], + resolve: { conditions: ['solid', 'browser', 'production'] }, + build: { + outDir: './dist/client', + emptyOutDir: true, + minify: false, + lib: { + entry: './src/client.tsx', + name: 'HydrationBenchmark', + formats: ['iife'], + fileName: () => 'client.js', + }, + }, + test: { + execArgv: cpuSimulationExecArgv(), + name: '@benchmarks/client-nav hydration (solid)', + watch: false, + environment: 'node', + isolate: true, + include: ['hydration.test.ts'], + benchmark: { include: ['speed.bench.ts'] }, + }, +}) diff --git a/benchmarks/client-nav/scenarios/hydration/solid/vite.server.config.ts b/benchmarks/client-nav/scenarios/hydration/solid/vite.server.config.ts new file mode 100644 index 0000000000..9787cbb4e2 --- /dev/null +++ b/benchmarks/client-nav/scenarios/hydration/solid/vite.server.config.ts @@ -0,0 +1,29 @@ +import { fileURLToPath } from 'node:url' +import { defineConfig } from 'vite' +import solid from 'vite-plugin-solid' + +export default defineConfig({ + root: fileURLToPath(new URL('.', import.meta.url)), + define: { 'process.env.NODE_ENV': JSON.stringify('production') }, + plugins: [solid({ ssr: true, hot: false, dev: false })], + resolve: { conditions: ['solid', 'node', 'production'] }, + ssr: { + noExternal: true, + resolve: { conditions: ['solid', 'node', 'production'] }, + }, + build: { + ssr: true, + outDir: './dist/server', + emptyOutDir: true, + minify: false, + lib: { + entry: './src/server.tsx', + formats: ['es'], + fileName: () => 'server.js', + }, + rolldownOptions: { + platform: 'node', + external: [/^node:/], + }, + }, +}) From 763ac8b8add670ccb31887dab6509343e4827d5a Mon Sep 17 00:00:00 2001 From: Cyril Strone <77802640+CyrilStrone@users.noreply.github.com> Date: Sat, 26 Sep 2026 18:45:54 +0700 Subject: [PATCH 063/175] test(react-router): regression for #2072 router context invalidation (#8499) * test(react-router): add invalidate context regression for #2072 * cover auth logout/login via RouterProvider context with router.invalidate(); * assert beforeLoad observes fresh context in the same event handler. * test(react-router): drive #2072 login redirect via beforeLoad * assert invalidating the active /login match triggers the guard redirect; * drop the explicit router.navigate that bypassed invalidation. * test(react-router): tighten auth invalidation assertions * test(react-router): clarify login invalidation comment * test(react-router): assert auth observations without redundant waits --------- Co-authored-by: Sheraff --- .../issue-2072-context-invalidate.test.tsx | 157 ++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 packages/react-router/tests/issue-2072-context-invalidate.test.tsx diff --git a/packages/react-router/tests/issue-2072-context-invalidate.test.tsx b/packages/react-router/tests/issue-2072-context-invalidate.test.tsx new file mode 100644 index 0000000000..41b2c11608 --- /dev/null +++ b/packages/react-router/tests/issue-2072-context-invalidate.test.tsx @@ -0,0 +1,157 @@ +import * as React from 'react' +import { cleanup, fireEvent, render, screen } from '@testing-library/react' +import { afterEach, expect, test } from 'vitest' +import { + RouterProvider, + createMemoryHistory, + createRootRouteWithContext, + createRoute, + createRouter, + redirect, +} from '../src' + +afterEach(cleanup) + +// https://github.com/TanStack/router/issues/2072 +// Router context updates supplied through `RouterProvider` must be observable +// by `beforeLoad` on the very next `router.invalidate()` call, even when the +// context state and `invalidate()` change in the same event handler. +test('#2072: logout invalidates the router with the fresh auth context', async () => { + const seen: Array = [] + const rootRoute = createRootRouteWithContext<{ + auth: { isAuthenticated: boolean } + }>()() + const loginRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/login', + beforeLoad: ({ context }) => { + if (context.auth.isAuthenticated) { + throw redirect({ to: '/private' }) + } + }, + component: () =>
Login page
, + }) + const authenticatedRoute = createRoute({ + getParentRoute: () => rootRoute, + id: '_authenticated', + beforeLoad: ({ context }) => { + seen.push(context.auth.isAuthenticated) + if (!context.auth.isAuthenticated) { + throw redirect({ to: '/login' }) + } + }, + }) + const privateRoute = createRoute({ + getParentRoute: () => authenticatedRoute, + path: '/private', + component: () =>
Private page
, + }) + const router = createRouter({ + routeTree: rootRoute.addChildren([ + loginRoute, + authenticatedRoute.addChildren([privateRoute]), + ]), + history: createMemoryHistory({ initialEntries: ['/private'] }), + context: { auth: { isAuthenticated: true } }, + }) + + function App() { + const [isAuthenticated, setIsAuthenticated] = React.useState(true) + return ( + <> + + + + ) + } + + render() + expect(await screen.findByText('Private page')).toBeInTheDocument() + expect(seen).toEqual([true]) + + fireEvent.click(screen.getByRole('button', { name: 'Logout' })) + + expect(await screen.findByText('Login page')).toBeInTheDocument() + expect(seen).toEqual([true, false]) +}) + +// The inverse transition: becoming authenticated must let the login route's +// `beforeLoad` observe the new context and redirect to the private route. +test('#2072: login invalidates the router with the fresh auth context', async () => { + const seen: Array = [] + const rootRoute = createRootRouteWithContext<{ + auth: { isAuthenticated: boolean } + }>()() + const loginRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/login', + beforeLoad: ({ context }) => { + if (context.auth.isAuthenticated) { + throw redirect({ to: '/private' }) + } + }, + component: () =>
Login page
, + }) + const authenticatedRoute = createRoute({ + getParentRoute: () => rootRoute, + id: '_authenticated', + beforeLoad: ({ context }) => { + seen.push(context.auth.isAuthenticated) + if (!context.auth.isAuthenticated) { + throw redirect({ to: '/login' }) + } + }, + }) + const privateRoute = createRoute({ + getParentRoute: () => authenticatedRoute, + path: '/private', + component: () =>
Private page
, + }) + const router = createRouter({ + routeTree: rootRoute.addChildren([ + loginRoute, + authenticatedRoute.addChildren([privateRoute]), + ]), + history: createMemoryHistory({ initialEntries: ['/login'] }), + context: { auth: { isAuthenticated: false } }, + }) + + function App() { + const [isAuthenticated, setIsAuthenticated] = React.useState(false) + return ( + <> + + + + ) + } + + render() + expect(await screen.findByText('Login page')).toBeInTheDocument() + expect(seen).toEqual([]) + + fireEvent.click(screen.getByRole('button', { name: 'Login' })) + + expect(await screen.findByText('Private page')).toBeInTheDocument() + expect(seen).toEqual([true]) +}) From 0b377c2e5bc73f024140bf697f7f890e8a9bbfdc Mon Sep 17 00:00:00 2001 From: Flo Date: Sat, 26 Sep 2026 19:11:42 +0200 Subject: [PATCH 064/175] test: stabilize scroll regression page readiness (#8507) test: wait for rendered pages in scroll race regression --- .../tests/issue-7040.repro.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/tests/issue-7040.repro.spec.ts b/e2e/react-router/scroll-restoration-sandbox-vite/tests/issue-7040.repro.spec.ts index 9fb0742292..2db25517c8 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/tests/issue-7040.repro.spec.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/tests/issue-7040.repro.spec.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { test } from '@tanstack/router-e2e-utils' import type { Page } from '@playwright/test' import { toRuntimePath } from '@tanstack/router-e2e-utils' @@ -27,7 +27,7 @@ type ReproAttempt = { async function openFreshSourcePage(page: Page) { await page.goto(toRuntimePath('/issue-7040-source')) - await page.waitForLoadState('networkidle') + await expect(page.getByTestId('issue-7040-source-top')).toBeVisible() await page.evaluate(() => { sessionStorage.clear() @@ -35,7 +35,7 @@ async function openFreshSourcePage(page: Page) { }) await page.reload() - await page.waitForLoadState('networkidle') + await expect(page.getByTestId('issue-7040-source-top')).toBeVisible() } async function fastScrollSourcePage(page: Page) { @@ -97,7 +97,7 @@ async function clickTargetLinkImmediatelyAfterScroll(page: Page) { async function waitForTargetPageToSettle(page: Page) { await page.waitForURL('**/issue-7040-target') - await page.waitForLoadState('networkidle') + await expect(page.getByTestId('issue-7040-target-top')).toBeVisible() await page.waitForFunction(() => window.scrollY === 0) } From 1e113034bdeccf696e6658d0b886439deb023bfd Mon Sep 17 00:00:00 2001 From: Flo Date: Sat, 26 Sep 2026 19:31:18 +0200 Subject: [PATCH 065/175] test: expand compiler correctness coverage (#8506) test: port compiler correctness coverage from Yuku migration --- .../router-generator/tests/transform.test.ts | 13 ++ .../tests/code-splitter-jsx.test.ts | 66 +++++++ .../tests/code-splitter-runtime.test.ts | 161 ++++++++++++++++++ .../react/1-default/shared-runtime.tsx | 23 +++ .../1-default/shared-runtime@component.tsx | 23 +++ .../shared-runtime@errorComponent.tsx | 11 ++ .../shared-runtime@notFoundComponent.tsx | 11 ++ .../react/1-default/shared-runtime@shared.tsx | 28 +++ .../shared-runtime.tsx | 22 +++ ...--notFoundComponent---pendingComponent.tsx | 23 +++ .../shared-runtime@loader.tsx | 16 ++ .../shared-runtime@shared.tsx | 28 +++ .../shared-runtime.tsx | 22 +++ ...--notFoundComponent---pendingComponent.tsx | 28 +++ .../shared-runtime@errorComponent.tsx | 11 ++ .../shared-runtime@shared.tsx | 28 +++ .../test-files/react/shared-runtime.tsx | 50 ++++++ .../tests/router-plugin-context.test.ts | 138 +++++++++++++++ .../start-plugin-core/tests/compiler.test.ts | 124 ++++++++++++++ .../tests/hydrate-when-transform.test.ts | 88 ++++++++++ .../tests/hydrateWhen/hydrateWhen.test.ts | 58 +++++++ .../importProtection/analysis.exports.test.ts | 14 ++ .../importProtection/analysis.usage.test.ts | 37 +++- 23 files changed, 1022 insertions(+), 1 deletion(-) create mode 100644 packages/router-plugin/tests/code-splitter-jsx.test.ts create mode 100644 packages/router-plugin/tests/code-splitter-runtime.test.ts create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@component.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@errorComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@notFoundComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@shared.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@component---errorComponent---notFoundComponent---pendingComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@loader.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@shared.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@component---loader---notFoundComponent---pendingComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@errorComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@shared.tsx create mode 100644 packages/router-plugin/tests/code-splitter/test-files/react/shared-runtime.tsx diff --git a/packages/router-generator/tests/transform.test.ts b/packages/router-generator/tests/transform.test.ts index 8a53f3278e..f026ecc30e 100644 --- a/packages/router-generator/tests/transform.test.ts +++ b/packages/router-generator/tests/transform.test.ts @@ -14,6 +14,19 @@ function makeNode( } describe('transform', () => { + it('updates parenthesized route calls without changing their surrounding source', () => { + const result = transform({ + source: + "import { createFileRoute } from '@tanstack/react-router'; export const Route = ((createFileRoute('/old'))({}));", + ctx: { target: 'react', routeId: '/new', lazy: false }, + node: makeNode(), + }) + expect(result.result).toBe('modified') + if (result.result === 'modified') { + expect(result.output).toContain("((createFileRoute('/new'))({}))") + } + }) + it('does not treat root route exports as missing Route exports', async () => { const result = await transform({ source: [ diff --git a/packages/router-plugin/tests/code-splitter-jsx.test.ts b/packages/router-plugin/tests/code-splitter-jsx.test.ts new file mode 100644 index 0000000000..0718a5da2a --- /dev/null +++ b/packages/router-plugin/tests/code-splitter-jsx.test.ts @@ -0,0 +1,66 @@ +import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises' +import path from 'node:path' +import { createServer } from 'vite' +import { expect, it } from 'vitest' +import { tanstackRouter } from '../src/vite' + +it.each(['Widget', '_Widget', '$Widget'])( + 'preserves the shared JSX component %s across separate loader and component chunks', + async (name) => { + // Keep the temporary app inside the package so runtime imports resolve. + const root = await mkdtemp(path.join(__dirname, '.jsx-reference-')) + let server: Awaited> | undefined + try { + await mkdir(path.join(root, 'routes')) + await writeFile( + path.join(root, 'routes/__root.tsx'), + `import { createRootRoute } from '@tanstack/react-router' +export const Route = createRootRoute({})`, + ) + await writeFile( + path.join(root, 'routes/widget.tsx'), + `import React from 'react' +import { createFileRoute } from '@tanstack/react-router' +const ${name} = () => 'hello' +export const Route = createFileRoute('/widget')({ + loader: () => ${name}, + component: () => <${name} />, +})`, + ) + server = await createServer({ + root, + configFile: false, + logLevel: 'silent', + server: { watch: null }, + plugins: [ + tanstackRouter({ + target: 'react', + routesDirectory: './routes', + generatedRouteTree: './routeTree.gen.ts', + autoCodeSplitting: true, + codeSplittingOptions: { + addHmr: false, + defaultBehavior: [['loader'], ['component']], + }, + }), + ], + }) + // The physical module establishes shared ownership before chunks load. + await server.ssrLoadModule('/routes/widget.tsx') + const componentModule = await server.ssrLoadModule( + '/routes/widget.tsx?tsr-split=component', + ) + const loaderModule = await server.ssrLoadModule( + '/routes/widget.tsx?tsr-split=loader', + ) + const element = componentModule.component() + expect(typeof element.type).toBe('function') + expect(element.type()).toBe('hello') + expect(loaderModule.loader()()).toBe('hello') + } finally { + await server?.close() + await rm(root, { recursive: true, force: true }) + } + }, + 30_000, +) diff --git a/packages/router-plugin/tests/code-splitter-runtime.test.ts b/packages/router-plugin/tests/code-splitter-runtime.test.ts new file mode 100644 index 0000000000..0eb9b52ea5 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter-runtime.test.ts @@ -0,0 +1,161 @@ +import { execFile } from 'node:child_process' +import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' +import path from 'node:path' +import { promisify } from 'node:util' +import { pathToFileURL } from 'node:url' +import { build } from 'vite' +import { expect, it } from 'vitest' +import { tanstackRouter } from '../src/vite' +import type { CodeSplitGroupings } from '../src/core/constants' + +const runNode = promisify(execFile) +const fixture = path.resolve( + __dirname, + 'code-splitter/test-files/react/shared-runtime.tsx', +) + +const groupings: Array<{ name: string; groupings: CodeSplitGroupings }> = [ + { name: 'eager loader', groupings: [['component']] }, + { name: 'separate lazy loader', groupings: [['component'], ['loader']] }, + { name: 'combined lazy loader', groupings: [['component', 'loader']] }, +] + +it.each(groupings)( + 'preserves executable route contracts with $name', + assertRuntimeContracts, + 30_000, +) + +// Shared extraction currently duplicates named default function declarations and +// drops TypeScript enum/namespace dependencies. Keep their intended contracts. +it.fails.each(['named-default', 'enum', 'namespace'] as const)( + 'preserves executable route contracts with shared %s declarations', + async (syntax) => { + await assertRuntimeContracts({ + groupings: [['component'], ['loader']], + syntax, + }) + }, + 30_000, +) + +async function assertRuntimeContracts({ + groupings, + syntax, +}: { + groupings: CodeSplitGroupings + syntax?: 'named-default' | 'enum' | 'namespace' +}) { + // Keep the temporary app inside the package so real runtime imports resolve. + const root = await mkdtemp(path.join(__dirname, '.runtime-contract-')) + try { + await mkdir(path.join(root, 'routes')) + let source = await readFile(fixture, 'utf8') + if (syntax === 'named-default') { + source = source + .replace( + 'function createSeed()', + 'export default function createSeed()', + ) + .replace('export default createSeed', '') + } else if (syntax === 'enum') { + source = source.replace( + 'const Count = { Initial: 0 }', + 'enum Count { Initial = 0 }', + ) + } else if (syntax === 'namespace') { + source = source.replace( + "const Labels = { component: 'count' }", + "namespace Labels { export const component = 'count' }", + ) + } + await writeFile(path.join(root, 'routes/shared-runtime.tsx'), source) + await writeFile( + path.join(root, 'routes/__root.tsx'), + `import { createRootRoute } from '@tanstack/react-router' +export const Route = createRootRoute({})`, + ) + await writeFile( + path.join(root, 'entry.ts'), + `import { createElement } from 'react' +import { renderToString } from 'react-dom/server' +import { Route } from './routes/shared-runtime' +export { Route, firstState, secondState, 'odd-name' } from './routes/shared-runtime' +export function render() { + return renderToString(createElement(Route.options.component)) +}`, + ) + + await build({ + root, + configFile: false, + logLevel: 'silent', + plugins: [ + tanstackRouter({ + target: 'react', + routesDirectory: './routes', + generatedRouteTree: './routeTree.gen.ts', + autoCodeSplitting: true, + codeSplittingOptions: { + addHmr: false, + defaultBehavior: groupings, + }, + }), + ], + build: { + ssr: path.join(root, 'entry.ts'), + outDir: 'dist', + minify: false, + sourcemap: true, + rollupOptions: { + output: { + entryFileNames: 'entry.mjs', + chunkFileNames: '[name].mjs', + }, + }, + }, + }) + + const throwLine = + source.split('\n').findIndex((line) => line.includes('throw new Error')) + + 1 + const entryUrl = pathToFileURL(path.join(root, 'dist/entry.mjs')).href + const combined = groupings.some( + (group) => group.includes('component') && group.includes('loader'), + ) + const { stdout } = await runNode(process.execPath, [ + '--enable-source-maps', + '--input-type=module', + '--eval', + `import assert from 'node:assert/strict' +const messages = [] +console.log = (message) => messages.push(message) +const { Route, render, firstState, secondState, 'odd-name': oddState } = await import(${JSON.stringify(entryUrl)}) +assert.deepEqual(messages, ['shared-runtime:seed', 'shared-runtime:state', 'shared-runtime:reference']) +const state = Route.options.beforeLoad({}) +assert.strictEqual(firstState, state) +assert.strictEqual(secondState, state) +assert.strictEqual(oddState, state) +assert.equal(state.count, 0) +assert.strictEqual(await Route.options.loader({}), state) +assert.equal(state.count, 1) +assert.deepEqual(messages, ${JSON.stringify(combined ? ['shared-runtime:seed', 'shared-runtime:state', 'shared-runtime:reference', 'shared-runtime:component'] : ['shared-runtime:seed', 'shared-runtime:state', 'shared-runtime:reference'])}) +await Route.options.component.preload() +assert.equal(render(), 'count:1') +assert.strictEqual(await Route.options.loader({}), state) +assert.equal(render(), 'count:2') +await Route.options.component.preload() +assert.deepEqual(messages, ['shared-runtime:seed', 'shared-runtime:state', 'shared-runtime:reference', 'shared-runtime:component']) +await Route.options.loader({}) +assert.throws(render, (error) => { + assert.equal(error.message, 'route source-map contract') + assert.match(error.stack, /shared-runtime\\.tsx(?:\\?[^\\n:]+)?:${throwLine}:/) + return true +}) +process.stdout.write('route contracts passed')`, + ]) + expect(stdout).toBe('route contracts passed') + } finally { + await rm(root, { recursive: true, force: true }) + } +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime.tsx new file mode 100644 index 0000000000..c230b4d37f --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime.tsx @@ -0,0 +1,23 @@ +import { state, createState, createSeed, increment } from "shared-runtime.tsx?tsr-shared=1"; +const $$splitComponentImporter = () => import('shared-runtime.tsx?tsr-split=component'); +import { lazyRouteComponent } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router'; +console.log('shared-runtime:reference'); +export const Route = createFileRoute('/shared-runtime')({ + beforeLoad: () => state, + loader: () => { + increment(); + return state; + }, + component: lazyRouteComponent($$splitComponentImporter, 'component') +}); +function createState(initialState: { + count: number; +}): { + state: { + count: number; + }; + increment: () => number; +}; +export { state as firstState, state as secondState, state as 'odd-name' }; +export default createSeed; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@component.tsx new file mode 100644 index 0000000000..fbccf6c90b --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@component.tsx @@ -0,0 +1,23 @@ +import { state, createState, createSeed, Labels } from "shared-runtime.tsx?tsr-shared=1"; +const label = createComponentLabel(); +function createState(initialState: { + count: number; +}): { + state: { + count: number; + }; + increment: () => number; +}; +function createComponentLabel() { + console.log('shared-runtime:component'); + return Labels.component; +} +export { state as firstState, state as secondState, state as 'odd-name' }; +export default createSeed; +const SplitComponent = () => { + if (state.count === 3) { + throw new Error('route source-map contract'); + } + return `${label}:${state.count}`; +}; +export { SplitComponent as component }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@errorComponent.tsx new file mode 100644 index 0000000000..d890a562c9 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@errorComponent.tsx @@ -0,0 +1,11 @@ +import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; +function createState(initialState: { + count: number; +}): { + state: { + count: number; + }; + increment: () => number; +}; +export { state as firstState, state as secondState, state as 'odd-name' }; +export default createSeed; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@notFoundComponent.tsx new file mode 100644 index 0000000000..d890a562c9 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@notFoundComponent.tsx @@ -0,0 +1,11 @@ +import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; +function createState(initialState: { + count: number; +}): { + state: { + count: number; + }; + increment: () => number; +}; +export { state as firstState, state as secondState, state as 'odd-name' }; +export default createSeed; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@shared.tsx new file mode 100644 index 0000000000..54239b6cc5 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@shared.tsx @@ -0,0 +1,28 @@ +const Count = { + Initial: 0 +}; +const Labels = { + component: 'count' +}; +const seed = createSeed(); +const { + state, + increment +} = createState(seed); +function createSeed() { + console.log('shared-runtime:seed'); + return { + count: Count.Initial, + label: Labels.component + }; +} +function createState(initialState: { + count: number; +}) { + console.log('shared-runtime:state'); + return { + state: initialState, + increment: () => initialState.count++ + }; +} +export { Count, createSeed, createState, increment, Labels, seed, state }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime.tsx new file mode 100644 index 0000000000..bceb12d39a --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime.tsx @@ -0,0 +1,22 @@ +import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; +const $$splitComponentImporter = () => import('shared-runtime.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); +import { lazyRouteComponent } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => import('shared-runtime.tsx?tsr-split=loader'); +import { lazyFn } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router'; +console.log('shared-runtime:reference'); +export const Route = createFileRoute('/shared-runtime')({ + beforeLoad: () => state, + loader: lazyFn($$splitLoaderImporter, 'loader'), + component: lazyRouteComponent($$splitComponentImporter, 'component') +}); +function createState(initialState: { + count: number; +}): { + state: { + count: number; + }; + increment: () => number; +}; +export { state as firstState, state as secondState, state as 'odd-name' }; +export default createSeed; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@component---errorComponent---notFoundComponent---pendingComponent.tsx new file mode 100644 index 0000000000..fbccf6c90b --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -0,0 +1,23 @@ +import { state, createState, createSeed, Labels } from "shared-runtime.tsx?tsr-shared=1"; +const label = createComponentLabel(); +function createState(initialState: { + count: number; +}): { + state: { + count: number; + }; + increment: () => number; +}; +function createComponentLabel() { + console.log('shared-runtime:component'); + return Labels.component; +} +export { state as firstState, state as secondState, state as 'odd-name' }; +export default createSeed; +const SplitComponent = () => { + if (state.count === 3) { + throw new Error('route source-map contract'); + } + return `${label}:${state.count}`; +}; +export { SplitComponent as component }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@loader.tsx new file mode 100644 index 0000000000..6c797c0226 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@loader.tsx @@ -0,0 +1,16 @@ +import { state, createState, createSeed, increment } from "shared-runtime.tsx?tsr-shared=1"; +function createState(initialState: { + count: number; +}): { + state: { + count: number; + }; + increment: () => number; +}; +export { state as firstState, state as secondState, state as 'odd-name' }; +export default createSeed; +const SplitLoader = () => { + increment(); + return state; +}; +export { SplitLoader as loader }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@shared.tsx new file mode 100644 index 0000000000..54239b6cc5 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@shared.tsx @@ -0,0 +1,28 @@ +const Count = { + Initial: 0 +}; +const Labels = { + component: 'count' +}; +const seed = createSeed(); +const { + state, + increment +} = createState(seed); +function createSeed() { + console.log('shared-runtime:seed'); + return { + count: Count.Initial, + label: Labels.component + }; +} +function createState(initialState: { + count: number; +}) { + console.log('shared-runtime:state'); + return { + state: initialState, + increment: () => initialState.count++ + }; +} +export { Count, createSeed, createState, increment, Labels, seed, state }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime.tsx new file mode 100644 index 0000000000..d88eff9d9b --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime.tsx @@ -0,0 +1,22 @@ +import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; +const $$splitComponentImporter = () => import('shared-runtime.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); +import { lazyRouteComponent } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => import('shared-runtime.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); +import { lazyFn } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router'; +console.log('shared-runtime:reference'); +export const Route = createFileRoute('/shared-runtime')({ + beforeLoad: () => state, + loader: lazyFn($$splitLoaderImporter, 'loader'), + component: lazyRouteComponent($$splitComponentImporter, 'component') +}); +function createState(initialState: { + count: number; +}): { + state: { + count: number; + }; + increment: () => number; +}; +export { state as firstState, state as secondState, state as 'odd-name' }; +export default createSeed; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@component---loader---notFoundComponent---pendingComponent.tsx new file mode 100644 index 0000000000..0af87c21c5 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@component---loader---notFoundComponent---pendingComponent.tsx @@ -0,0 +1,28 @@ +import { state, createState, createSeed, Labels, increment } from "shared-runtime.tsx?tsr-shared=1"; +const label = createComponentLabel(); +function createState(initialState: { + count: number; +}): { + state: { + count: number; + }; + increment: () => number; +}; +function createComponentLabel() { + console.log('shared-runtime:component'); + return Labels.component; +} +export { state as firstState, state as secondState, state as 'odd-name' }; +export default createSeed; +const SplitLoader = () => { + increment(); + return state; +}; +export { SplitLoader as loader }; +const SplitComponent = () => { + if (state.count === 3) { + throw new Error('route source-map contract'); + } + return `${label}:${state.count}`; +}; +export { SplitComponent as component }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@errorComponent.tsx new file mode 100644 index 0000000000..d890a562c9 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@errorComponent.tsx @@ -0,0 +1,11 @@ +import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; +function createState(initialState: { + count: number; +}): { + state: { + count: number; + }; + increment: () => number; +}; +export { state as firstState, state as secondState, state as 'odd-name' }; +export default createSeed; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@shared.tsx new file mode 100644 index 0000000000..54239b6cc5 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@shared.tsx @@ -0,0 +1,28 @@ +const Count = { + Initial: 0 +}; +const Labels = { + component: 'count' +}; +const seed = createSeed(); +const { + state, + increment +} = createState(seed); +function createSeed() { + console.log('shared-runtime:seed'); + return { + count: Count.Initial, + label: Labels.component + }; +} +function createState(initialState: { + count: number; +}) { + console.log('shared-runtime:state'); + return { + state: initialState, + increment: () => initialState.count++ + }; +} +export { Count, createSeed, createState, increment, Labels, seed, state }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/test-files/react/shared-runtime.tsx b/packages/router-plugin/tests/code-splitter/test-files/react/shared-runtime.tsx new file mode 100644 index 0000000000..f9fd708a0b --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/test-files/react/shared-runtime.tsx @@ -0,0 +1,50 @@ +import { createFileRoute } from '@tanstack/react-router' + +const Count = { Initial: 0 } + +const Labels = { component: 'count' } + +const seed = createSeed() +const { state, increment } = createState(seed) +const label = createComponentLabel() +console.log('shared-runtime:reference') + +export const Route = createFileRoute('/shared-runtime')({ + beforeLoad: () => state, + loader: () => { + increment() + return state + }, + component: () => { + if (state.count === 3) { + throw new Error('route source-map contract') + } + return `${label}:${state.count}` + }, +}) + +function createSeed() { + console.log('shared-runtime:seed') + return { count: Count.Initial, label: Labels.component } +} + +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +function createState(initialState: { count: number }) { + console.log('shared-runtime:state') + return { + state: initialState, + increment: () => initialState.count++, + } +} + +function createComponentLabel() { + console.log('shared-runtime:component') + return Labels.component +} + +export { state as firstState, state as secondState, state as 'odd-name' } + +export default createSeed diff --git a/packages/router-plugin/tests/router-plugin-context.test.ts b/packages/router-plugin/tests/router-plugin-context.test.ts index b8e317c8ec..d3fb0563e6 100644 --- a/packages/router-plugin/tests/router-plugin-context.test.ts +++ b/packages/router-plugin/tests/router-plugin-context.test.ts @@ -90,6 +90,144 @@ function countProgramHotDeclarations(code: string) { } describe('router plugin context', () => { + it('splits parenthesized route factories, option values, and grouping arrays', async () => { + const routeFile = normalizePath( + path.join(process.cwd(), 'src/routes/wrapped.tsx'), + ) + const context = createRouterPluginContext() + context.routesByFile.set(routeFile, { routeId: '/wrapped' }) + const plugins = createRouterCodeSplitterPlugin( + { + target: 'react', + autoCodeSplitting: true, + codeSplittingOptions: { addHmr: false }, + }, + context, + ) + await configurePlugin(getReferencePlugin(plugins), 'build') + const code = `import { createFileRoute } from '@tanstack/react-router' +const Component = () => 'wrapped component' +const loader = () => 'wrapped loader' +export const Route = (createFileRoute('/wrapped'))({ + component: (Component), loader: (loader), + codeSplitGroupings: (([(['component']), (['loader'])])), +})` + const reference = getCode( + await transformReferenceRoute( + getReferencePlugin(plugins), + code, + routeFile, + ), + ) + expect(reference).toContain('lazyRouteComponent') + expect(reference).toContain('lazyFn') + const virtual = getCode( + await transformReferenceRoute( + getCodeSplitterPlugin(plugins, virtualPluginName), + code, + `${routeFile}?tsr-split=component`, + ), + ) + expect(virtual).toContain('wrapped component') + expect(virtual).not.toContain('wrapped loader') + }) + + it('refreshes chunk ownership after source changes and isolates split settings', async () => { + const routeFile = normalizePath( + path.join(process.cwd(), 'src/routes/changing.tsx'), + ) + const source = (name: string, value: string) => ` +import { createFileRoute } from '@tanstack/react-router' +const ${name} = { value: ${JSON.stringify(value)} } +export const Route = createFileRoute('/changing')({ + loader: () => ${name}, + component: () => ${name}.value, +})` + const setup = async (combined: boolean) => { + const context = createRouterPluginContext() + context.routesByFile.set(routeFile, { routeId: '/changing' }) + const plugins = createRouterCodeSplitterPlugin( + { + target: 'react', + autoCodeSplitting: true, + codeSplittingOptions: { + addHmr: false, + defaultBehavior: combined + ? [['component', 'loader']] + : [['component'], ['loader']], + }, + }, + context, + ) + await configurePlugin(getReferencePlugin(plugins), 'build') + return async (code: string) => { + const reference = getCode( + await transformReferenceRoute( + getReferencePlugin(plugins), + code, + routeFile, + ), + )! + const virtual = getCode( + await transformReferenceRoute( + getCodeSplitterPlugin(plugins, virtualPluginName), + code, + `${routeFile}?tsr-split=${combined ? 'component---loader' : 'component'}`, + ), + )! + const shared = getCode( + await transformReferenceRoute( + getCodeSplitterPlugin( + plugins, + 'tanstack-router:code-splitter:compile-shared-file', + ), + code, + `${routeFile}?tsr-shared=1`, + ), + )! + return { reference, virtual, shared } + } + } + const separate = await setup(false) + const combined = await setup(true) + const first = await separate(source('firstState', 'first version')) + expect(first.reference).toContain('tsr-split=component') + const virtualImports = parseAst({ + code: first.virtual, + }).program.body.filter((statement) => t.isImportDeclaration(statement)) + expect(virtualImports).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + source: expect.objectContaining({ + value: expect.stringContaining('tsr-shared'), + }), + specifiers: expect.arrayContaining([ + expect.objectContaining({ + type: 'ImportSpecifier', + imported: expect.objectContaining({ name: 'firstState' }), + local: expect.objectContaining({ name: 'firstState' }), + }), + ]), + }), + ]), + ) + expect(first.shared).toContain('first version') + + const second = await separate(source('secondState', 'second version')) + for (const output of Object.values(second)) { + expect(output).not.toContain('firstState') + } + expect(second.virtual).toContain('secondState') + expect(second.shared).toContain('second version') + const together = await combined(source('secondState', 'second version')) + expect(together.reference).not.toContain('tsr-shared') + expect(together.virtual).toContain('second version') + expect(together.virtual).not.toContain('tsr-shared') + expect(await separate(source('secondState', 'second version'))).toEqual( + second, + ) + }) + it.each([ { mode: 'production', production: true }, { mode: 'development with addHmr disabled', production: false }, diff --git a/packages/start-plugin-core/tests/compiler.test.ts b/packages/start-plugin-core/tests/compiler.test.ts index 94780d140b..c3ea245fac 100644 --- a/packages/start-plugin-core/tests/compiler.test.ts +++ b/packages/start-plugin-core/tests/compiler.test.ts @@ -515,6 +515,35 @@ describe('compiler handles external import transforms', () => { }) describe('server function provider module directives', () => { + test.each([ + 'export const Route = { component: Page }', + 'export function Route() { return Page() }', + 'export default function Route() { return Page() }', + ])( + 'removes browser-only dependencies of stripped exports: %s', + async (route) => { + const compiler = createFullCompiler('server') + const result = await compiler.compile({ + code: ` + import { createServerFn } from '@tanstack/react-start' + export const getMessage = createServerFn().handler(() => 'server message') + const browserState = { window } + function Page() { return browserState } + ${route} + `, + id: '/test/src/routes/message.tsx?tss-serverfn-split', + }) + + expect(result).not.toBeNull() + expect(result!.code).toContain('server message') + expect(result!.code).toContain('createServerRpc') + expect(result!.code).not.toContain('window') + expect(result!.code).not.toContain('browserState') + expect(result!.code).not.toContain('Page') + expect(result!.code).not.toContain('Route') + }, + ) + const code = ` import { createServerFn } from '@tanstack/react-start' @@ -1266,3 +1295,98 @@ describe('re-export chain resolution', () => { expect(updatedResult!.code).not.toContain('server-only-value') }) }) + +test('leaves unrelated SSR middleware chains to the bundler when a server function factory is present', async () => { + const compiler = new StartCompiler({ + ...getDefaultTestOptions('server'), + env: 'server', + mode: 'build', + lookupKinds: getLookupKindsForEnv('server'), + lookupConfigurations: getLookupConfigurationsForEnv('server', 'react'), + getKnownServerFns: () => ({}), + resolveId: async () => { + throw new Error( + 'SSR host has no package import conditions for this unrelated binding', + ) + }, + loadModule: async () => { + throw new Error('Unexpected compiler dependency load') + }, + }) + const code = `import { createMiddleware, createServerFn } from '@tanstack/react-start'; +const middleware = createMiddleware({ type: 'function' }).server(({ next }) => next({ context: { role: 'admin' } })); +export const factory = createServerFn().middleware([middleware]);` + await expect( + compiler.compile({ + id: '/test/auth-wrapper.ts', + code, + detectedKinds: detectKindsInCode(code, 'server'), + }), + ).resolves.toBeNull() +}) + +test.each([ + `(createServerOnlyFn)(() => 'server-value')`, + `(createIsomorphicFn)().server(() => 'server-value').client(() => 'client-value')`, + `(createIsomorphicFn().server(() => 'server-value')).client(() => 'client-value')`, +])( + 'compiles transparent parentheses around native call chains: %s', + async (expression) => { + const compiler = createFullCompiler('server') + const result = await compiler.compile({ + id: '/test/parenthesized.ts', + code: `import { createServerOnlyFn, createIsomorphicFn } from '@tanstack/react-start'; export const fn = ${expression}`, + }) + + expect(result).not.toBeNull() + const evaluate = new Function( + `${result!.code.replace(/^import .+;$/gm, '').replace(/\bexport (?=const)/g, '')}\nreturn fn`, + ) + expect(evaluate()()).toBe('server-value') + }, +) + +test('compiles a server function through a parenthesized namespace receiver', async () => { + const compiler = createFullCompiler('client') + const result = await compiler.compile({ + id: '/test/namespace-parenthesized.ts', + code: `import * as Start from '@tanstack/react-start'; export const fn = (Start).createServerFn().handler(() => 'private-server-body')`, + }) + expect(result).not.toBeNull() + expect(result!.code).not.toContain('private-server-body') + expect(result!.code).toContain('createClientRpc') +}) + +// The compiler currently mistakes the local parameter for the namespace import. +// Keep the intended behavior executable until binding resolution is corrected. +test.fails( + 'preserves a shadowed parenthesized namespace receiver', + async () => { + const compiler = createFullCompiler('client') + const code = `import * as Start from '@tanstack/react-start'; export function fn(Start) { return (Start).createServerFn().handler(() => 'local-runtime-body') }` + const result = await compiler.compile({ + id: '/test/shadowed-namespace.ts', + code, + }) + const output = result?.code ?? code + expect(output).toContain('local-runtime-body') + expect(output).not.toContain('createClientRpc') + }, +) + +test.each([ + `(Start).createServerOnlyFn(() => 'private-server-body')`, + `(Start).createIsomorphicFn().server(() => 'private-server-body').client(() => 'client-value')`, + `(Start).createMiddleware().server(() => 'private-server-body')`, +])( + 'removes server-only code through a parenthesized namespace: %s', + async (expression) => { + const compiler = createFullCompiler('client') + const result = await compiler.compile({ + id: '/test/namespace-builtins.ts', + code: `import * as Start from '@tanstack/react-start'; export const fn = ${expression}`, + }) + expect(result).not.toBeNull() + expect(result!.code).not.toContain('private-server-body') + }, +) diff --git a/packages/start-plugin-core/tests/hydrate-when-transform.test.ts b/packages/start-plugin-core/tests/hydrate-when-transform.test.ts index 13e1d909bd..442482bd86 100644 --- a/packages/start-plugin-core/tests/hydrate-when-transform.test.ts +++ b/packages/start-plugin-core/tests/hydrate-when-transform.test.ts @@ -117,6 +117,94 @@ function loadVirtualHydrateModule(options: { } describe('Hydrate compiler transform', () => { + test.each(['client', 'server'] as const)( + 'resolves spread props declared after their containing function in %s output', + (env) => { + const result = compileHydrate({ + code: `import { Hydrate } from '@tanstack/react-start' +export function Page() { return

child

} +const props = { when: true, fallback:

server-fallback

}`, + id, + root, + env, + }) + expect(result).not.toBeNull() + expect(result?.code).toContain('when: true') + if (env === 'client') { + expect(result?.code).not.toContain('.preload') + expect(result?.code).toContain('server-fallback') + } else { + expect(result?.code).not.toContain('server-fallback') + } + }, + ) + + test.each(['client', 'server'] as const)( + 'respects parenthesized split={false} in %s output', + (env) => { + const result = compileHydrate({ + code: `import { Hydrate } from '@tanstack/react-start'; export function Page() { return {() =>

child

}
}`, + id, + root, + env, + }) + expect(result).toBeNull() + }, + ) + + test.each(['{...({ fallback:

server-fallback

})}', '{...(props)}'])( + 'strips fallback from a parenthesized spread %s', + (spread) => { + const result = compileHydrate({ + code: `import { Hydrate } from '@tanstack/react-start'; ${spread.includes('props') ? 'const props = ({ fallback:

server-fallback

});' : ''} export function Page() { return

child

}`, + id, + root, + env: 'server', + }) + expect(result).not.toBeNull() + expect(result?.code).not.toContain('server-fallback') + }, + ) + + test('strips a statically computed fallback property from server output', () => { + const result = compileHydrate({ + code: `import { Hydrate } from '@tanstack/react-start'; export function Page() { return server-fallback

}}>

child

}`, + id, + root, + env: 'server', + }) + expect(result).not.toBeNull() + expect(result?.code).not.toContain('server-fallback') + }) + + test.each(['{...({ when: true })}', '{...(props)}'])( + 'avoids generating a preload callback for known props %s', + (spread) => { + const result = compileHydrate({ + code: `import { Hydrate } from '@tanstack/react-start'; const props = ({ when: true }); export function Page() { return

child

}`, + id, + root, + env: 'client', + }) + expect(result).not.toBeNull() + expect(result?.code).not.toContain('.preload') + }, + ) + + test.each([ + ['{(() =>

child

)}', /function-as-children/], + ['{(useThing)()}', /hooks/], + ])('rejects parenthesized unsafe extraction %s', (child, message) => { + expect(() => + compileHydrate({ + code: `import { Hydrate } from '@tanstack/react-start'; export function Page() { return ${child} }`, + id, + root, + env: 'client', + }), + ).toThrow(message) + }) + test('splits Hydrate children behind a lazy import', () => { const result = compileHydrate({ code: ` diff --git a/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts b/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts index 9e393a93c7..a027fac505 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts +++ b/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts @@ -1,4 +1,5 @@ import { readFile, readdir } from 'node:fs/promises' +import { traverse } from '@babel/core' import * as t from '@babel/types' import { generateFromAst, parseAst } from '@tanstack/router-utils' import path from 'pathe' @@ -148,6 +149,63 @@ describe('Hydrate compiler transform fixtures', async () => { }) }) + test('generated lazy names do not shadow existing global references', () => { + const code = `import { Hydrate } from '@tanstack/react-start'; export const before = _H0; export function Page() { return
}` + const compiled = compile({ + env: 'client', + code, + id: fixtureId('global.tsx'), + })! + const output = parseAst({ code: compiled.code }) + const globalReferences: Array = [] + traverse(output, { + ReferencedIdentifier(path) { + if (path.node.name === '_H0' && !path.scope.hasBinding('_H0', true)) { + globalReferences.push(path.node.name) + } + }, + }) + expect(globalReferences).toEqual(['_H0']) + }) + + test('retains captured local components and values across extraction', async () => { + const code = ` + import { Hydrate } from '@tanstack/react-start' + export function Page({ name }) { + const count = 1 + const Local = () => {name} + return {name} + } + ` + const id = fixtureId('captured.tsx') + const compiled = compile({ env: 'client', code, id })! + expect(compiled.code).toContain('Local={Local}') + expect(compiled.code).toContain('count={count}') + expect(compiled.code).toContain('name={name}') + expect(compiled.code).toContain('const count = 1') + expect(compiled.code).toContain('const Local') + const loaded = await loadVirtualHydrateModule({ + code, + id: virtualHydrateId(id, compiled.boundaries[0]!), + root: fixtureRoot, + }) + expect(loaded).toBeTruthy() + const output = parseAst({ code: loaded!.code }) + const capturedReferences = new Set() + traverse(output, { + Program(path) { + expect(path.scope.getBinding('Page')).toBeUndefined() + }, + ReferencedIdentifier(path) { + if (['Local', 'count', 'name'].includes(path.node.name)) { + capturedReferences.add(path.node.name) + expect(path.scope.hasBinding(path.node.name, true)).toBe(true) + } + }, + }) + expect([...capturedReferences].sort()).toEqual(['Local', 'count', 'name']) + }) + test('should extract virtual modules and keep nested ids stable', async () => { const filename = 'hydrateWhenNested.tsx' const code = await readFixture(filename) diff --git a/packages/start-plugin-core/tests/importProtection/analysis.exports.test.ts b/packages/start-plugin-core/tests/importProtection/analysis.exports.test.ts index dbb0830af7..1e14f5fd80 100644 --- a/packages/start-plugin-core/tests/importProtection/analysis.exports.test.ts +++ b/packages/start-plugin-core/tests/importProtection/analysis.exports.test.ts @@ -4,6 +4,7 @@ import { isValidExportName, getMockExportNamesBySource, getNamedExports, + getImportSources, } from '../../src/import-protection/analysis' describe('isValidExportName', () => { @@ -245,3 +246,16 @@ describe('collectNamedExports', () => { expect(getNamedExports(code)).toEqual(['foo-bar']) }) }) + +test('discovers mock exports through parenthesized namespace access', () => { + const exports = getMockExportNamesBySource( + `import * as denied from 'denied'; (denied).read(); (denied)['write']()`, + ) + expect(exports.get('denied')).toEqual(['read', 'write']) +}) + +test('discovers parenthesized literal dynamic import sources', () => { + expect(getImportSources(`export const value = import(('denied'))`)).toEqual([ + 'denied', + ]) +}) diff --git a/packages/start-plugin-core/tests/importProtection/analysis.usage.test.ts b/packages/start-plugin-core/tests/importProtection/analysis.usage.test.ts index 69642e890a..8db2c2db6c 100644 --- a/packages/start-plugin-core/tests/importProtection/analysis.usage.test.ts +++ b/packages/start-plugin-core/tests/importProtection/analysis.usage.test.ts @@ -53,7 +53,7 @@ describe('findPostCompileUsagePos', () => { test('ignores binding positions (variable declarator id)', () => { const p = pos( - `import { x } from 'denied';\nconst x = 1;\nconst y = x;`, + `import { x } from 'denied';\n{ const x = 1;\nconst y = x; }`, 'denied', ) expect(p).toBeUndefined() @@ -279,3 +279,38 @@ describe('findOriginalUnsafeUsagePos', () => { expect(p).toBeUndefined() }) }) + +test.each([ + `createServerFn().handler((() => denied()))`, + `(createServerFn)().handler(() => denied())`, +])( + 'preserves safe-boundary recognition through parentheses: %s', + (expression) => { + const code = `import { denied } from 'denied';\nexport const result = ${expression}` + expect(findOriginalUnsafeUsagePos(code, 'denied', 'client')).toBeUndefined() + }, +) + +test.each([ + `createIsomorphicFn().client((() => denied()))`, + `(createClientOnlyFn)((() => denied()))`, +])('preserves server safe boundaries through parentheses: %s', (expression) => { + const code = `import { denied } from 'denied';\nexport const result = ${expression}` + expect(findOriginalUnsafeUsagePos(code, 'denied', 'server')).toBeUndefined() +}) + +test('does not treat an immediately invoked function as a safe handler argument', () => { + const code = `import { denied } from 'denied';\nexport const result = createServerFn().handler((() => denied())())` + expect(findOriginalUnsafeUsagePos(code, 'denied', 'client')).toEqual({ + line: 2, + column0: code.split('\n')[1]!.indexOf('denied'), + }) +}) + +test('prefers parenthesized call usage over an earlier value reference', () => { + const code = `import { denied } from 'denied';\nconst value = denied;\n(denied)()` + expect(findPostCompileUsagePos(code, 'denied')).toEqual({ + line: 3, + column0: 1, + }) +}) From 7471fb859101e6c266bac4604035211b21f1426c Mon Sep 17 00:00:00 2001 From: Flo Date: Sat, 26 Sep 2026 21:39:51 +0200 Subject: [PATCH 066/175] chore: update CodSpeed action and Vitest plugin (#8508) --- .github/workflows/client-nav-benchmarks.yml | 2 +- benchmarks/client-nav/package.json | 2 +- benchmarks/memory/client/package.json | 2 +- benchmarks/memory/server/package.json | 2 +- benchmarks/ssr/package.json | 2 +- pnpm-lock.yaml | 43 ++++++++++----------- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/.github/workflows/client-nav-benchmarks.yml b/.github/workflows/client-nav-benchmarks.yml index 06e7e733b8..3862ea66dc 100644 --- a/.github/workflows/client-nav-benchmarks.yml +++ b/.github/workflows/client-nav-benchmarks.yml @@ -80,7 +80,7 @@ jobs: @benchmarks/${{ matrix.benchmark }}:build:${{ matrix.framework }} - name: Run ${{ matrix.benchmark }}:${{ matrix.framework }} CodSpeed benchmark - uses: CodSpeedHQ/action@4296e51e7041e24dadb86d1d6e8b9320d223dbe8 # v5.0.3 + uses: CodSpeedHQ/action@373d6868929f444bc08d901fd0eb0ad52a8875ea # v5.2.1 timeout-minutes: 20 with: mode: ${{ matrix.mode }} diff --git a/benchmarks/client-nav/package.json b/benchmarks/client-nav/package.json index 0b2a4cd5b3..1aadf1e07c 100644 --- a/benchmarks/client-nav/package.json +++ b/benchmarks/client-nav/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@platformatic/flame": "^1.6.0", - "@codspeed/vitest-plugin": "^5.5.0", + "@codspeed/vitest-plugin": "^5.7.1", "@tanstack/router-plugin": "workspace:^", "@testing-library/react": "^16.2.0", "@vitejs/plugin-react": "^6.0.1", diff --git a/benchmarks/memory/client/package.json b/benchmarks/memory/client/package.json index af1770ba0d..2da6cb4ad8 100644 --- a/benchmarks/memory/client/package.json +++ b/benchmarks/memory/client/package.json @@ -22,7 +22,7 @@ "vue": "^3.5.16" }, "devDependencies": { - "@codspeed/vitest-plugin": "^5.5.0", + "@codspeed/vitest-plugin": "^5.7.1", "@datadog/pprof": "^5.13.2", "@platformatic/flame": "^1.6.0", "@testing-library/react": "^16.2.0", diff --git a/benchmarks/memory/server/package.json b/benchmarks/memory/server/package.json index 4688384061..5d59987e68 100644 --- a/benchmarks/memory/server/package.json +++ b/benchmarks/memory/server/package.json @@ -23,7 +23,7 @@ "vue": "^3.5.16" }, "devDependencies": { - "@codspeed/vitest-plugin": "^5.5.0", + "@codspeed/vitest-plugin": "^5.7.1", "@datadog/pprof": "^5.13.2", "@platformatic/flame": "^1.6.0", "@vitejs/plugin-react": "^6.0.1", diff --git a/benchmarks/ssr/package.json b/benchmarks/ssr/package.json index 07fbd92849..bcc484b332 100644 --- a/benchmarks/ssr/package.json +++ b/benchmarks/ssr/package.json @@ -15,7 +15,7 @@ "vue": "^3.5.16" }, "devDependencies": { - "@codspeed/vitest-plugin": "^5.5.0", + "@codspeed/vitest-plugin": "^5.7.1", "@vitejs/plugin-react": "^6.0.1", "@vitejs/plugin-vue-jsx": "^5.1.5", "@types/react": "catalog:", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c6cc0374eb..a024f0f488 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -310,8 +310,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@codspeed/vitest-plugin': - specifier: ^5.5.0 - version: 5.5.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4) + specifier: ^5.7.1 + version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4) '@platformatic/flame': specifier: ^1.6.0 version: 1.6.0 @@ -386,8 +386,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@codspeed/vitest-plugin': - specifier: ^5.5.0 - version: 5.5.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4) + specifier: ^5.7.1 + version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4) '@datadog/pprof': specifier: ^5.13.2 version: 5.13.2 @@ -468,8 +468,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@codspeed/vitest-plugin': - specifier: ^5.5.0 - version: 5.5.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4) + specifier: ^5.7.1 + version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4) '@datadog/pprof': specifier: ^5.13.2 version: 5.13.2 @@ -538,8 +538,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@codspeed/vitest-plugin': - specifier: ^5.5.0 - version: 5.5.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4) + specifier: ^5.7.1 + version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -16370,11 +16370,11 @@ packages: cpu: [x64] os: [win32] - '@codspeed/core@5.5.0': - resolution: {integrity: sha512-5FbjNlxSVOfemB85orEecikZiTz0C8aZYUfCkt5HY6QLLd1mqkrHAfekEJw0gkHcgCjNgD6DVp2TXm0V/xtt4w==} + '@codspeed/core@5.7.1': + resolution: {integrity: sha512-7mrFkqaY14rXu3XHv3o7bK3btLK0LFRxfeK3bQC8dLduI/Ty9eq8Hv8rx04FAY/onQbRTx3rUUQg5xprYHpATQ==} - '@codspeed/vitest-plugin@5.5.0': - resolution: {integrity: sha512-u7NTLXujxo0bQVCYDXk2mDJ+lA8h5vPY96FvUpPYLUbzVRsM6HO62gXXn4ABJOGYwx1bIwXtgSpUlK/V63iIcg==} + '@codspeed/vitest-plugin@5.7.1': + resolution: {integrity: sha512-yKNqaYVxZZPJYkhVHpz30Oem4TUgcI+/IRDD9YHvcAgi0P42CL6TB/+qYjuFOWghFzTPrm3TUbNFoBsevSTbUA==} peerDependencies: tinybench: '>=2.9.0' vite: ^8.0.14 @@ -23417,9 +23417,6 @@ packages: resolution: {integrity: sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==} engines: {node: '>= 6.0.0'} - axios@1.17.0: - resolution: {integrity: sha512-J8SwNxprqqpbfenehxWYXE7CW+wM1BB4w3+N+g+/Wx40xM4rsLrfPmHHxSWIxJLYDgSY/HqlFPIYb2/S3rxafw==} - axios@1.18.1: resolution: {integrity: sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==} @@ -31231,20 +31228,20 @@ snapshots: '@cloudflare/workerd-windows-64@1.20260317.1': optional: true - '@codspeed/core@5.5.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)': + '@codspeed/core@5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)': dependencies: - axios: 1.17.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2) + axios: 1.18.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2) find-up: 6.3.0 - form-data: 4.0.5 + form-data: 4.0.6 node-gyp-build: 4.8.4 stack-trace: 1.0.0-pre2 transitivePeerDependencies: - debug - supports-color - '@codspeed/vitest-plugin@5.5.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4)': + '@codspeed/vitest-plugin@5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4)': dependencies: - '@codspeed/core': 5.5.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2) + '@codspeed/core': 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2) tinybench: 2.9.0 vite: 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.9.0) vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) @@ -38687,10 +38684,10 @@ snapshots: aws-ssl-profiles@1.1.2: {} - axios@1.17.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2): + axios@1.18.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2): dependencies: - follow-redirects: 1.16.0(debug@4.4.3(supports-color@10.2.2)) - form-data: 4.0.5 + follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0)) + form-data: 4.0.6 https-proxy-agent: 5.0.1(supports-color@10.2.2) proxy-from-env: 2.1.0 transitivePeerDependencies: From 488d046a907d330429e2c807ef95326dad87480f Mon Sep 17 00:00:00 2001 From: Sarah Gerrard Date: Sat, 26 Sep 2026 15:55:05 -0700 Subject: [PATCH 067/175] perf(router,start): update Seroval to 1.6.7 (#8297) * perf(router,start): update Seroval to 1.6.6 * perf(router,start): update Seroval to 1.6.7 * chore: update seroval to 1.6.7 seroval and seroval-plugins were pinned to ^1.6.2 while 1.6.7 is the current release. The type surface is additive: two new options (maxBase64Length, compactArrayBufferViews) and an isStream export. Bundle (gzip): router-only scenarios unchanged; Start client bundles grow 532-642 bytes from the upstream typed array and base64 handling. react-start.minimal 98504 -> 99039 (+535). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .changeset/bump-seroval-1-6-7.md | 9 ++++ benchmarks/ssr/package.json | 2 +- packages/router-core/package.json | 4 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- pnpm-lock.yaml | 42 +++++++++---------- 8 files changed, 37 insertions(+), 28 deletions(-) create mode 100644 .changeset/bump-seroval-1-6-7.md diff --git a/.changeset/bump-seroval-1-6-7.md b/.changeset/bump-seroval-1-6-7.md new file mode 100644 index 0000000000..0d20f7c116 --- /dev/null +++ b/.changeset/bump-seroval-1-6-7.md @@ -0,0 +1,9 @@ +--- +'@tanstack/router-core': patch +'@tanstack/start-client-core': patch +'@tanstack/start-server-core': patch +'@tanstack/start-plugin-core': patch +'@tanstack/start-static-server-functions': patch +--- + +Update `seroval` and `seroval-plugins` from 1.6.2 to 1.6.7. This picks up the typed array length guard, the `maxBase64Length` and `compactArrayBufferViews` options, and the `isStream` export. diff --git a/benchmarks/ssr/package.json b/benchmarks/ssr/package.json index bcc484b332..a6ab62efa5 100644 --- a/benchmarks/ssr/package.json +++ b/benchmarks/ssr/package.json @@ -19,7 +19,7 @@ "@vitejs/plugin-react": "^6.0.1", "@vitejs/plugin-vue-jsx": "^5.1.5", "@types/react": "catalog:", - "seroval": "^1.6.2", + "seroval": "^1.6.7", "@typescript/native": "npm:typescript@^7.0.2", "jsdom": "29.1.1", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index f1df4c6fbf..d6d9512019 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -184,8 +184,8 @@ "dependencies": { "@tanstack/history": "workspace:*", "cookie-es": "^3.0.0", - "seroval": "^1.6.2", - "seroval-plugins": "^1.6.2" + "seroval": "^1.6.7", + "seroval-plugins": "^1.6.7" }, "devDependencies": { "@tanstack/store": "^0.11.0", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index a813c1f77e..0895675e91 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -109,7 +109,7 @@ "@tanstack/router-core": "workspace:*", "@tanstack/start-fn-stubs": "workspace:*", "@tanstack/start-storage-context": "workspace:*", - "seroval": "^1.6.2" + "seroval": "^1.6.7" }, "devDependencies": { "vite": "*", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index ac3af33d38..bf1a50e694 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -98,7 +98,7 @@ "lightningcss": "^1.33.0", "pathe": "catalog:", "picomatch": "^4.0.7", - "seroval": "^1.6.2", + "seroval": "^1.6.7", "source-map": "^0.7.6", "srvx": "^0.11.22", "tinyglobby": "catalog:", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index d89979cfff..259d40b803 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -105,7 +105,7 @@ "@tanstack/start-storage-context": "workspace:*", "fetchdts": "^0.1.6", "h3-v2": "npm:h3@2.0.1-rc.20", - "seroval": "^1.6.2" + "seroval": "^1.6.7" }, "devDependencies": { "@standard-schema/spec": "^1.0.0", diff --git a/packages/start-static-server-functions/package.json b/packages/start-static-server-functions/package.json index cec2e42ff2..a45f2711a2 100644 --- a/packages/start-static-server-functions/package.json +++ b/packages/start-static-server-functions/package.json @@ -60,7 +60,7 @@ }, "dependencies": { "@tanstack/start-client-core": "workspace:*", - "seroval": "^1.6.2" + "seroval": "^1.6.7" }, "devDependencies": { "vite": "*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a024f0f488..37c1206cf3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -556,8 +556,8 @@ importers: specifier: 29.1.1 version: 29.1.1(@noble/hashes@2.0.1) seroval: - specifier: ^1.6.2 - version: 1.6.2 + specifier: ^1.6.7 + version: 1.6.7 typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' @@ -14340,11 +14340,11 @@ importers: specifier: ^3.0.0 version: 3.1.1 seroval: - specifier: ^1.6.2 - version: 1.6.2 + specifier: ^1.6.7 + version: 1.6.7 seroval-plugins: - specifier: ^1.6.2 - version: 1.6.2(seroval@1.6.2) + specifier: ^1.6.7 + version: 1.6.7(seroval@1.6.7) devDependencies: '@arethetypeswrong/cli': specifier: 'catalog:' @@ -15037,8 +15037,8 @@ importers: specifier: workspace:* version: link:../start-storage-context seroval: - specifier: ^1.6.2 - version: 1.6.2 + specifier: ^1.6.7 + version: 1.6.7 devDependencies: '@arethetypeswrong/cli': specifier: 'catalog:' @@ -15128,8 +15128,8 @@ importers: specifier: ^4.0.7 version: 4.0.7 seroval: - specifier: ^1.6.2 - version: 1.6.2 + specifier: ^1.6.7 + version: 1.6.7 source-map: specifier: ^0.7.6 version: 0.7.6 @@ -15207,8 +15207,8 @@ importers: specifier: npm:h3@2.0.1-rc.20 version: h3@2.0.1-rc.20(crossws@0.4.12(srvx@0.11.22)) seroval: - specifier: ^1.6.2 - version: 1.6.2 + specifier: ^1.6.7 + version: 1.6.7 devDependencies: '@arethetypeswrong/cli': specifier: 'catalog:' @@ -15253,8 +15253,8 @@ importers: specifier: workspace:* version: link:../start-client-core seroval: - specifier: ^1.6.2 - version: 1.6.2 + specifier: ^1.6.7 + version: 1.6.7 devDependencies: '@arethetypeswrong/cli': specifier: 'catalog:' @@ -28270,8 +28270,8 @@ packages: peerDependencies: seroval: ^1.0 - seroval-plugins@1.6.2: - resolution: {integrity: sha512-TfxuUjlbBESzUOWdTkTKqvSmav0ABym+itetDXLK6mDz8SmrpdI30aF8RTXE8Bvq+tH/1yIDkvy3W0lfQb1ipQ==} + seroval-plugins@1.6.7: + resolution: {integrity: sha512-4Nk35ttD3DTDJW4hgw5StsVAPeU6qnDFnULAouw6tQ7oLTV/ICXrWpsXo2EE52eSP2joUMazbVf52mFEcADqRw==} engines: {node: '>=10'} peerDependencies: seroval: ^1.0 @@ -28280,8 +28280,8 @@ packages: resolution: {integrity: sha512-46uFvgrXTVxZcUorgSSRZ4y+ieqLLQRMlG4bnCZKW3qI6BZm7Rg4ntMW4p1mILEEBZWrFlcpp0AyIIlM6jD9iw==} engines: {node: '>=10'} - seroval@1.6.2: - resolution: {integrity: sha512-mPT+SD2TrlB6wvte1KkYOYUkubaTbd6pZ/6Kk3C9nxzrHmCZyhxOO7XGAeL7f+yLKZglzGtM9odUVvg/EhO+vQ==} + seroval@1.6.7: + resolution: {integrity: sha512-AeDcLh0yO2SFm9W71essgnSzLV9DI8ZH0x0knXn2DMnUZj728mpLbxjlbB6IqKCmqh8JA3cEqRyGoNkt584JcQ==} engines: {node: '>=10'} serve-index@1.9.1: @@ -44557,13 +44557,13 @@ snapshots: dependencies: seroval: 1.5.4 - seroval-plugins@1.6.2(seroval@1.6.2): + seroval-plugins@1.6.7(seroval@1.6.7): dependencies: - seroval: 1.6.2 + seroval: 1.6.7 seroval@1.5.4: {} - seroval@1.6.2: {} + seroval@1.6.7: {} serve-index@1.9.1(supports-color@10.2.2): dependencies: From 3cdd1af04b3e2d6f777797ee7bddf285318dd9d2 Mon Sep 17 00:00:00 2001 From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com> Date: Sun, 27 Sep 2026 14:31:49 +0200 Subject: [PATCH 068/175] fix(router-core): restore native scroll restoration on reload (#8519) * test: cover scroll restoration lifecycle handoff * test: remove temporary scroll lifecycle benchmark * fix(router-core): hand native scroll restoration back on pagehide --- .changeset/shaky-nights-flash.md | 5 + ...-restoration-session-storage-error.test.ts | 66 +++--- .../scroll-restoration/src/client.tsx | 23 +++ .../scroll-restoration/src/routes/__root.tsx | 4 + .../scroll-restoration-lifecycle.spec.ts | 85 ++++++++ .../tests/scroll-restoration-reload.spec.ts | 191 ++++++++++++++++++ e2e/scroll-restoration-lifecycle.ts | 61 ++++++ .../scroll-restoration-lifecycle.spec.ts | 4 + .../scroll-restoration-lifecycle.spec.ts | 4 + packages/router-core/src/router.ts | 16 +- .../router-core/src/scroll-restoration.ts | 65 +++--- .../scroll-restoration-lifecycle.test.ts | 187 +++++++++++++++++ .../tests/scroll-restoration.test.ts | 13 +- 13 files changed, 653 insertions(+), 71 deletions(-) create mode 100644 .changeset/shaky-nights-flash.md create mode 100644 e2e/react-start/scroll-restoration/src/client.tsx create mode 100644 e2e/react-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts create mode 100644 e2e/react-start/scroll-restoration/tests/scroll-restoration-reload.spec.ts create mode 100644 e2e/scroll-restoration-lifecycle.ts create mode 100644 e2e/solid-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts create mode 100644 e2e/vue-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts create mode 100644 packages/router-core/tests/scroll-restoration-lifecycle.test.ts diff --git a/.changeset/shaky-nights-flash.md b/.changeset/shaky-nights-flash.md new file mode 100644 index 0000000000..80aff4b26a --- /dev/null +++ b/.changeset/shaky-nights-flash.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Hand native scroll restoration back to the browser on pagehide, including entries entering BFCache, and reclaim manual restoration when a cached document resumes. diff --git a/e2e/react-router/basepath-file-based/tests/scroll-restoration-session-storage-error.test.ts b/e2e/react-router/basepath-file-based/tests/scroll-restoration-session-storage-error.test.ts index 06b90f6528..d6a50de840 100644 --- a/e2e/react-router/basepath-file-based/tests/scroll-restoration-session-storage-error.test.ts +++ b/e2e/react-router/basepath-file-based/tests/scroll-restoration-session-storage-error.test.ts @@ -1,5 +1,41 @@ -/* eslint-disable */ -import { expect, test } from '@playwright/test' +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' +import type { Page } from '@playwright/test' + +async function reloadAfterStorageFailure(page: Page) { + const errors: Array = [] + page.on('pageerror', (error) => errors.push(error.message)) + const snapshot = await page.evaluate(async () => { + let failures = 0 + const setItem = Storage.prototype.setItem + Storage.prototype.setItem = function (...args) { + try { + return setItem.apply(this, args) + } catch (error) { + failures++ + throw error + } + } + const scrolled = new Promise((resolve) => + addEventListener('scroll', () => resolve(), { once: true }), + ) + scrollTo(0, 200) + await scrolled + // Handler integration; genuine reload handoff is covered by the Start suite. + dispatchEvent(new PageTransitionEvent('pagehide', { persisted: false })) + return { mode: history.scrollRestoration, failures } + }) + expect(snapshot.failures).toBeGreaterThan(0) + // Storage failure must still allow native fallback; failure to restore is not a requirement. + expect(snapshot.mode).toBe('auto') + await page.reload() + await page.waitForLoadState('networkidle') + await expect( + page.getByRole('heading', { name: 'Scroll Error Test' }), + ).toBeVisible() + expect(await page.evaluate(() => history.scrollRestoration)).toBe('manual') + expect(errors).toEqual([]) +} test.describe('Scroll Restoration with Session Storage Error', () => { test('should not crash when sessionStorage.setItem throws an error', async ({ @@ -9,22 +45,12 @@ test.describe('Scroll Restoration with Session Storage Error', () => { await page.waitForLoadState('networkidle') await page.evaluate(() => { - sessionStorage.setItem = () => { + Storage.prototype.setItem = () => { throw new Error('Test Error') } }) - await page.evaluate(() => window.scrollTo(0, 200)) - await page.waitForTimeout(150) - - await page.reload() - await page.waitForLoadState('networkidle') - - const heading = page.locator('h1:has-text("Scroll Error Test")') - await expect(heading).toBeVisible() - - const scrollPosition = await page.evaluate(() => window.scrollY) - expect(scrollPosition).not.toBe(200) + await reloadAfterStorageFailure(page) }) test('should not crash when sessionStorage quota is exceeded', async ({ @@ -47,16 +73,6 @@ test.describe('Scroll Restoration with Session Storage Error', () => { } }) - await page.evaluate(() => window.scrollTo(0, 200)) - await page.waitForTimeout(150) - - await page.reload() - await page.waitForLoadState('networkidle') - - const heading = page.locator('h1:has-text("Scroll Error Test")') - await expect(heading).toBeVisible() - - const scrollPosition = await page.evaluate(() => window.scrollY) - expect(scrollPosition).not.toBe(200) + await reloadAfterStorageFailure(page) }) }) diff --git a/e2e/react-start/scroll-restoration/src/client.tsx b/e2e/react-start/scroll-restoration/src/client.tsx new file mode 100644 index 0000000000..25a0ebf7e7 --- /dev/null +++ b/e2e/react-start/scroll-restoration/src/client.tsx @@ -0,0 +1,23 @@ +import { StrictMode, startTransition } from 'react' +import { hydrateRoot } from 'react-dom/client' +import { StartClient } from '@tanstack/react-start/client' + +async function bootstrap() { + // Fixture-only gate: leave SSR markup, CSS and inline restoration intact. + // Waiting here allows load to finish before StartClient constructs the router. + if ((window as any).__holdScrollBootstrap) { + await new Promise((resolve) => { + ;(window as any).__releaseScrollBootstrap = resolve + }) + } + startTransition(() => { + hydrateRoot( + document, + + + , + ) + }) +} + +void bootstrap() diff --git a/e2e/react-start/scroll-restoration/src/routes/__root.tsx b/e2e/react-start/scroll-restoration/src/routes/__root.tsx index 563d9208ec..875bff34e0 100644 --- a/e2e/react-start/scroll-restoration/src/routes/__root.tsx +++ b/e2e/react-start/scroll-restoration/src/routes/__root.tsx @@ -65,6 +65,10 @@ export const Route = createRootRoute({ }) function RootComponent() { + React.useEffect(() => { + dispatchEvent(new Event('test-scroll-hydrated')) + }, []) + return ( diff --git a/e2e/react-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts b/e2e/react-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts new file mode 100644 index 0000000000..6c1e1693b6 --- /dev/null +++ b/e2e/react-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts @@ -0,0 +1,85 @@ +import { writeFile } from 'node:fs/promises' +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' +import { scrollRestorationLifecycleTests } from '../../../scroll-restoration-lifecycle' + +scrollRestorationLifecycleTests(test) + +test('hands native scroll restoration back to the browser on reload', async ({ + page, +}, testInfo) => { + const errors: Array = [] + page.on('pageerror', (error) => errors.push(error.message)) + const key = 'test-scroll-pagehide' + const token = testInfo.testId + await page.addInitScript(() => { + ;(window as any).__initialScrollRestoration = history.scrollRestoration + }) + await page.goto('/') + await page.getByRole('link', { name: '/reset-scroll-false-a' }).click() + await page.waitForLoadState('networkidle') + expect(await page.evaluate(() => history.scrollRestoration)).toBe('manual') + + const position = await page.evaluate( + async ({ key, token }) => { + sessionStorage.removeItem(key) + const scrolled = new Promise((resolve) => { + addEventListener('scroll', () => resolve(), { once: true }) + }) + scrollTo(0, 500) + await scrolled + // Registered after router setup, so this observes the router's handoff. + window.addEventListener( + 'pagehide', + (event) => { + sessionStorage.setItem( + key, + JSON.stringify({ + token, + mode: history.scrollRestoration, + persisted: (event as PageTransitionEvent).persisted, + trusted: event.isTrusted, + x: scrollX, + y: scrollY, + }), + ) + }, + { once: true }, + ) + return { x: scrollX, y: scrollY } + }, + { key, token }, + ) + expect(position.y).toBeGreaterThan(0) + + await page.reload() + const observation = await page.evaluate( + (key) => ({ + outgoing: JSON.parse(sessionStorage.getItem(key)!), + initialMode: (window as any).__initialScrollRestoration, + }), + key, + ) + const snapshotPath = testInfo.outputPath('reload-handoff.json') + await writeFile( + snapshotPath, + JSON.stringify({ ...observation, errors }, null, 2), + ) + await testInfo.attach('reload-handoff', { + path: snapshotPath, + contentType: 'application/json', + }) + expect(observation.outgoing).toMatchObject({ + token, + trusted: true, + mode: 'auto', + }) + expect(observation.initialMode).toBe('auto') + expect(Math.abs(observation.outgoing.x - position.x)).toBeLessThanOrEqual(1) + expect(Math.abs(observation.outgoing.y - position.y)).toBeLessThanOrEqual(1) + await expect + .poll(() => page.evaluate(() => history.scrollRestoration)) + .toBe('manual') + await expect.poll(() => page.evaluate(() => scrollY)).toBe(position.y) + expect(errors).toEqual([]) +}) diff --git a/e2e/react-start/scroll-restoration/tests/scroll-restoration-reload.spec.ts b/e2e/react-start/scroll-restoration/tests/scroll-restoration-reload.spec.ts new file mode 100644 index 0000000000..767f02a39c --- /dev/null +++ b/e2e/react-start/scroll-restoration/tests/scroll-restoration-reload.spec.ts @@ -0,0 +1,191 @@ +import { writeFile } from 'node:fs/promises' +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' + +// A frame recorder is diagnostic evidence, not proof of compositor-frame pixels. +for (const holdBootstrap of [false, true]) { + test(`reload keeps rendered SSR scroll stable (bootstrap held=${holdBootstrap})`, async ({ + page, + }, testInfo) => { + const errors: Array = [] + page.on('pageerror', (error) => errors.push(error.message)) + await page.addInitScript(() => { + const holdKey = 'test-hold-scroll-bootstrap' + ;(window as any).__holdScrollBootstrap = + sessionStorage.getItem(holdKey) === 'true' + sessionStorage.removeItem(holdKey) + const samples: Array<{ + time: number + phase: string + x: number + y: number + mode: ScrollRestoration + scrollHeight: number + viewportHeight: number + anchorTop: number | null + visibility: DocumentVisibilityState + }> = [] + let phase = 'initial' + let frame = 0 + const sample = () => { + samples.push({ + time: performance.now(), + phase, + x: scrollX, + y: scrollY, + mode: history.scrollRestoration, + scrollHeight: document.documentElement?.scrollHeight ?? 0, + viewportHeight: innerHeight, + anchorTop: + document + .querySelector('[data-testid="reset-scroll-false-link-6"]') + ?.getBoundingClientRect().top ?? null, + visibility: document.visibilityState, + }) + } + const mark = (next: string) => { + phase = next + sample() + } + const tick = () => { + sample() + if (samples.length < 600) { + frame = requestAnimationFrame(tick) + } + } + sample() + frame = requestAnimationFrame(tick) + for (const event of [ + 'DOMContentLoaded', + 'load', + 'pageshow', + 'test-scroll-hydrated', + 'test-scroll-bootstrap-release', + ]) { + addEventListener(event, () => mark(event)) + } + ;(window as any).__scrollProbe = { + samples, + stop: () => { + cancelAnimationFrame(frame) + return { + samples, + paints: performance + .getEntriesByType('paint') + .map(({ name, startTime }) => ({ name, startTime })), + } + }, + } + }) + await page.goto('/') + await page.getByRole('link', { name: '/reset-scroll-false-a' }).click() + await page.waitForLoadState('networkidle') + const before = await page.evaluate(async (holdBootstrap) => { + scrollTo(0, 500) + await new Promise((resolve) => + requestAnimationFrame(() => requestAnimationFrame(() => resolve())), + ) + sessionStorage.setItem( + 'test-hold-scroll-bootstrap', + String(holdBootstrap), + ) + return { + y: scrollY, + anchorTop: document + .querySelector('[data-testid="reset-scroll-false-link-6"]')! + .getBoundingClientRect().top, + } + }, holdBootstrap) + expect(before.y).toBeGreaterThan(0) + await page.reload() + // This window starts at document readiness, independently of scroll correctness. + await page.evaluate(async () => { + await Promise.all( + Array.from( + document.querySelectorAll('link[rel="stylesheet"]'), + (link) => { + if (link.sheet) { + return + } + return new Promise((resolve) => + link.addEventListener('load', () => resolve(), { once: true }), + ) + }, + ), + ) + for (let i = 0; i < 4; i++) { + await new Promise((resolve) => + requestAnimationFrame(() => resolve()), + ) + } + }) + if (holdBootstrap) { + expect( + await page.evaluate( + () => typeof (window as any).__releaseScrollBootstrap, + ), + ).toBe('function') + expect( + await page.evaluate(() => + (window as any).__scrollProbe.samples.some( + (sample: any) => sample.phase === 'test-scroll-hydrated', + ), + ), + ).toBe(false) + } + const screenshotPath = testInfo.outputPath('SSR-viewport.png') + await page.screenshot({ path: screenshotPath }) + await testInfo.attach('SSR-viewport', { + path: screenshotPath, + contentType: 'image/png', + }) + const held = await page.evaluate(() => ({ + y: scrollY, + anchorTop: document + .querySelector('[data-testid="reset-scroll-false-link-6"]')! + .getBoundingClientRect().top, + })) + if (holdBootstrap) { + await page.evaluate(() => { + dispatchEvent(new Event('test-scroll-bootstrap-release')) + ;(window as any).__releaseScrollBootstrap() + }) + } + await expect + .poll(() => page.evaluate(() => history.scrollRestoration)) + .toBe('manual') + await page.waitForLoadState('networkidle') + await page.evaluate(async () => { + for (let i = 0; i < 8; i++) { + await new Promise((resolve) => + requestAnimationFrame(() => resolve()), + ) + } + }) + const timeline = await page.evaluate(() => + (window as any).__scrollProbe.stop(), + ) + const timelinePath = testInfo.outputPath('scroll-timeline.json') + await writeFile( + timelinePath, + JSON.stringify({ before, held, ...timeline, errors }, null, 2), + ) + await testInfo.attach('scroll-timeline', { + path: timelinePath, + contentType: 'application/json', + }) + expect(held.y).toBe(before.y) + expect(held.anchorTop).toBeCloseTo(before.anchorTop, 0) + const renderedSamples = timeline.samples.filter( + (sample: any) => sample.phase !== 'initial' && sample.anchorTop !== null, + ) + expect(renderedSamples.length).toBeGreaterThan(0) + for (const sample of renderedSamples) { + expect(Math.abs(sample.y - before.y)).toBeLessThanOrEqual(1) + expect(Math.abs(sample.anchorTop - before.anchorTop)).toBeLessThanOrEqual( + 1, + ) + } + expect(errors).toEqual([]) + }) +} diff --git a/e2e/scroll-restoration-lifecycle.ts b/e2e/scroll-restoration-lifecycle.ts new file mode 100644 index 0000000000..def0d10934 --- /dev/null +++ b/e2e/scroll-restoration-lifecycle.ts @@ -0,0 +1,61 @@ +import { expect } from '@playwright/test' + +// These exercise browser lifecycle handlers, not actual BFCache navigation. +export function scrollRestorationLifecycleTests( + test: typeof import('./e2e-utils/src/fixture').test, +) { + test.beforeEach(async ({ page }) => { + await page.goto('/normal-page') + await expect + .poll(() => page.evaluate(() => history.scrollRestoration)) + .toBe('manual') + await page.waitForLoadState('networkidle') + }) + + for (const persisted of [false, true]) { + test(`pagehide hands control back with persisted=${persisted}`, async ({ + page, + }) => { + const mode = await page.evaluate((persisted) => { + dispatchEvent(new PageTransitionEvent('pagehide', { persisted })) + return history.scrollRestoration + }, persisted) + expect(mode).toBe('auto') + }) + + test(`pageshow reclaims control only with persisted=${persisted}`, async ({ + page, + }) => { + const mode = await page.evaluate((persisted) => { + // Model the state left by pagehide before the document resumes. + history.scrollRestoration = 'auto' + dispatchEvent(new PageTransitionEvent('pageshow', { persisted })) + return history.scrollRestoration + }, persisted) + expect(mode).toBe(persisted ? 'manual' : 'auto') + }) + } + + test('repeats the handoff when a cached document resumes more than once', async ({ + page, + }) => { + const modes = await page.evaluate(() => { + const modes: Array = [] + for (let i = 0; i < 3; i++) { + dispatchEvent(new PageTransitionEvent('pagehide', { persisted: true })) + modes.push(history.scrollRestoration) + dispatchEvent(new PageTransitionEvent('pageshow', { persisted: true })) + modes.push(history.scrollRestoration) + } + return modes + }) + expect(modes).toEqual([ + 'auto', + 'manual', + 'auto', + 'manual', + 'auto', + 'manual', + ]) + }) +} diff --git a/e2e/solid-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts b/e2e/solid-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts new file mode 100644 index 0000000000..df75cba73c --- /dev/null +++ b/e2e/solid-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts @@ -0,0 +1,4 @@ +import { test } from '@tanstack/router-e2e-utils' +import { scrollRestorationLifecycleTests } from '../../../scroll-restoration-lifecycle' + +scrollRestorationLifecycleTests(test) diff --git a/e2e/vue-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts b/e2e/vue-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts new file mode 100644 index 0000000000..df75cba73c --- /dev/null +++ b/e2e/vue-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts @@ -0,0 +1,4 @@ +import { test } from '@tanstack/router-e2e-utils' +import { scrollRestorationLifecycleTests } from '../../../scroll-restoration-lifecycle' + +scrollRestorationLifecycleTests(test) diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 97e060fd57..a70df71652 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -1144,13 +1144,13 @@ export class RouterCore< Math.random() * 10000000, )}` _scroll: { - next: boolean + n: boolean // Reset scroll on the next render. // True until the current PUSH/REPLACE renders, so its hash owns window scroll. - hash?: boolean - restoring?: boolean - restoration?: boolean - reset?: boolean - } = { next: true } + h?: boolean + e?: boolean // Restoration enabled. + s?: boolean // Snapshot/lifecycle listeners installed. + r?: boolean // Render listener installed. + } = { n: true } subscribers = new Set>() /** Accepted off-screen loader generations keyed by match ID. */ _cache = new Map() @@ -2325,7 +2325,7 @@ export class RouterCore< } } - this._scroll.next = next.resetScroll ?? true + this._scroll.n = next.resetScroll ?? true return this._commitPromise } @@ -2427,7 +2427,7 @@ export class RouterCore< this.updateLatestLocation() if (opts?.action) { - this._scroll.hash = + this._scroll.h = opts.action.type === 'PUSH' || opts.action.type === 'REPLACE' } await loadClientRoute(this, opts) diff --git a/packages/router-core/src/scroll-restoration.ts b/packages/router-core/src/scroll-restoration.ts index 5e4ae0d3ee..972da92da1 100644 --- a/packages/router-core/src/scroll-restoration.ts +++ b/packages/router-core/src/scroll-restoration.ts @@ -38,21 +38,6 @@ function createScrollRestorationCache() { } } -function persistScrollRestorationCache() { - try { - safeSessionStorage?.setItem( - storageKey, - JSON.stringify(scrollRestorationCache), - ) - } catch { - if (process.env.NODE_ENV !== 'production') { - console.warn( - '[ts-router] Could not persist scroll restoration state to sessionStorage.', - ) - } - } -} - const scrollRestorationCache = /* @__PURE__ */ createScrollRestorationCache() const scrollRestorationIdAttribute = 'data-scroll-restoration-id' @@ -169,7 +154,7 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) { const scroll = router._scroll if (shouldSetupScrollRestoration) { - scroll.restoring = true + scroll.e = true } if (isServer ?? router.isServer) { @@ -197,8 +182,8 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) { } } - if (shouldSetupScrollRestoration && !scroll.restoration) { - scroll.restoration = true + if (shouldSetupScrollRestoration && !scroll.s) { + scroll.s = true ignoreScroll = false history.scrollRestoration = 'manual' @@ -220,31 +205,57 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) { trackedScrollTargets.clear() }) addEventListener('pagehide', () => { + // Allow native restoration on reload or a later return to this entry. + // Reset even when entering BFCache: the cached document may be evicted. + // Do this first so a failing getKey/snapshot cannot leave it in manual mode. + history.scrollRestoration = 'auto' + + // Save positions for our own restoration if a new document loads. snapshotCurrentScrollTargets( getKey( router.stores.resolvedLocation.get() ?? router.stores.location.get(), ), ) - persistScrollRestorationCache() + try { + safeSessionStorage?.setItem( + storageKey, + JSON.stringify(scrollRestorationCache), + ) + } catch { + if (process.env.NODE_ENV !== 'production') { + console.warn( + '[ts-router] Could not persist scroll restoration state to sessionStorage.', + ) + } + } + }) + + addEventListener('pageshow', (event) => { + if (event.persisted) { + // BFCache resumes the existing document without rerunning router setup. + // Reclaim restoration so the browser and router don't both control it. + // Fresh documents already set manual mode during setup. + history.scrollRestoration = 'manual' + } }) } - if (scroll.reset) { + if (scroll.r) { return } - scroll.reset = true + scroll.r = true // Restore destination scroll after the new route has rendered. router.subscribe('onRendered', (event) => { const behavior = router.options.scrollRestorationBehavior const scrollToTopSelectors = router.options.scrollToTopSelectors - const shouldResetScroll = scroll.next - const hashNavigation = scroll.hash + const shouldResetScroll = scroll.n + const hashNavigation = scroll.h let scrollToTopElements: Set | undefined trackedScrollTargets.clear() - scroll.next = true - scroll.hash = false + scroll.n = true + scroll.h = false if ( typeof router.options.scrollRestoration === 'function' && @@ -256,7 +267,7 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) { const cacheKey = getKey(event.toLocation) const fromCacheKey = event.fromLocation && getKey(event.fromLocation) - if (scroll.restoring && fromCacheKey && fromCacheKey !== cacheKey) { + if (scroll.e && fromCacheKey && fromCacheKey !== cacheKey) { const fromElementEntries = scrollRestorationCache[fromCacheKey] if (fromElementEntries) { @@ -309,7 +320,7 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) { const skipWindowRestore = hash && hashScrollIntoViewOptions && hashNavigation - const elementEntries = scroll.restoring + const elementEntries = scroll.e ? scrollRestorationCache[cacheKey] : undefined diff --git a/packages/router-core/tests/scroll-restoration-lifecycle.test.ts b/packages/router-core/tests/scroll-restoration-lifecycle.test.ts new file mode 100644 index 0000000000..e410d9aa55 --- /dev/null +++ b/packages/router-core/tests/scroll-restoration-lifecycle.test.ts @@ -0,0 +1,187 @@ +import { createMemoryHistory } from '@tanstack/history' +import { afterEach, beforeEach, expect, test, vi } from 'vitest' +import { + BaseRootRoute, + getElementScrollRestorationEntry, + setupScrollRestoration, +} from '../src' +import { createTestRouter } from './routerTestUtils' + +let listeners: Array< + [ + Window | Document, + string, + EventListenerOrEventListenerObject, + boolean | AddEventListenerOptions | undefined, + ] +> + +beforeEach(() => { + listeners = [] + for (const target of [window, document]) { + const add = target.addEventListener.bind(target) + vi.spyOn(target, 'addEventListener').mockImplementation( + (type, listener, options) => { + listeners.push([target, type, listener, options]) + add(type, listener, options) + }, + ) + } +}) + +afterEach(() => { + for (const [target, type, listener, options] of listeners) { + target.removeEventListener(type, listener, options) + } + document.body.replaceChildren() + history.scrollRestoration = 'auto' + vi.restoreAllMocks() +}) + +function createRouter( + options: Parameters[0] = { + routeTree: new BaseRootRoute({}), + }, +) { + return createTestRouter({ + history: createMemoryHistory(), + scrollRestoration: true, + ...options, + }) +} + +test.each([false, true])( + 'hands off native restoration before taking a pagehide snapshot (persisted=%s)', + (persisted) => { + const modes: Array = [] + createRouter({ + routeTree: new BaseRootRoute({}), + getScrollRestorationKey: () => { + modes.push(history.scrollRestoration) + return `lifecycle-${persisted}` + }, + }) + dispatchEvent(new PageTransitionEvent('pagehide', { persisted })) + expect(modes).toEqual(['auto']) + expect(history.scrollRestoration).toBe('auto') + }, +) + +test.each([false, true])( + 'reclaims native restoration only for a persisted pageshow (persisted=%s)', + (persisted) => { + createRouter() + history.scrollRestoration = 'auto' + dispatchEvent(new PageTransitionEvent('pageshow', { persisted })) + expect(history.scrollRestoration).toBe(persisted ? 'manual' : 'auto') + }, +) + +test('still hands off native restoration when a custom key throws', () => { + const failure = new Error('custom scroll key failed') + const errors: Array = [] + addEventListener('error', (event) => { + errors.push(event.error) + event.preventDefault() + }) + createRouter({ + routeTree: new BaseRootRoute({}), + getScrollRestorationKey: () => { + throw failure + }, + }) + dispatchEvent(new PageTransitionEvent('pagehide')) + expect(errors).toEqual([failure]) + expect(history.scrollRestoration).toBe('auto') +}) + +test('hands off native restoration when storage persistence throws', () => { + const warn = vi.spyOn(console, 'warn').mockImplementation(() => {}) + vi.spyOn(Storage.prototype, 'setItem').mockImplementation(() => { + throw new Error('storage unavailable') + }) + createRouter() + dispatchEvent(new PageTransitionEvent('pagehide')) + expect(history.scrollRestoration).toBe('auto') + expect(warn).toHaveBeenCalledOnce() +}) + +test('preserves live nested scroll snapshots across repeated hide/show cycles without repeated setup', () => { + const element = document.createElement('div') + element.dataset.scrollRestorationId = 'lifecycle-nested' + document.body.append(element) + const router = createRouter({ + routeTree: new BaseRootRoute({}), + getScrollRestorationKey: () => 'lifecycle-nested', + }) + setupScrollRestoration(router) + expect(listeners.filter(([, type]) => type === 'pageshow')).toHaveLength(1) + for (const scrollTop of [80, 120]) { + element.scrollTop = scrollTop + element.dispatchEvent(new Event('scroll', { bubbles: true })) + dispatchEvent(new PageTransitionEvent('pagehide', { persisted: true })) + expect(history.scrollRestoration).toBe('auto') + expect( + getElementScrollRestorationEntry(router, { + id: 'lifecycle-nested', + getKey: router.options.getScrollRestorationKey, + }), + ).toEqual({ scrollX: 0, scrollY: scrollTop }) + dispatchEvent(new PageTransitionEvent('pageshow', { persisted: true })) + expect(history.scrollRestoration).toBe('manual') + } +}) + +test('leaves native restoration alone when router restoration is disabled', () => { + history.scrollRestoration = 'auto' + createRouter({ routeTree: new BaseRootRoute({}), scrollRestoration: false }) + dispatchEvent(new PageTransitionEvent('pagehide', { persisted: true })) + dispatchEvent(new PageTransitionEvent('pageshow', { persisted: true })) + expect(history.scrollRestoration).toBe('auto') +}) + +test('can enable restoration after disabled setup without duplicate lifecycle listeners', () => { + history.scrollRestoration = 'auto' + const router = createRouter({ + routeTree: new BaseRootRoute({}), + scrollRestoration: false, + getScrollRestorationKey: () => 'lifecycle-forced', + }) + expect(history.scrollRestoration).toBe('auto') + setupScrollRestoration(router, true) + setupScrollRestoration(router, true) + expect(history.scrollRestoration).toBe('manual') + for (const event of ['pagehide', 'pageshow']) { + expect(listeners.filter(([, type]) => type === event)).toHaveLength(1) + } + const element = document.createElement('div') + element.dataset.scrollRestorationId = 'lifecycle-forced' + document.body.append(element) + element.scrollTop = 40 + element.dispatchEvent(new Event('scroll', { bubbles: true })) + dispatchEvent(new PageTransitionEvent('pagehide', { persisted: true })) + expect(history.scrollRestoration).toBe('auto') + expect( + getElementScrollRestorationEntry(router, { + id: 'lifecycle-forced', + getKey: router.options.getScrollRestorationKey, + }), + ).toEqual({ scrollX: 0, scrollY: 40 }) + dispatchEvent(new PageTransitionEvent('pageshow', { persisted: true })) + expect(history.scrollRestoration).toBe('manual') +}) + +test('does not take over browser restoration or register listeners on the server', () => { + history.scrollRestoration = 'auto' + const router = createRouter({ + routeTree: new BaseRootRoute({}), + isServer: true, + }) + setupScrollRestoration(router, true) + expect(history.scrollRestoration).toBe('auto') + expect( + listeners.filter(([, type]) => + ['pagehide', 'pageshow', 'scroll'].includes(type), + ), + ).toEqual([]) +}) diff --git a/packages/router-core/tests/scroll-restoration.test.ts b/packages/router-core/tests/scroll-restoration.test.ts index c02a8f8783..03e957e3da 100644 --- a/packages/router-core/tests/scroll-restoration.test.ts +++ b/packages/router-core/tests/scroll-restoration.test.ts @@ -66,10 +66,7 @@ describe('setupScrollRestoration', () => { window.history.scrollRestoration = 'auto' - const router = createRouter({ scrollRestoration: true }) - - expect(router._scroll.restoring).toBe(true) - expect(router._scroll.restoration).toBe(true) + createRouter({ scrollRestoration: true }) expect(window.history.scrollRestoration).toBe('manual') expect( windowAddEventListener.mock.calls.some(([event]) => event === 'pagehide'), @@ -152,13 +149,7 @@ describe('setupScrollRestoration', () => { window.history.scrollRestoration = 'auto' - const router = createRouter( - scrollRestoration === undefined ? {} : { scrollRestoration }, - ) - - expect(router._scroll.restoring).toBeUndefined() - expect(router._scroll.restoration).toBeUndefined() - expect(router._scroll.reset).toBe(true) + createRouter(scrollRestoration === undefined ? {} : { scrollRestoration }) expect(window.history.scrollRestoration).toBe('auto') expect( windowAddEventListener.mock.calls.some( From f0e751d325c41f262c16ea9b50f4b96c587bc84a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 27 Sep 2026 16:03:11 +0200 Subject: [PATCH 069/175] ci: Version Packages (#8497) ci: changeset release Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/brown-dots-grab.md | 7 -- .changeset/bump-seroval-1-6-7.md | 9 -- .changeset/hungry-cooks-go.md | 5 - .changeset/retire-invalidated-reservations.md | 5 - .changeset/shaky-nights-flash.md | 5 - .changeset/start-middleware-registration.md | 5 - .../package.json | 4 +- .../react/authenticated-routes/package.json | 4 +- .../basic-default-search-params/package.json | 2 +- .../react/basic-devtools-panel/package.json | 2 +- examples/react/basic-file-based/package.json | 4 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-react-query-file-based/package.json | 4 +- examples/react/basic-react-query/package.json | 2 +- .../react/basic-ssr-file-based/package.json | 4 +- .../package.json | 4 +- .../basic-virtual-file-based/package.json | 4 +- .../package.json | 4 +- examples/react/basic/package.json | 2 +- examples/react/deferred-data/package.json | 2 +- examples/react/i18n-paraglide/package.json | 4 +- .../kitchen-sink-file-based/package.json | 4 +- .../package.json | 4 +- .../kitchen-sink-react-query/package.json | 2 +- examples/react/kitchen-sink/package.json | 2 +- examples/react/large-file-based/package.json | 4 +- examples/react/location-masking/package.json | 2 +- .../react/navigation-blocking/package.json | 2 +- .../package.json | 4 +- .../react/quickstart-file-based/package.json | 4 +- .../quickstart-rspack-file-based/package.json | 4 +- .../package.json | 4 +- examples/react/quickstart/package.json | 2 +- .../router-monorepo-react-query/package.json | 4 +- .../packages/router/package.json | 4 +- .../router-monorepo-simple-lazy/package.json | 4 +- .../packages/router/package.json | 4 +- .../react/router-monorepo-simple/package.json | 4 +- .../packages/router/package.json | 4 +- .../react/scroll-restoration/package.json | 2 +- .../search-validator-adapters/package.json | 4 +- examples/react/start-bare/package.json | 4 +- examples/react/start-basic-auth/package.json | 4 +- .../react/start-basic-authjs/package.json | 4 +- .../react/start-basic-cloudflare/package.json | 4 +- .../start-basic-react-query/package.json | 4 +- .../react/start-basic-rsbuild/package.json | 4 +- .../react/start-basic-static/package.json | 6 +- examples/react/start-basic/package.json | 4 +- examples/react/start-bun/package.json | 6 +- examples/react/start-clerk-basic/package.json | 4 +- .../react/start-convex-trellaux/package.json | 4 +- examples/react/start-counter/package.json | 4 +- .../react/start-i18n-paraglide/package.json | 4 +- examples/react/start-large/package.json | 4 +- examples/react/start-material-ui/package.json | 4 +- .../react/start-next-migration/package.json | 4 +- examples/react/start-rscs/package.json | 4 +- .../package.json | 4 +- .../react/start-supabase-basic/package.json | 4 +- examples/react/start-tailwind-v4/package.json | 4 +- examples/react/start-trellaux/package.json | 4 +- examples/react/start-workos/package.json | 4 +- examples/react/view-transitions/package.json | 4 +- .../react/with-framer-motion/package.json | 2 +- .../react/with-trpc-react-query/package.json | 4 +- examples/react/with-trpc/package.json | 4 +- .../package.json | 4 +- .../solid/authenticated-routes/package.json | 4 +- .../basic-default-search-params/package.json | 2 +- .../solid/basic-devtools-panel/package.json | 2 +- examples/solid/basic-file-based/package.json | 4 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-solid-query-file-based/package.json | 4 +- examples/solid/basic-solid-query/package.json | 4 +- .../solid/basic-ssr-file-based/package.json | 4 +- .../package.json | 4 +- .../basic-virtual-file-based/package.json | 4 +- .../package.json | 4 +- examples/solid/basic/package.json | 2 +- examples/solid/deferred-data/package.json | 2 +- examples/solid/i18n-paraglide/package.json | 4 +- .../kitchen-sink-file-based/package.json | 4 +- .../package.json | 4 +- .../kitchen-sink-solid-query/package.json | 2 +- examples/solid/kitchen-sink/package.json | 2 +- examples/solid/large-file-based/package.json | 4 +- examples/solid/location-masking/package.json | 2 +- .../solid/navigation-blocking/package.json | 2 +- .../package.json | 4 +- .../solid/quickstart-file-based/package.json | 4 +- .../quickstart-rspack-file-based/package.json | 4 +- .../package.json | 4 +- examples/solid/quickstart/package.json | 2 +- .../router-monorepo-simple-lazy/package.json | 4 +- .../packages/router/package.json | 4 +- .../solid/router-monorepo-simple/package.json | 4 +- .../packages/router/package.json | 4 +- .../router-monorepo-solid-query/package.json | 4 +- .../packages/router/package.json | 4 +- .../solid/scroll-restoration/package.json | 2 +- .../search-validator-adapters/package.json | 4 +- examples/solid/start-basic-auth/package.json | 4 +- .../solid/start-basic-authjs/package.json | 4 +- .../solid/start-basic-cloudflare/package.json | 4 +- .../solid/start-basic-netlify/package.json | 4 +- examples/solid/start-basic-nitro/package.json | 4 +- .../start-basic-solid-query/package.json | 4 +- .../solid/start-basic-static/package.json | 6 +- examples/solid/start-basic/package.json | 4 +- examples/solid/start-bun/package.json | 6 +- .../start-convex-better-auth/package.json | 4 +- examples/solid/start-counter/package.json | 4 +- .../solid/start-i18n-paraglide/package.json | 4 +- examples/solid/start-large/package.json | 4 +- .../package.json | 4 +- .../solid/start-supabase-basic/package.json | 4 +- examples/solid/start-tailwind-v4/package.json | 4 +- examples/solid/view-transitions/package.json | 4 +- .../solid/with-framer-motion/package.json | 2 +- examples/solid/with-trpc/package.json | 4 +- .../vue/basic-file-based-jsx/package.json | 4 +- .../vue/basic-file-based-sfc/package.json | 4 +- examples/vue/basic/package.json | 2 +- packages/react-router/CHANGELOG.md | 9 ++ packages/react-router/package.json | 2 +- packages/react-start-client/CHANGELOG.md | 9 ++ packages/react-start-client/package.json | 2 +- packages/react-start-rsc/CHANGELOG.md | 11 ++ packages/react-start-rsc/package.json | 2 +- packages/react-start-server/CHANGELOG.md | 9 ++ packages/react-start-server/package.json | 2 +- packages/react-start/CHANGELOG.md | 13 +++ packages/react-start/package.json | 2 +- packages/router-cli/CHANGELOG.md | 7 ++ packages/router-cli/package.json | 2 +- packages/router-core/CHANGELOG.md | 10 ++ packages/router-core/package.json | 2 +- packages/router-generator/CHANGELOG.md | 7 ++ packages/router-generator/package.json | 2 +- packages/router-plugin/CHANGELOG.md | 9 ++ packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/CHANGELOG.md | 7 ++ packages/router-vite-plugin/package.json | 2 +- packages/solid-router/CHANGELOG.md | 9 ++ packages/solid-router/package.json | 2 +- packages/solid-start-client/CHANGELOG.md | 9 ++ packages/solid-start-client/package.json | 2 +- packages/solid-start-server/CHANGELOG.md | 9 ++ packages/solid-start-server/package.json | 2 +- packages/solid-start/CHANGELOG.md | 12 +++ packages/solid-start/package.json | 2 +- packages/start-client-core/CHANGELOG.md | 12 +++ packages/start-client-core/package.json | 2 +- packages/start-plugin-core/CHANGELOG.md | 12 +++ packages/start-plugin-core/package.json | 2 +- packages/start-server-core/CHANGELOG.md | 13 +++ packages/start-server-core/package.json | 2 +- .../CHANGELOG.md | 11 ++ .../package.json | 2 +- packages/start-storage-context/CHANGELOG.md | 7 ++ packages/start-storage-context/package.json | 2 +- packages/vue-router/CHANGELOG.md | 9 ++ packages/vue-router/package.json | 2 +- packages/vue-start-client/CHANGELOG.md | 9 ++ packages/vue-start-client/package.json | 2 +- packages/vue-start-server/CHANGELOG.md | 9 ++ packages/vue-start-server/package.json | 2 +- packages/vue-start/CHANGELOG.md | 12 +++ packages/vue-start/package.json | 2 +- pnpm-lock.yaml | 102 +++++++++--------- 171 files changed, 512 insertions(+), 324 deletions(-) delete mode 100644 .changeset/brown-dots-grab.md delete mode 100644 .changeset/bump-seroval-1-6-7.md delete mode 100644 .changeset/hungry-cooks-go.md delete mode 100644 .changeset/retire-invalidated-reservations.md delete mode 100644 .changeset/shaky-nights-flash.md delete mode 100644 .changeset/start-middleware-registration.md diff --git a/.changeset/brown-dots-grab.md b/.changeset/brown-dots-grab.md deleted file mode 100644 index d43d6e6a28..0000000000 --- a/.changeset/brown-dots-grab.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@tanstack/react-router': patch -'@tanstack/solid-router': patch -'@tanstack/vue-router': patch ---- - -Skip unused Link preload cleanup when preloading is disabled and ignore queued viewport notifications after their effect has been cleaned up. diff --git a/.changeset/bump-seroval-1-6-7.md b/.changeset/bump-seroval-1-6-7.md deleted file mode 100644 index 0d20f7c116..0000000000 --- a/.changeset/bump-seroval-1-6-7.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/start-client-core': patch -'@tanstack/start-server-core': patch -'@tanstack/start-plugin-core': patch -'@tanstack/start-static-server-functions': patch ---- - -Update `seroval` and `seroval-plugins` from 1.6.2 to 1.6.7. This picks up the typed array length guard, the `maxBase64Length` and `compactArrayBufferViews` options, and the `isStream` export. diff --git a/.changeset/hungry-cooks-go.md b/.changeset/hungry-cooks-go.md deleted file mode 100644 index 5bf60c3afc..0000000000 --- a/.changeset/hungry-cooks-go.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/start-server-core': patch ---- - -Apply route path parameter parsers, including parent-route parsers, before invoking server route handlers so runtime parameters agree with their inferred types. diff --git a/.changeset/retire-invalidated-reservations.md b/.changeset/retire-invalidated-reservations.md deleted file mode 100644 index ed37b81e13..0000000000 --- a/.changeset/retire-invalidated-reservations.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Abort reserved loader generations with no remaining owners when invalidation removes them from discovery, ensuring their public abort signals are retired. diff --git a/.changeset/shaky-nights-flash.md b/.changeset/shaky-nights-flash.md deleted file mode 100644 index 80aff4b26a..0000000000 --- a/.changeset/shaky-nights-flash.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Hand native scroll restoration back to the browser on pagehide, including entries entering BFCache, and reclaim manual restoration when a cached document resumes. diff --git a/.changeset/start-middleware-registration.md b/.changeset/start-middleware-registration.md deleted file mode 100644 index a8a8e30b27..0000000000 --- a/.changeset/start-middleware-registration.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/start-client-core': patch ---- - -Avoid an unused array when registering server-function middleware. diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 73fa665077..09b7ea7ed2 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "firebase": "^11.4.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index b958329866..1f66c97c21 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index b3d020db16..0ea069260d 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 9cb9638a8d..ff86384aac 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.67.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 317d8378c8..40710c347f 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index a8dfcdc76b..2910358d80 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 623ad075d4..1b1da5c22f 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 64eea90b33..7d7ede1a55 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.json index 6bbdac76b1..621311c997 100644 --- a/examples/react/basic-ssr-file-based/package.json +++ b/examples/react/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/react-router": "^1.170.40", + "@tanstack/router-plugin": "^1.168.41", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/react/basic-ssr-streaming-file-based/package.json b/examples/react/basic-ssr-streaming-file-based/package.json index a72fa5c3f8..43aa8c8f7c 100644 --- a/examples/react/basic-ssr-streaming-file-based/package.json +++ b/examples/react/basic-ssr-streaming-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/react-router": "^1.170.40", + "@tanstack/router-plugin": "^1.168.41", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 9881a1a322..e75bb75988 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 157c32c0a9..f0c6db9217 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 460cae32f4..5ce1c929cb 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 02d9aeffd9..6ed9b61c60 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/i18n-paraglide/package.json b/examples/react/i18n-paraglide/package.json index 014a0f2378..25e1258efc 100644 --- a/examples/react/i18n-paraglide/package.json +++ b/examples/react/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/react-router": "^1.170.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index ce4bc0eec5..585b12c54e 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index ee69914c6a..b81bf11139 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 2778c1c1e9..d1e9db300d 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 38a99e95ba..0a4e3f60e8 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index c9eeb1c1b3..b15bb13b8b 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -13,9 +13,9 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 1104cdd075..c165069dac 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -12,7 +12,7 @@ "@radix-ui/react-dialog": "^1.1.6", "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index f2a8b477a5..0dd8a4f73d 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index f0ee7663c0..2cbb377a85 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index d9b2530d1e..6ca5236b7d 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 633269b165..b4110e08bf 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "postcss": "^8.5.1", "react": "^19.0.0", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 1a5bd570f3..ddba5fc358 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.15.33", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index fcd2da032a..73d131378f 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 08d38884b7..de5ac60fe8 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 4b3313c57e..a58b096975 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -11,8 +11,8 @@ "@router-mono-react-query/post-query": "workspace:*", "@tanstack/history": "^1.162.4", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.39", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/react-router": "^1.170.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 46f0b2e271..10dc01c314 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 96910e4f39..ba511891a9 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.39", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/react-router": "^1.170.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index be2c12d34a..fc68e1ee9e 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index cb8222f91d..f6c543e8da 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.39", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/react-router": "^1.170.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 99eed8b357..325cd7d0d7 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-virtual": "^3.13.0", "react": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 231b268bdc..67c8a90523 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 6fa39c3423..8bf0b58659 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "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 af1c40f4fe..70f7d7fcdc 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index a5e58de81c..798ca34f45 100644 --- a/examples/react/start-basic-authjs/package.json +++ b/examples/react/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "react": "^19.0.0", "react-dom": "^19.0.0", "start-authjs": "^1.0.0", diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index a4d17b909b..815925fd3e 100644 --- a/examples/react/start-basic-cloudflare/package.json +++ b/examples/react/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 54cbeeab85..bf8a6d26e9 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -13,10 +13,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json index bb2c175c32..3065c2ba39 100644 --- a/examples/react/start-basic-rsbuild/package.json +++ b/examples/react/start-basic-rsbuild/package.json @@ -10,9 +10,9 @@ "start": "srvx --prod -s ../client dist/server/index.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "react": "^19.2.3", "react-dom": "^19.2.3", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 3574c5cea0..94b94775ba 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", - "@tanstack/start-static-server-functions": "^1.167.37", + "@tanstack/react-start": "^1.168.59", + "@tanstack/start-static-server-functions": "^1.167.38", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 961d21451a..66d9f5987f 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index 34956d9ff6..70c2a4af09 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.58", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/react-start": "^1.168.59", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 090593c7cc..aff3e95b30 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "^0.27.14", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index fb9ce5bee4..29e3494cc4 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -15,10 +15,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index b7dcf18aec..3508fb17f7 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "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 c8b714368b..b78c8e6228 100644 --- a/examples/react/start-i18n-paraglide/package.json +++ b/examples/react/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "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 ef3221f15d..8f9e225cf4 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "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 120b5deff1..2839c9061c 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,9 +15,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json index 87d6633c68..c365d555a9 100644 --- a/examples/react/start-next-migration/package.json +++ b/examples/react/start-next-migration/package.json @@ -12,8 +12,8 @@ "test:e2e": "playwright test" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-router": "^1.170.40", + "@tanstack/react-start": "^1.168.59", "iron-session": "^9.0.0", "next": "16.3.4", "react": "^19.2.3", diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index c4af666482..c00e7a55cd 100644 --- a/examples/react/start-rscs/package.json +++ b/examples/react/start-rscs/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "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 c134912d54..06de97786e 100644 --- a/examples/react/start-streaming-data-from-server-functions/package.json +++ b/examples/react/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "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 1db4e6dd6a..057e37f534 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index b1eb226102..3828761570 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "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 65b0629c2b..d4a0e62951 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 5d58c347b4..b0f95f34be 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.3.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.58", + "@tanstack/react-start": "^1.168.59", "@workos/authkit-tanstack-react-start": "^0.5.0", "react": "^19.0.0", "react-dom": "^19.0.0" diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index ee48312eb4..03715bd570 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 7f6bca1157..6b2a6584f3 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", "framer-motion": "^11.18.2", "react": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 94e69c6992..3f253c17ef 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "@trpc/tanstack-react-query": "^11.4.3", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 13a419b0de..416d55c3fd 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.39", + "@tanstack/react-router": "^1.170.40", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "express": "^5.2.1", diff --git a/examples/solid/authenticated-routes-firebase/package.json b/examples/solid/authenticated-routes-firebase/package.json index fb32163b42..e8bed7ffe5 100644 --- a/examples/solid/authenticated-routes-firebase/package.json +++ b/examples/solid/authenticated-routes-firebase/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.40", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "firebase": "^11.4.0", "redaxios": "^0.5.1", diff --git a/examples/solid/authenticated-routes/package.json b/examples/solid/authenticated-routes/package.json index d41bbe8fb4..1b0ac9a259 100644 --- a/examples/solid/authenticated-routes/package.json +++ b/examples/solid/authenticated-routes/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.40", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-default-search-params/package.json b/examples/solid/basic-default-search-params/package.json index 593fa999da..7199987de4 100644 --- a/examples/solid/basic-default-search-params/package.json +++ b/examples/solid/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index e6193f437d..9b4105e4b5 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index 38c92c9337..022ee7cd9a 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -18,7 +18,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 514f8faa8d..62b48a8fa5 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 048df25285..364b7b396b 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -13,7 +13,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -21,7 +21,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index fa0095518a..92534998dd 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -12,14 +12,14 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-ssr-file-based/package.json b/examples/solid/basic-ssr-file-based/package.json index 550afdd0ea..8c59282b86 100644 --- a/examples/solid/basic-ssr-file-based/package.json +++ b/examples/solid/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/solid-router": "^1.170.36", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.41", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json index 800cf861be..881ae633c1 100644 --- a/examples/solid/basic-ssr-streaming-file-based/package.json +++ b/examples/solid/basic-ssr-streaming-file-based/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "compression": "^1.8.0", "express": "^5.2.1", @@ -24,7 +24,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@types/express": "^5.0.6", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/solid/basic-virtual-file-based/package.json b/examples/solid/basic-virtual-file-based/package.json index b9c3d08b57..abd6208dec 100644 --- a/examples/solid/basic-virtual-file-based/package.json +++ b/examples/solid/basic-virtual-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.40", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", diff --git a/examples/solid/basic-virtual-inside-file-based/package.json b/examples/solid/basic-virtual-inside-file-based/package.json index 8ba2b8fdd3..e4643a6d24 100644 --- a/examples/solid/basic-virtual-inside-file-based/package.json +++ b/examples/solid/basic-virtual-inside-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.40", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index dcf218133f..b1c7e55471 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/deferred-data/package.json b/examples/solid/deferred-data/package.json index 1d41485ce5..0a41821b81 100644 --- a/examples/solid/deferred-data/package.json +++ b/examples/solid/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json index 2339c231d0..51baa39b13 100644 --- a/examples/solid/i18n-paraglide/package.json +++ b/examples/solid/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.41", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 4ccb19acf9..1b3fb511b1 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/kitchen-sink-solid-query-file-based/package.json b/examples/solid/kitchen-sink-solid-query-file-based/package.json index 2f5ea8865d..e3ba18f052 100644 --- a/examples/solid/kitchen-sink-solid-query-file-based/package.json +++ b/examples/solid/kitchen-sink-solid-query-file-based/package.json @@ -10,10 +10,10 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json index 5bcb646548..0182cb34c2 100644 --- a/examples/solid/kitchen-sink-solid-query/package.json +++ b/examples/solid/kitchen-sink-solid-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/kitchen-sink/package.json b/examples/solid/kitchen-sink/package.json index 46947c2b26..100685148b 100644 --- a/examples/solid/kitchen-sink/package.json +++ b/examples/solid/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/large-file-based/package.json b/examples/solid/large-file-based/package.json index 6758f5a9f5..a4da1300fe 100644 --- a/examples/solid/large-file-based/package.json +++ b/examples/solid/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/location-masking/package.json b/examples/solid/location-masking/package.json index 125acad2e8..a5a8aaa55f 100644 --- a/examples/solid/location-masking/package.json +++ b/examples/solid/location-masking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/navigation-blocking/package.json b/examples/solid/navigation-blocking/package.json index 65b2d23073..8e4c9ce263 100644 --- a/examples/solid/navigation-blocking/package.json +++ b/examples/solid/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json index c4021965a8..b2b846492d 100644 --- a/examples/solid/quickstart-esbuild-file-based/package.json +++ b/examples/solid/quickstart-esbuild-file-based/package.json @@ -9,8 +9,8 @@ "start": "dev" }, "dependencies": { - "@tanstack/router-plugin": "^1.168.40", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index 1a1115bc0f..6b655f1ee1 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -18,7 +18,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/quickstart-rspack-file-based/package.json b/examples/solid/quickstart-rspack-file-based/package.json index f913bce56c..e58f521ba3 100644 --- a/examples/solid/quickstart-rspack-file-based/package.json +++ b/examples/solid/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "postcss": "^8.5.1", "solid-js": "^1.9.10", @@ -19,7 +19,7 @@ "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2" } diff --git a/examples/solid/quickstart-webpack-file-based/package.json b/examples/solid/quickstart-webpack-file-based/package.json index 009a7868dc..bba936a622 100644 --- a/examples/solid/quickstart-webpack-file-based/package.json +++ b/examples/solid/quickstart-webpack-file-based/package.json @@ -7,7 +7,7 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" @@ -15,7 +15,7 @@ "devDependencies": { "@babel/core": "^7.28.5", "@babel/preset-typescript": "^7.27.1", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "babel-loader": "^10.0.0", "babel-preset-solid": "^1.9.10", "css-loader": "^7.1.2", diff --git a/examples/solid/quickstart/package.json b/examples/solid/quickstart/package.json index 245fdc3d84..c557555fd9 100644 --- a/examples/solid/quickstart/package.json +++ b/examples/solid/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/router-monorepo-simple-lazy/package.json b/examples/solid/router-monorepo-simple-lazy/package.json index a2175573dc..52fff0114a 100644 --- a/examples/solid/router-monorepo-simple-lazy/package.json +++ b/examples/solid/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json index 78e91a4028..5f28049d68 100644 --- a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/solid-router": "^1.170.36", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.41", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json index 8f576eacf3..87a60b7782 100644 --- a/examples/solid/router-monorepo-simple/package.json +++ b/examples/solid/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple/packages/router/package.json b/examples/solid/router-monorepo-simple/packages/router/package.json index b9b3720826..ea825b7076 100644 --- a/examples/solid/router-monorepo-simple/packages/router/package.json +++ b/examples/solid/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/solid-router": "^1.170.36", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.41", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json index 36cc5941d3..60e781abd4 100644 --- a/examples/solid/router-monorepo-solid-query/package.json +++ b/examples/solid/router-monorepo-solid-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-solid-query/packages/router/package.json b/examples/solid/router-monorepo-solid-query/packages/router/package.json index 1a47601e63..11e27b2f39 100644 --- a/examples/solid/router-monorepo-solid-query/packages/router/package.json +++ b/examples/solid/router-monorepo-solid-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.162.4", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.36", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.41", "@router-solid-mono-solid-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^4.4.3", diff --git a/examples/solid/scroll-restoration/package.json b/examples/solid/scroll-restoration/package.json index 5e5989b07b..66c90340e9 100644 --- a/examples/solid/scroll-restoration/package.json +++ b/examples/solid/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-virtual": "^3.13.0", "solid-js": "^1.9.10", diff --git a/examples/solid/search-validator-adapters/package.json b/examples/solid/search-validator-adapters/package.json index 3694a57636..437f9b5a05 100644 --- a/examples/solid/search-validator-adapters/package.json +++ b/examples/solid/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/router-plugin": "^1.168.41", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json index 6d447f50e7..f1dc374ff1 100644 --- a/examples/solid/start-basic-auth/package.json +++ b/examples/solid/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index 679723e9de..af3c5ea0a9 100644 --- a/examples/solid/start-basic-authjs/package.json +++ b/examples/solid/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "solid-js": "^1.9.10", "start-authjs": "^1.0.0", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json index d42bf4f2cd..d5c5709181 100644 --- a/examples/solid/start-basic-cloudflare/package.json +++ b/examples/solid/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json index eb5509fe35..ae129053d4 100644 --- a/examples/solid/start-basic-netlify/package.json +++ b/examples/solid/start-basic-netlify/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json index 373f8e3f42..d40d96e2cb 100644 --- a/examples/solid/start-basic-nitro/package.json +++ b/examples/solid/start-basic-nitro/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json index 504fd1e767..ecd73d92c4 100644 --- a/examples/solid/start-basic-solid-query/package.json +++ b/examples/solid/start-basic-solid-query/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 649beed13b..5b8a5571a2 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", - "@tanstack/start-static-server-functions": "^1.167.37", + "@tanstack/solid-start": "^1.168.56", + "@tanstack/start-static-server-functions": "^1.167.38", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index c12b6f5245..2cc32e2a01 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index 9a8122e752..00c9e74977 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.55", - "@tanstack/router-plugin": "^1.168.40", + "@tanstack/solid-start": "^1.168.56", + "@tanstack/router-plugin": "^1.168.41", "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 60881b59ad..8e3e77ecc7 100644 --- a/examples/solid/start-convex-better-auth/package.json +++ b/examples/solid/start-convex-better-auth/package.json @@ -13,9 +13,9 @@ "dependencies": { "@convex-dev/better-auth": "^0.9.7", "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "better-auth": "^1.6.19", "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 957831f21b..202c2eab5a 100644 --- a/examples/solid/start-counter/package.json +++ b/examples/solid/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "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 29a01c3200..304f36d516 100644 --- a/examples/solid/start-i18n-paraglide/package.json +++ b/examples/solid/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index 7493ce627d..0e1ea333fb 100644 --- a/examples/solid/start-large/package.json +++ b/examples/solid/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "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 48cdbea77c..dc20fa777c 100644 --- a/examples/solid/start-streaming-data-from-server-functions/package.json +++ b/examples/solid/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "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 17fe16afb9..3a1b92f76c 100644 --- a/examples/solid/start-supabase-basic/package.json +++ b/examples/solid/start-supabase-basic/package.json @@ -14,9 +14,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "solid-js": "^1.9.9", "redaxios": "^0.5.1" }, diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json index 4947a8d930..4578e7001c 100644 --- a/examples/solid/start-tailwind-v4/package.json +++ b/examples/solid/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.55", + "@tanstack/solid-start": "^1.168.56", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json index 3dd5928a94..54e1ab07ab 100644 --- a/examples/solid/view-transitions/package.json +++ b/examples/solid/view-transitions/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.40", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json index 194710dfd2..b4b271c63f 100644 --- a/examples/solid/with-framer-motion/package.json +++ b/examples/solid/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json index 0265148af4..8a52f09805 100644 --- a/examples/solid/with-trpc/package.json +++ b/examples/solid/with-trpc/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.40", - "@tanstack/solid-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.37", "@tanstack/solid-router-devtools": "^1.167.2", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", diff --git a/examples/vue/basic-file-based-jsx/package.json b/examples/vue/basic-file-based-jsx/package.json index 28bd94e7a4..e9891e1f43 100644 --- a/examples/vue/basic-file-based-jsx/package.json +++ b/examples/vue/basic-file-based-jsx/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.40", - "@tanstack/vue-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.41", + "@tanstack/vue-router": "^1.170.36", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", diff --git a/examples/vue/basic-file-based-sfc/package.json b/examples/vue/basic-file-based-sfc/package.json index f8df778961..5c698cced8 100644 --- a/examples/vue/basic-file-based-sfc/package.json +++ b/examples/vue/basic-file-based-sfc/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.40", - "@tanstack/vue-router": "^1.170.35", + "@tanstack/router-plugin": "^1.168.41", + "@tanstack/vue-router": "^1.170.36", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", diff --git a/examples/vue/basic/package.json b/examples/vue/basic/package.json index 3d4169db70..b1695cffd6 100644 --- a/examples/vue/basic/package.json +++ b/examples/vue/basic/package.json @@ -9,7 +9,7 @@ "start": "vite" }, "dependencies": { - "@tanstack/vue-router": "^1.170.35", + "@tanstack/vue-router": "^1.170.36", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "vue": "^3.5.13", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 9d0d463bc3..0cbde261ce 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-router +## 1.170.40 + +### Patch Changes + +- [#8436](https://github.com/TanStack/router/pull/8436) [`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676) - Skip unused Link preload cleanup when preloading is disabled and ignore queued viewport notifications after their effect has been cleaned up. + +- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: + - @tanstack/router-core@1.171.33 + ## 1.170.39 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index a1cc6e0f2e..cb7d24b359 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.170.39", + "version": "1.170.40", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/CHANGELOG.md b/packages/react-start-client/CHANGELOG.md index 1155719836..05d493cad2 100644 --- a/packages/react-start-client/CHANGELOG.md +++ b/packages/react-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-start-client +## 1.168.38 + +### Patch Changes + +- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: + - @tanstack/react-router@1.170.40 + - @tanstack/router-core@1.171.33 + - @tanstack/start-client-core@1.170.33 + ## 1.168.37 ### Patch Changes diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 0a60883f1f..1ba7594f6d 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.168.37", + "version": "1.168.38", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index 7867be3565..0eac4439fd 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,5 +1,16 @@ # @tanstack/react-start-rsc +## 0.1.58 + +### Patch Changes + +- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: + - @tanstack/react-router@1.170.40 + - @tanstack/router-core@1.171.33 + - @tanstack/start-client-core@1.170.33 + - @tanstack/start-plugin-core@1.171.48 + - @tanstack/start-storage-context@1.167.35 + ## 0.1.57 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index f698c78588..9cd7d0ee29 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.57", + "version": "0.1.58", "description": "React Server Components support for TanStack Start", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/CHANGELOG.md b/packages/react-start-server/CHANGELOG.md index 857ed88089..370829a92b 100644 --- a/packages/react-start-server/CHANGELOG.md +++ b/packages/react-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-start-server +## 1.167.45 + +### Patch Changes + +- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: + - @tanstack/react-router@1.170.40 + - @tanstack/router-core@1.171.33 + - @tanstack/start-server-core@1.169.38 + ## 1.167.44 ### Patch Changes diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index c756eee40f..c0d6cd06bc 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.167.44", + "version": "1.167.45", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/CHANGELOG.md b/packages/react-start/CHANGELOG.md index 11cf3a6c31..72f34da2cd 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,5 +1,18 @@ # @tanstack/react-start +## 1.168.59 + +### Patch Changes + +- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: + - @tanstack/react-router@1.170.40 + - @tanstack/start-client-core@1.170.33 + - @tanstack/start-server-core@1.169.38 + - @tanstack/start-plugin-core@1.171.48 + - @tanstack/react-start-client@1.168.38 + - @tanstack/react-start-rsc@0.1.58 + - @tanstack/react-start-server@1.167.45 + ## 1.168.58 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index bae48b3dbe..9eb7ad03d7 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.168.58", + "version": "1.168.59", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/CHANGELOG.md b/packages/router-cli/CHANGELOG.md index 9b209808ae..0a24b5eee7 100644 --- a/packages/router-cli/CHANGELOG.md +++ b/packages/router-cli/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-cli +## 1.167.39 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-generator@1.167.39 + ## 1.167.38 ### Patch Changes diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index ea3a927eef..6b933f813c 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.167.38", + "version": "1.167.39", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/CHANGELOG.md b/packages/router-core/CHANGELOG.md index 90a0e714f8..48adb2a91a 100644 --- a/packages/router-core/CHANGELOG.md +++ b/packages/router-core/CHANGELOG.md @@ -1,5 +1,15 @@ # @tanstack/router-core +## 1.171.33 + +### Patch Changes + +- [#8297](https://github.com/TanStack/router/pull/8297) [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f) - Update `seroval` and `seroval-plugins` from 1.6.2 to 1.6.7. This picks up the typed array length guard, the `maxBase64Length` and `compactArrayBufferViews` options, and the `isStream` export. + +- [#8460](https://github.com/TanStack/router/pull/8460) [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47) - Abort reserved loader generations with no remaining owners when invalidation removes them from discovery, ensuring their public abort signals are retired. + +- [#8519](https://github.com/TanStack/router/pull/8519) [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2) - Hand native scroll restoration back to the browser on pagehide, including entries entering BFCache, and reclaim manual restoration when a cached document resumes. + ## 1.171.32 ### Patch Changes diff --git a/packages/router-core/package.json b/packages/router-core/package.json index d6d9512019..b8ae269b9e 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.171.32", + "version": "1.171.33", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/CHANGELOG.md b/packages/router-generator/CHANGELOG.md index e7c4827baa..418275e2db 100644 --- a/packages/router-generator/CHANGELOG.md +++ b/packages/router-generator/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-generator +## 1.167.39 + +### Patch Changes + +- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: + - @tanstack/router-core@1.171.33 + ## 1.167.38 ### Patch Changes diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index 6fce1dc6e3..b27ea01b5b 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.167.38", + "version": "1.167.39", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/CHANGELOG.md b/packages/router-plugin/CHANGELOG.md index 43d1808274..57357f9746 100644 --- a/packages/router-plugin/CHANGELOG.md +++ b/packages/router-plugin/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/router-plugin +## 1.168.41 + +### Patch Changes + +- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: + - @tanstack/react-router@1.170.40 + - @tanstack/router-core@1.171.33 + - @tanstack/router-generator@1.167.39 + ## 1.168.40 ### Patch Changes diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 5713a7c5b0..affae0bab4 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.168.40", + "version": "1.168.41", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/CHANGELOG.md b/packages/router-vite-plugin/CHANGELOG.md index 5a902decae..be7211da3a 100644 --- a/packages/router-vite-plugin/CHANGELOG.md +++ b/packages/router-vite-plugin/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-vite-plugin +## 1.167.41 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-plugin@1.168.41 + ## 1.167.40 ### Patch Changes diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index 56cb2bb82d..cfcfd02130 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.167.40", + "version": "1.167.41", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/CHANGELOG.md b/packages/solid-router/CHANGELOG.md index 29c4793a53..5b094ae86b 100644 --- a/packages/solid-router/CHANGELOG.md +++ b/packages/solid-router/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-router +## 1.170.37 + +### Patch Changes + +- [#8436](https://github.com/TanStack/router/pull/8436) [`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676) - Skip unused Link preload cleanup when preloading is disabled and ignore queued viewport notifications after their effect has been cleaned up. + +- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: + - @tanstack/router-core@1.171.33 + ## 1.170.36 ### Patch Changes diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index a3379ba672..6e0c833e16 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.170.36", + "version": "1.170.37", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/CHANGELOG.md b/packages/solid-start-client/CHANGELOG.md index d01ce8c871..4ac8dde2fa 100644 --- a/packages/solid-start-client/CHANGELOG.md +++ b/packages/solid-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start-client +## 1.168.36 + +### Patch Changes + +- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: + - @tanstack/solid-router@1.170.37 + - @tanstack/router-core@1.171.33 + - @tanstack/start-client-core@1.170.33 + ## 1.168.35 ### Patch Changes diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 76aad8cf34..ae7c9c0fe8 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.168.35", + "version": "1.168.36", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/CHANGELOG.md b/packages/solid-start-server/CHANGELOG.md index 4186f01de0..bec2966ba2 100644 --- a/packages/solid-start-server/CHANGELOG.md +++ b/packages/solid-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start-server +## 1.167.43 + +### Patch Changes + +- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: + - @tanstack/solid-router@1.170.37 + - @tanstack/router-core@1.171.33 + - @tanstack/start-server-core@1.169.38 + ## 1.167.42 ### Patch Changes diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 94e1448c24..07df57429e 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.167.42", + "version": "1.167.43", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/CHANGELOG.md b/packages/solid-start/CHANGELOG.md index 16bf8e9704..e56a4e7ef9 100644 --- a/packages/solid-start/CHANGELOG.md +++ b/packages/solid-start/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/solid-start +## 1.168.56 + +### Patch Changes + +- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: + - @tanstack/solid-router@1.170.37 + - @tanstack/start-client-core@1.170.33 + - @tanstack/start-server-core@1.169.38 + - @tanstack/start-plugin-core@1.171.48 + - @tanstack/solid-start-client@1.168.36 + - @tanstack/solid-start-server@1.167.43 + ## 1.168.55 ### Patch Changes diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 7162f6edc7..91f7b707bd 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.168.55", + "version": "1.168.56", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/CHANGELOG.md b/packages/start-client-core/CHANGELOG.md index 521864b296..22b2a1c6d1 100644 --- a/packages/start-client-core/CHANGELOG.md +++ b/packages/start-client-core/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/start-client-core +## 1.170.33 + +### Patch Changes + +- [#8297](https://github.com/TanStack/router/pull/8297) [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f) - Update `seroval` and `seroval-plugins` from 1.6.2 to 1.6.7. This picks up the typed array length guard, the `maxBase64Length` and `compactArrayBufferViews` options, and the `isStream` export. + +- [#8353](https://github.com/TanStack/router/pull/8353) [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91) - Avoid an unused array when registering server-function middleware. + +- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: + - @tanstack/router-core@1.171.33 + - @tanstack/start-storage-context@1.167.35 + ## 1.170.32 ### Patch Changes diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 0895675e91..55a3f56edb 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.170.32", + "version": "1.170.33", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/CHANGELOG.md b/packages/start-plugin-core/CHANGELOG.md index 9e444715c2..bde1d3f9c8 100644 --- a/packages/start-plugin-core/CHANGELOG.md +++ b/packages/start-plugin-core/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/start-plugin-core +## 1.171.48 + +### Patch Changes + +- [#8297](https://github.com/TanStack/router/pull/8297) [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f) - Update `seroval` and `seroval-plugins` from 1.6.2 to 1.6.7. This picks up the typed array length guard, the `maxBase64Length` and `compactArrayBufferViews` options, and the `isStream` export. + +- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: + - @tanstack/router-core@1.171.33 + - @tanstack/start-server-core@1.169.38 + - @tanstack/router-generator@1.167.39 + - @tanstack/router-plugin@1.168.41 + ## 1.171.47 ### Patch Changes diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index bf1a50e694..b837c5edcc 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.47", + "version": "1.171.48", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/CHANGELOG.md b/packages/start-server-core/CHANGELOG.md index a24c72469a..87db4bb072 100644 --- a/packages/start-server-core/CHANGELOG.md +++ b/packages/start-server-core/CHANGELOG.md @@ -1,5 +1,18 @@ # @tanstack/start-server-core +## 1.169.38 + +### Patch Changes + +- [#8297](https://github.com/TanStack/router/pull/8297) [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f) - Update `seroval` and `seroval-plugins` from 1.6.2 to 1.6.7. This picks up the typed array length guard, the `maxBase64Length` and `compactArrayBufferViews` options, and the `isStream` export. + +- [#8434](https://github.com/TanStack/router/pull/8434) [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94) - Apply route path parameter parsers, including parent-route parsers, before invoking server route handlers so runtime parameters agree with their inferred types. + +- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: + - @tanstack/router-core@1.171.33 + - @tanstack/start-client-core@1.170.33 + - @tanstack/start-storage-context@1.167.35 + ## 1.169.37 ### Patch Changes diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 259d40b803..4587a6d3ec 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.169.37", + "version": "1.169.38", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-static-server-functions/CHANGELOG.md b/packages/start-static-server-functions/CHANGELOG.md index 43421814eb..5cf90eee96 100644 --- a/packages/start-static-server-functions/CHANGELOG.md +++ b/packages/start-static-server-functions/CHANGELOG.md @@ -1,5 +1,16 @@ # @tanstack/start-static-server-functions +## 1.167.38 + +### Patch Changes + +- [#8297](https://github.com/TanStack/router/pull/8297) [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f) - Update `seroval` and `seroval-plugins` from 1.6.2 to 1.6.7. This picks up the typed array length guard, the `maxBase64Length` and `compactArrayBufferViews` options, and the `isStream` export. + +- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: + - @tanstack/start-client-core@1.170.33 + - @tanstack/react-start@1.168.59 + - @tanstack/solid-start@1.168.56 + ## 1.167.37 ### Patch Changes diff --git a/packages/start-static-server-functions/package.json b/packages/start-static-server-functions/package.json index a45f2711a2..3bda76b2ad 100644 --- a/packages/start-static-server-functions/package.json +++ b/packages/start-static-server-functions/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-static-server-functions", - "version": "1.167.37", + "version": "1.167.38", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-storage-context/CHANGELOG.md b/packages/start-storage-context/CHANGELOG.md index ec1c88fd9e..b18837c3a3 100644 --- a/packages/start-storage-context/CHANGELOG.md +++ b/packages/start-storage-context/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/start-storage-context +## 1.167.35 + +### Patch Changes + +- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: + - @tanstack/router-core@1.171.33 + ## 1.167.34 ### Patch Changes diff --git a/packages/start-storage-context/package.json b/packages/start-storage-context/package.json index 0d1222c6e7..47d65c1e00 100644 --- a/packages/start-storage-context/package.json +++ b/packages/start-storage-context/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-storage-context", - "version": "1.167.34", + "version": "1.167.35", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-router/CHANGELOG.md b/packages/vue-router/CHANGELOG.md index 7710012185..1224692281 100644 --- a/packages/vue-router/CHANGELOG.md +++ b/packages/vue-router/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-router +## 1.170.36 + +### Patch Changes + +- [#8436](https://github.com/TanStack/router/pull/8436) [`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676) - Skip unused Link preload cleanup when preloading is disabled and ignore queued viewport notifications after their effect has been cleaned up. + +- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: + - @tanstack/router-core@1.171.33 + ## 1.170.35 ### Patch Changes diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index 70f8ddc729..fa84727b2d 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-router", - "version": "1.170.35", + "version": "1.170.36", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-client/CHANGELOG.md b/packages/vue-start-client/CHANGELOG.md index 29b49fe1ed..eaf98f2385 100644 --- a/packages/vue-start-client/CHANGELOG.md +++ b/packages/vue-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-start-client +## 1.167.39 + +### Patch Changes + +- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: + - @tanstack/vue-router@1.170.36 + - @tanstack/router-core@1.171.33 + - @tanstack/start-client-core@1.170.33 + ## 1.167.38 ### Patch Changes diff --git a/packages/vue-start-client/package.json b/packages/vue-start-client/package.json index 0ee21a577c..7f5a621dfb 100644 --- a/packages/vue-start-client/package.json +++ b/packages/vue-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-client", - "version": "1.167.38", + "version": "1.167.39", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-server/CHANGELOG.md b/packages/vue-start-server/CHANGELOG.md index 7b30e9e791..d5a4218807 100644 --- a/packages/vue-start-server/CHANGELOG.md +++ b/packages/vue-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-start-server +## 1.167.43 + +### Patch Changes + +- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: + - @tanstack/vue-router@1.170.36 + - @tanstack/router-core@1.171.33 + - @tanstack/start-server-core@1.169.38 + ## 1.167.42 ### Patch Changes diff --git a/packages/vue-start-server/package.json b/packages/vue-start-server/package.json index 07d4f891a1..a0dd73bfc4 100644 --- a/packages/vue-start-server/package.json +++ b/packages/vue-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-server", - "version": "1.167.42", + "version": "1.167.43", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start/CHANGELOG.md b/packages/vue-start/CHANGELOG.md index 40b54afc04..60b7289a42 100644 --- a/packages/vue-start/CHANGELOG.md +++ b/packages/vue-start/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/vue-start +## 1.168.55 + +### Patch Changes + +- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: + - @tanstack/vue-router@1.170.36 + - @tanstack/start-client-core@1.170.33 + - @tanstack/start-server-core@1.169.38 + - @tanstack/start-plugin-core@1.171.48 + - @tanstack/vue-start-client@1.167.39 + - @tanstack/vue-start-server@1.167.43 + ## 1.168.54 ### Patch Changes diff --git a/packages/vue-start/package.json b/packages/vue-start/package.json index 4c962af10e..8b46cc8448 100644 --- a/packages/vue-start/package.json +++ b/packages/vue-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start", - "version": "1.168.54", + "version": "1.168.55", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 37c1206cf3..393afb1b75 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11290,7 +11290,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11330,7 +11330,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11373,7 +11373,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11416,7 +11416,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11453,7 +11453,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11487,7 +11487,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11527,7 +11527,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11573,7 +11573,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11616,7 +11616,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11656,7 +11656,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router compression: specifier: ^1.8.0 @@ -11699,7 +11699,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11757,7 +11757,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11800,7 +11800,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11840,7 +11840,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11880,7 +11880,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router solid-js: specifier: 1.9.12 @@ -11914,7 +11914,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11954,7 +11954,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12003,7 +12003,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12052,7 +12052,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12098,7 +12098,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12138,7 +12138,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12175,7 +12175,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12209,7 +12209,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12240,7 +12240,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12271,7 +12271,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12311,7 +12311,7 @@ importers: specifier: ^4.2.2 version: 4.2.2 '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12348,7 +12348,7 @@ importers: examples/solid/quickstart-webpack-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12412,7 +12412,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12449,7 +12449,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12492,7 +12492,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12529,7 +12529,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12572,7 +12572,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12627,7 +12627,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12682,7 +12682,7 @@ importers: specifier: ^7.0.0 version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12734,7 +12734,7 @@ importers: specifier: ^0.41.1 version: 0.41.1 '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12777,7 +12777,7 @@ importers: examples/solid/start-basic-cloudflare: dependencies: '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12820,7 +12820,7 @@ importers: examples/solid/start-basic-netlify: dependencies: '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12860,7 +12860,7 @@ importers: examples/solid/start-basic-nitro: dependencies: '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12906,7 +12906,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12952,7 +12952,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13007,7 +13007,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13074,7 +13074,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13132,7 +13132,7 @@ importers: examples/solid/start-counter: dependencies: '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13178,7 +13178,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13221,7 +13221,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13267,7 +13267,7 @@ importers: examples/solid/start-streaming-data-from-server-functions: dependencies: '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13307,7 +13307,7 @@ importers: specifier: ^2.48.1 version: 2.48.1 '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13347,7 +13347,7 @@ importers: examples/solid/start-tailwind-v4: dependencies: '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13396,7 +13396,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13433,7 +13433,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13476,7 +13476,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.36 + specifier: ^1.170.37 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From ff66a03df4816f44a48a4a37189fc4021b1c8480 Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 27 Sep 2026 21:31:39 +0200 Subject: [PATCH 070/175] perf(react-router): consolidate root match provider (CodSpeed experiment) (#8530) perf(react-router): consolidate root match context provider --- .changeset/quiet-match-provider-experiment.md | 5 ++ packages/react-router/src/Match.tsx | 18 ++-- packages/react-router/src/Matches.tsx | 40 ++++----- .../tests/match-provider.test.tsx | 90 +++++++++++++++++++ 4 files changed, 122 insertions(+), 31 deletions(-) create mode 100644 .changeset/quiet-match-provider-experiment.md create mode 100644 packages/react-router/tests/match-provider.test.tsx diff --git a/.changeset/quiet-match-provider-experiment.md b/.changeset/quiet-match-provider-experiment.md new file mode 100644 index 0000000000..81f1cc9f40 --- /dev/null +++ b/.changeset/quiet-match-provider-experiment.md @@ -0,0 +1,5 @@ +--- +'@tanstack/react-router': patch +--- + +Consolidate the root match context provider while preserving match context in the root shell. diff --git a/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx index 1ba756053a..6d535fb3c9 100644 --- a/packages/react-router/src/Match.tsx +++ b/packages/react-router/src/Match.tsx @@ -123,8 +123,8 @@ function MatchView({ ? ((route.options as RootRouteOptions).shellComponent ?? SafeFragment) : SafeFragment return ( - - + + match} @@ -171,13 +171,13 @@ function MatchView({ - - {(isServer ?? router.isServer) && - route.parentRoute?.id === rootRouteId && - router.options.scrollRestoration ? ( - - ) : null} - + {(isServer ?? router.isServer) && + route.parentRoute?.id === rootRouteId && + router.options.scrollRestoration ? ( + + ) : null} + + ) } diff --git a/packages/react-router/src/Matches.tsx b/packages/react-router/src/Matches.tsx index 6dea1032f2..b7993d8ac2 100644 --- a/packages/react-router/src/Matches.tsx +++ b/packages/react-router/src/Matches.tsx @@ -102,28 +102,24 @@ function MatchesInner() { const matchComponent = routeId ? : null - return ( - - {router.options.disableGlobalCatchBoundary ? ( - matchComponent - ) : ( - match} - onCatch={ - process.env.NODE_ENV !== 'production' - ? (error) => { - console.warn( - `Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!`, - ) - console.warn('Warning:', error) - } - : undefined - } - > - {matchComponent} - - )} - + return router.options.disableGlobalCatchBoundary ? ( + matchComponent + ) : ( + match} + onCatch={ + process.env.NODE_ENV !== 'production' + ? (error) => { + console.warn( + `Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!`, + ) + console.warn('Warning:', error) + } + : undefined + } + > + {matchComponent} + ) } diff --git a/packages/react-router/tests/match-provider.test.tsx b/packages/react-router/tests/match-provider.test.tsx new file mode 100644 index 0000000000..bc947fff05 --- /dev/null +++ b/packages/react-router/tests/match-provider.test.tsx @@ -0,0 +1,90 @@ +import * as React from 'react' +import { act, cleanup, render, screen } from '@testing-library/react' +import { renderToString } from 'react-dom/server' +import { afterEach, expect, test } from 'vitest' +import { + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, + useMatch, +} from '../src' + +afterEach(cleanup) + +function NearestMatch({ name }: { name: string }) { + const match = useMatch({ strict: false }) + return {match.routeId} +} + +function createTestRouter( + disableGlobalCatchBoundary = false, + isServer = false, +) { + const root = createRootRoute({ + shellComponent: function Shell({ children }) { + const [count, setCount] = React.useState(0) + return ( +
+ + + {children} +
+ ) + }, + component: () => ( + <> + + + + ), + }) + const first = createRoute({ + getParentRoute: () => root, + path: '/first', + component: () => , + }) + const second = createRoute({ + getParentRoute: () => root, + path: '/second', + component: () => , + }) + return createRouter({ + routeTree: root.addChildren([first, second]), + history: createMemoryHistory({ initialEntries: ['/first'] }), + disableGlobalCatchBoundary, + isServer, + }) +} + +test.each([false, true])( + 'shell keeps nearest match context and state across navigation (global catch disabled: %s)', + async (disableGlobalCatchBoundary) => { + const router = createTestRouter(disableGlobalCatchBoundary) + await router.load() + render() + expect(await screen.findByTestId('leaf-match')).toHaveTextContent('/first') + expect(screen.getByTestId('shell-match')).toHaveTextContent('__root__') + expect(screen.getByTestId('root-match')).toHaveTextContent('__root__') + const shell = screen.getByTestId('shell') + act(() => screen.getByRole('button').click()) + await act(async () => { + await router.navigate({ to: '/second' }) + }) + expect(screen.getByTestId('leaf-match')).toHaveTextContent('/second') + expect(screen.getByTestId('shell-match')).toHaveTextContent('__root__') + expect(screen.getByTestId('shell')).toBe(shell) + expect(screen.getByRole('button')).toHaveTextContent('Count 1') + }, +) + +test('server shell and nested component read their nearest match context', async () => { + const router = createTestRouter(false, true) + await router.load() + const html = renderToString() + expect(html).toContain('data-testid="shell-match">__root__') + expect(html).toContain('data-testid="root-match">__root__') + expect(html).toContain('data-testid="leaf-match">/first') +}) From 863c8a736b96746c56278a16c50554356f5523d1 Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 27 Sep 2026 22:01:33 +0200 Subject: [PATCH 071/175] perf(react-router): reuse link selector results (#8522) * test(react-router): cover cached link selector reruns * test(react-router): type configurable trailing slash fixture * test(react-router): use type import in selector benchmark * test(react-router): benchmark inactive dynamic destinations * perf(react-router): reuse link selector results * perf(react-router): resolve external links once per selector * perf(react-router): shrink link state classification * perf(react-router): shrink external link expression * perf(react-router): shrink link state classification [Self-Healing CI Rerun] * test(react-router): address link selector review cleanup --------- Co-authored-by: nx-cloud[bot] <71083854+nx-cloud[bot]@users.noreply.github.com> --- .changeset/rude-socks-learn.md | 5 + packages/react-router/src/link.tsx | 65 +++--- .../react-router/tests/link-selector.test.tsx | 192 ++++++++++++++++++ 3 files changed, 232 insertions(+), 30 deletions(-) create mode 100644 .changeset/rude-socks-learn.md create mode 100644 packages/react-router/tests/link-selector.test.tsx diff --git a/.changeset/rude-socks-learn.md b/.changeset/rude-socks-learn.md new file mode 100644 index 0000000000..af9bf99e7b --- /dev/null +++ b/.changeset/rude-socks-learn.md @@ -0,0 +1,5 @@ +--- +'@tanstack/react-router': patch +--- + +Reuse Link href classification and active/inactive results across location updates while preserving live history href formatting. diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index aa958ef31c..7861827719 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -290,41 +290,46 @@ export function useLinkProps< // the subscription instead re-renders every link on every navigation, because // the comparator only sees the location, not whether this link's output moved. // eslint-disable-next-line react-hooks/rules-of-hooks - const selectLinkState = React.useCallback( - (location: ParsedLocation): LinkState => { - const directExternalLink = resolveExternalLink( - to, - router.protocolAllowlist, - ) - if (directExternalLink !== undefined) { - return [directExternalLink ?? undefined] - } + const selectLinkState = React.useMemo(() => { + // Direct destinations and the router's allowlist are stable for this selector. + const directExternalLink = resolveExternalLink(to, router.protocolAllowlist) + if (directExternalLink !== undefined) { + const state: LinkState = [directExternalLink ?? undefined] + return () => state + } + let inactive: LinkState | undefined + let active: LinkState + + return (location: ParsedLocation): LinkState => { if (!_options._fromLocation) { dest._fromLocation = location } const next = router.buildLocation(dest) - // Use publicHref - it contains the correct href for display - // When a rewrite changes the origin, publicHref is the full URL - // Otherwise it's the origin-stripped path - // This avoids constructing URL objects in the hot path - const hrefOption = getHrefOption(next, router, disabled) - return [ - hrefOption, - !disabled && (!hrefOption || getUrlScheme(hrefOption)) - ? undefined - : resolveIsActive( - location, - next, - stableActiveOptions, - router.basepath, - isHydrated, - ), - ] - }, - [stableActiveOptions, disabled, isHydrated, _options, dest, router, to], - ) + // History formatters can depend on the current browser URL (hash history). + // Reuse classification and immutable results until the formatted href changes. + const href = getHrefOption(next, router, disabled) + if (!inactive || inactive[0] !== href) { + inactive = [ + href, + // Internal/disabled links use false; external/blocked links use undefined. + !(disabled || (href && !getUrlScheme(href))) && undefined, + ] + active = [href, true] + } + return inactive[1] !== undefined && + resolveIsActive( + location, + next, + stableActiveOptions, + router.basepath, + isHydrated, + ) + ? active + : inactive + } + }, [stableActiveOptions, disabled, isHydrated, _options, dest, router, to]) // eslint-disable-next-line react-hooks/rules-of-hooks const [href, isActive] = useSelector( @@ -332,7 +337,7 @@ export function useLinkProps< selectLinkState, LINK_SELECTOR_OPTIONS, ) - const externalLink = isActive === undefined ? href : undefined + const externalLink = isActive === undefined && href const linkDisabled = disabled || href === undefined // eslint-disable-next-line react-hooks/rules-of-hooks diff --git a/packages/react-router/tests/link-selector.test.tsx b/packages/react-router/tests/link-selector.test.tsx new file mode 100644 index 0000000000..eee6906265 --- /dev/null +++ b/packages/react-router/tests/link-selector.test.tsx @@ -0,0 +1,192 @@ +import React from 'react' +import { act, cleanup, render, waitFor } from '@testing-library/react' +import { afterEach, expect, test, vi } from 'vitest' +import { + Link, + RouterContextProvider, + RouterProvider, + createHashHistory, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, +} from '../src' + +afterEach(() => { + cleanup() + vi.restoreAllMocks() +}) + +async function setup(trailingSlash: 'never' | 'preserve' = 'never') { + const root = createRootRoute() + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/posts/$id' }), + ]), + history: createMemoryHistory({ initialEntries: ['/posts/1'] }), + trailingSlash, + }) + await router.load() + return router +} + +test('a fixed href follows active, inactive and active-again locations', async () => { + const router = await setup() + const view = render( + + + Post + + , + ) + const link = view.getByText('Post') + for (const [id, page, active] of [ + ['1', 1, true], + ['2', 1, false], + ['1', 2, false], + ['1', 1, true], + ] as const) { + await act(() => + router.navigate({ to: '/posts/$id', params: { id }, search: { page } }), + ) + expect(link).toHaveAttribute('href', '/posts/1?page=1') + expect(link.getAttribute('aria-current')).toBe(active ? 'page' : null) + } +}) + +test('changed destination, active options and disabled props replace prepared state', async () => { + const router = await setup() + function tree(id: string, disabled = false, includeSearch = true) { + return ( + + + Post + + + ) + } + const view = render(tree('1')) + const link = view.getByText('Post') + expect(link).not.toHaveAttribute('aria-current') + view.rerender(tree('1', false, false)) + expect(link).toHaveAttribute('aria-current', 'page') + view.rerender(tree('1', true, false)) + expect(link).not.toHaveAttribute('href') + expect(link).toHaveAttribute('aria-current', 'page') + view.rerender(tree('2', false, false)) + expect(link).toHaveAttribute('href', '/posts/2?page=1') + expect(link).not.toHaveAttribute('aria-current') + await act(() => router.navigate({ to: '/posts/$id', params: { id: '2' } })) + expect(link).toHaveAttribute('aria-current', 'page') +}) + +test('hash history refreshes a cached destination after the outer URL changes', async () => { + const original = window.location.href + window.history.replaceState(null, '', '/shell?outer=one#/posts/1') + const history = createHashHistory() + const root = createRootRoute({ + component: () => ( + + Post + + ), + }) + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/posts/$id' }), + ]), + history, + trailingSlash: 'never', + }) + try { + const view = render() + const link = await view.findByText('Post') + expect(link).toHaveAttribute('href', '/shell?outer=one#/posts/1') + expect(link).toHaveAttribute('aria-current', 'page') + act(() => { + window.history.replaceState(null, '', '/other?outer=two#/posts/2') + }) + await waitFor(() => { + expect(link).toHaveAttribute('href', '/other?outer=two#/posts/1') + expect(link).not.toHaveAttribute('aria-current') + }) + } finally { + cleanup() + history.destroy() + window.history.replaceState(null, '', original) + } +}) + +test.each([false, true])( + 'cached paths retain segment boundaries and basepaths (exact=%s)', + async (exact) => { + const router = await setup() + router.update({ basepath: '/app', trailingSlash: 'preserve' }) + const view = render( + + + Post + + , + ) + const link = view.getByText('Post') + for (const [to, active] of [ + ['/posts/1', true], + ['/posts/1/details', !exact], + ['/posts/10', false], + ['/posts/1/', true], + ] as const) { + await act(() => router.navigate({ to })) + expect(link).toHaveAttribute('href', '/app/posts/1/') + expect(link.getAttribute('aria-current')).toBe(active ? 'page' : null) + } + router.update({ basepath: '/new' }) + await act(() => router.navigate({ to: '/posts/1/' })) + expect(link).toHaveAttribute('href', '/new/posts/1/') + expect(link).toHaveAttribute('aria-current', 'page') + }, +) + +test('external classification follows changed destinations and router instances', async () => { + vi.spyOn(console, 'warn').mockImplementation(() => {}) + const router = await setup() + router.update({ protocolAllowlist: ['https:', 'custom:'] }) + function tree(to: string, currentRouter = router) { + return ( + + Destination + + ) + } + const view = render(tree('/posts/1')) + const link = view.getByText('Destination') + expect(link).toHaveAttribute('aria-current', 'page') + for (const to of ['https://other.example/', 'custom:post']) { + view.rerender(tree(to)) + await act(() => router.navigate({ to: '/posts/$id', params: { id: '2' } })) + expect(link).toHaveAttribute('href', to) + expect(link).not.toHaveAttribute('aria-current') + } + view.rerender(tree('javascript:blocked()')) + await act(() => router.navigate({ to: '/posts/$id', params: { id: '1' } })) + expect(link).not.toHaveAttribute('href') + expect(link).not.toHaveAttribute('aria-current') + view.rerender(tree('/posts/2')) + await act(() => router.navigate({ to: '/posts/$id', params: { id: '2' } })) + expect(link).toHaveAttribute('href', '/posts/2') + expect(link).toHaveAttribute('aria-current', 'page') + + // Each mounted router keeps its allowlist; switching routers resets the selector. + view.rerender(tree('custom:post')) + expect(link).toHaveAttribute('href', 'custom:post') + const otherRouter = await setup() + view.rerender(tree('custom:post', otherRouter)) + expect(link).not.toHaveAttribute('href') + expect(link).not.toHaveAttribute('aria-current') +}) From 60b8ad1ad00812bf966a8eeee6be238c37ddad74 Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 27 Sep 2026 22:02:22 +0200 Subject: [PATCH 072/175] perf(react-router): omit inactive route wrapper components (#8529) * perf(react-router): omit inactive route wrapper components * perf(react-router): omit inactive route wrapper components [Self-Healing CI Rerun] --------- Co-authored-by: nx-cloud[bot] <71083854+nx-cloud[bot]@users.noreply.github.com> --- .changeset/calm-boundaries-flow.md | 5 + packages/react-router/src/Match.tsx | 142 +++++++++++---------- packages/react-router/src/Matches.tsx | 13 +- packages/react-router/src/SafeFragment.tsx | 5 - 4 files changed, 87 insertions(+), 78 deletions(-) create mode 100644 .changeset/calm-boundaries-flow.md delete mode 100644 packages/react-router/src/SafeFragment.tsx diff --git a/.changeset/calm-boundaries-flow.md b/.changeset/calm-boundaries-flow.md new file mode 100644 index 0000000000..1dbf552774 --- /dev/null +++ b/.changeset/calm-boundaries-flow.md @@ -0,0 +1,5 @@ +--- +'@tanstack/react-router': patch +--- + +Compose only enabled route boundaries instead of rendering inactive wrapper components. diff --git a/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx index 6d535fb3c9..474a155fbf 100644 --- a/packages/react-router/src/Match.tsx +++ b/packages/react-router/src/Match.tsx @@ -8,7 +8,6 @@ import { CatchBoundary, ErrorComponent } from './CatchBoundary' import { useRouter } from './useRouter' import { CatchNotFound } from './not-found' import { matchContext } from './matchContext' -import { SafeFragment } from './SafeFragment' import { renderRouteNotFound } from './renderRouteNotFound' import { ScrollRestoration } from './scroll-restoration' import { ClientOnly } from './ClientOnly' @@ -103,80 +102,91 @@ function MatchView({ const resolvedNoSsr = match.ssr === false || match.ssr === 'data-only' // A root component may render the document itself. Only place its Suspense // boundary in pure CSR, inside an explicit shell, or when explicitly opted in. - const ResolvedSuspenseBoundary = + const wrapInSuspense = canWrapInSuspense(router, route, match.ssr) && (route.options.wrapInSuspense ?? pendingElement ?? ((route.options.errorComponent as any)?.preload || resolvedNoSsr)) - ? React.Suspense - : SafeFragment - const ResolvedCatchBoundary = routeErrorComponent - ? CatchBoundary - : SafeFragment - - const ResolvedNotFoundBoundary = routeNotFoundComponent - ? CatchNotFound - : SafeFragment + let content = + if (resolvedNoSsr) { + content = {content} + } + if (routeNotFoundComponent) { + content = ( + { + error.routeId ??= match.routeId + if (error.routeId !== match.routeId) { + throw error + } + const notFoundElement = React.createElement( + routeNotFoundComponent, + error as any, + ) + return process.env.NODE_ENV !== 'production' + ? wrapInNonRouteComponentContext( + notFoundElement, + 'notFoundComponent', + ) + : notFoundElement + }} + > + {content} + + ) + } + if (routeErrorComponent) { + content = ( + match} + errorComponent={routeErrorComponent as any} + onCatch={(error, errorInfo) => { + // Not-found errors belong to the enclosing not-found boundary. + if (isNotFound(error)) { + error.routeId ??= match.routeId + throw error + } + if (process.env.NODE_ENV !== 'production') { + console.warn(`Warning: Error in route match: ${match.id}`) + } + routeOnCatch?.(error, errorInfo) + }} + > + {content} + + ) + } + if (wrapInSuspense) { + content = ( + {content} + ) + } + const scrollRestoration = + (isServer ?? router.isServer) && + route.parentRoute?.id === rootRouteId && + router.options.scrollRestoration ? ( + + ) : null const ShellComponent = route.isRoot - ? ((route.options as RootRouteOptions).shellComponent ?? SafeFragment) - : SafeFragment + ? (route.options as RootRouteOptions).shellComponent + : undefined + + // The shell and route boundaries must share this match's context. return ( - - - match} - errorComponent={routeErrorComponent as any} - onCatch={(error, errorInfo) => { - // Forward not found errors (we don't want to show the error component for these) - if (isNotFound(error)) { - error.routeId ??= match.routeId - throw error - } - if (process.env.NODE_ENV !== 'production') { - console.warn(`Warning: Error in route match: ${match.id}`) - } - routeOnCatch?.(error, errorInfo) - }} - > - { - error.routeId ??= match.routeId - - if (error.routeId !== match.routeId) { - throw error - } - - const notFoundElement = React.createElement( - routeNotFoundComponent!, - error as any, - ) - return process.env.NODE_ENV !== 'production' - ? wrapInNonRouteComponentContext( - notFoundElement, - 'notFoundComponent', - ) - : notFoundElement - }} - > - {resolvedNoSsr ? ( - - - - ) : ( - - )} - - - - {(isServer ?? router.isServer) && - route.parentRoute?.id === rootRouteId && - router.options.scrollRestoration ? ( - - ) : null} - + {ShellComponent ? ( + + {content} + {scrollRestoration} + + ) : ( + <> + {content} + {scrollRestoration} + + )} ) } diff --git a/packages/react-router/src/Matches.tsx b/packages/react-router/src/Matches.tsx index b7993d8ac2..a20c862b23 100644 --- a/packages/react-router/src/Matches.tsx +++ b/packages/react-router/src/Matches.tsx @@ -11,7 +11,6 @@ import { useLayoutEffect } from './utils' import { Transitioner, settleOwner } from './Transitioner' import { matchContext } from './matchContext' import { Match, renderPending } from './Match' -import { SafeFragment } from './SafeFragment' import type { StructuralSharingOption, ValidateSelected, @@ -51,10 +50,6 @@ export function Matches() { const pendingElement = renderPending(router, rootRoute) - // Do not render a root Suspense during SSR or hydrating from SSR - const ResolvedSuspense = - (isServer ?? router.isServer) || router.ssr ? SafeFragment : React.Suspense - const inner = ( <> {!(isServer ?? router.isServer) && ( @@ -67,9 +62,13 @@ export function Matches() { t={React.useState()[1]} /> )} - + {(isServer ?? router.isServer) || router.ssr ? ( - + ) : ( + + + + )} ) diff --git a/packages/react-router/src/SafeFragment.tsx b/packages/react-router/src/SafeFragment.tsx deleted file mode 100644 index 72a95bac01..0000000000 --- a/packages/react-router/src/SafeFragment.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import * as React from 'react' - -export function SafeFragment(props: any) { - return <>{props.children} -} From 05223c2ada4d48af4b3881f10e3b6261898b2d40 Mon Sep 17 00:00:00 2001 From: Flo Date: Mon, 28 Sep 2026 00:07:58 +0200 Subject: [PATCH 073/175] perf(start): defer sitemap dependencies until generation (#8533) * perf(start): defer sitemap dependencies until generation * Delete packages/start-plugin-core/tests/sitemap-import.test.ts * perf(start): defer sitemap dependencies until generation [Self-Healing CI Rerun] --------- Co-authored-by: nx-cloud[bot] <71083854+nx-cloud[bot]@users.noreply.github.com> --- .changeset/new-socks-judge.md | 5 ++ packages/start-plugin-core/src/post-build.ts | 2 +- .../tests/sitemap-output.test.ts | 81 +++++++++++++++++++ 3 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 .changeset/new-socks-judge.md create mode 100644 packages/start-plugin-core/tests/sitemap-output.test.ts diff --git a/.changeset/new-socks-judge.md b/.changeset/new-socks-judge.md new file mode 100644 index 0000000000..db8d21cdad --- /dev/null +++ b/.changeset/new-socks-judge.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Defer sitemap and XML dependencies until sitemap generation is enabled to reduce Start plugin startup work. diff --git a/packages/start-plugin-core/src/post-build.ts b/packages/start-plugin-core/src/post-build.ts index 0fd2410d56..d81a49bcab 100644 --- a/packages/start-plugin-core/src/post-build.ts +++ b/packages/start-plugin-core/src/post-build.ts @@ -1,5 +1,4 @@ import { HEADERS } from '@tanstack/start-server-core/constants' -import { buildSitemap } from './build-sitemap' import type { TanStackStartOutputConfig } from './schema' export interface StartPostBuildAdapter { @@ -56,6 +55,7 @@ export async function postBuild({ } if (startConfig.sitemap?.enabled) { + const { buildSitemap } = await import('./build-sitemap') buildSitemap({ startConfig, publicDir: adapter.getClientOutputDirectory(), diff --git a/packages/start-plugin-core/tests/sitemap-output.test.ts b/packages/start-plugin-core/tests/sitemap-output.test.ts new file mode 100644 index 0000000000..c92bf842ba --- /dev/null +++ b/packages/start-plugin-core/tests/sitemap-output.test.ts @@ -0,0 +1,81 @@ +import { mkdtemp, readFile, rm } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { describe, expect, it, vi } from 'vitest' +import { postBuild } from '../src/post-build' +import { parseStartConfig } from '../src/schema' + +describe('post-build sitemap', () => { + it('writes sitemap files before resolving, using pages discovered during prerendering', async () => { + const publicDir = await mkdtemp(path.join(tmpdir(), 'tss-sitemap-')) + const startConfig = parseStartConfig( + { + sitemap: { host: 'https://example.com', outputPath: 'custom.xml' }, + prerender: { enabled: true }, + pages: [ + { path: '/hidden', sitemap: { exclude: true } }, + { + path: '/posts?sort=a&tag=b', + sitemap: { + lastmod: '2026-01-02', + priority: 0, + changefreq: 'daily', + }, + }, + ], + }, + { framework: 'react' }, + process.cwd(), + ) + + try { + await postBuild({ + startConfig, + adapter: { + getClientOutputDirectory: () => publicDir, + async prerender(config) { + await Promise.resolve() + config.pages.push({ path: '/discovered' }) + }, + }, + }) + + const xml = await readFile(path.join(publicDir, 'custom.xml'), 'utf8') + expect(xml).toContain('') + expect(xml).toContain('https://example.com/posts?sort=a&tag=b') + expect(xml).toContain('2026-01-02') + expect(xml).toContain('0') + expect(xml).toContain('daily') + expect(xml).toContain('https://example.com/discovered') + expect(xml).not.toContain('/hidden') + const pages = JSON.parse( + await readFile(path.join(publicDir, 'pages.json'), 'utf8'), + ) + expect(pages).toEqual({ + pages: startConfig.pages, + host: 'https://example.com', + lastBuilt: expect.any(String), + }) + } finally { + await rm(publicDir, { recursive: true, force: true }) + } + }) + + it('propagates sitemap validation errors through the post-build promise', async () => { + await expect( + postBuild({ + startConfig: parseStartConfig( + { sitemap: { enabled: true } }, + { framework: 'react' }, + process.cwd(), + ), + adapter: { + getClientOutputDirectory: () => '/unused', + prerender: vi.fn(), + }, + }), + ).rejects.toThrow( + 'Sitemap host is not set and required to build the sitemap.', + ) + }) +}) From 41ebd288677beacb8eb56953f5f8c26e9d33313e Mon Sep 17 00:00:00 2001 From: bkuzmanoski Date: Mon, 28 Sep 2026 08:48:33 +1000 Subject: [PATCH 074/175] fix(start-plugin-core): use http scheme for sitemap xmlns (#8127) fix: use http scheme for sitemap xmlns per sitemaps.org spec --- .changeset/eighty-shoes-flow.md | 5 +++++ packages/start-plugin-core/src/build-sitemap.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/eighty-shoes-flow.md diff --git a/.changeset/eighty-shoes-flow.md b/.changeset/eighty-shoes-flow.md new file mode 100644 index 0000000000..3fc449c154 --- /dev/null +++ b/.changeset/eighty-shoes-flow.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +fix: use http scheme for sitemap xmlns per sitemaps.org spec diff --git a/packages/start-plugin-core/src/build-sitemap.ts b/packages/start-plugin-core/src/build-sitemap.ts index 3eae17ca02..9d2c5c1ecd 100644 --- a/packages/start-plugin-core/src/build-sitemap.ts +++ b/packages/start-plugin-core/src/build-sitemap.ts @@ -202,7 +202,7 @@ export function buildSitemap({ function createXml(elementName: 'urlset' | 'sitemapindex'): XMLBuilder { return create({ version: '1.0', encoding: 'UTF-8' }) .ele(elementName, { - xmlns: 'https://www.sitemaps.org/schemas/sitemap/0.9', + xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9', 'xmlns:xhtml': 'http://www.w3.org/1999/xhtml', }) .com(`This file was automatically generated by TanStack Start.`) From 614bc27034c8ec98747bf305ed41d4a619640949 Mon Sep 17 00:00:00 2001 From: Flo Date: Wed, 30 Sep 2026 12:42:07 +0200 Subject: [PATCH 075/175] chore(deps): update TanStack Store to 0.11.2 (#8568) * chore(deps): update TanStack Store to 0.11.2 * chore(deps): regenerate Store 0.11.2 lockfile --- .changeset/fresh-store-dependencies.md | 6 +++++ packages/react-router/package.json | 2 +- packages/router-core/package.json | 2 +- packages/vue-router/package.json | 2 +- pnpm-lock.yaml | 34 +++++++++++++------------- 5 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 .changeset/fresh-store-dependencies.md diff --git a/.changeset/fresh-store-dependencies.md b/.changeset/fresh-store-dependencies.md new file mode 100644 index 0000000000..04b328ffac --- /dev/null +++ b/.changeset/fresh-store-dependencies.md @@ -0,0 +1,6 @@ +--- +'@tanstack/react-router': patch +'@tanstack/vue-router': patch +--- + +Update TanStack Store to 0.11.2 to prevent unrelated atom reads inside subscription observers from triggering extra notifications. diff --git a/packages/react-router/package.json b/packages/react-router/package.json index cb7d24b359..0755b40aa3 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -93,7 +93,7 @@ }, "dependencies": { "@tanstack/history": "workspace:*", - "@tanstack/react-store": "^0.11.0", + "@tanstack/react-store": "^0.11.2", "@tanstack/router-core": "workspace:*", "isbot": "catalog:" }, diff --git a/packages/router-core/package.json b/packages/router-core/package.json index b8ae269b9e..12cf13b6c6 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -188,7 +188,7 @@ "seroval-plugins": "^1.6.7" }, "devDependencies": { - "@tanstack/store": "^0.11.0", + "@tanstack/store": "^0.11.2", "@types/node": "25.0.9", "esbuild": "^0.27.4", "vite": "catalog:", diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index fa84727b2d..97952fa240 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -75,7 +75,7 @@ "dependencies": { "@tanstack/history": "workspace:*", "@tanstack/router-core": "workspace:*", - "@tanstack/vue-store": "^0.11.0", + "@tanstack/vue-store": "^0.11.2", "@vue/runtime-dom": "^3.5.25", "isbot": "catalog:" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 393afb1b75..4f52909cae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13831,8 +13831,8 @@ importers: specifier: workspace:* version: link:../history '@tanstack/react-store': - specifier: ^0.11.0 - version: 0.11.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + specifier: ^0.11.2 + version: 0.11.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3) '@tanstack/router-core': specifier: workspace:* version: link:../router-core @@ -14350,8 +14350,8 @@ importers: specifier: 'catalog:' version: 0.18.4 '@tanstack/store': - specifier: ^0.11.0 - version: 0.11.1 + specifier: ^0.11.2 + version: 0.11.2 '@tanstack/vite-config': specifier: 'catalog:' version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) @@ -15393,8 +15393,8 @@ importers: specifier: workspace:* version: link:../router-core '@tanstack/vue-store': - specifier: ^0.11.0 - version: 0.11.1(vue@3.5.25(@typescript/typescript6@6.0.2)) + specifier: ^0.11.2 + version: 0.11.2(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vue/runtime-dom': specifier: ^3.5.25 version: 3.5.25 @@ -22064,8 +22064,8 @@ packages: peerDependencies: react: ^19.2.3 - '@tanstack/react-store@0.11.1': - resolution: {integrity: sha512-HaIGKI3YLmjBYIvy5DFDY23oNaYZIsTZfngey07Uh5iLVJgM3bIGCnZeOFOqzjFld9JHWcaHJnasD/bKoGKwJQ==} + '@tanstack/react-store@0.11.2': + resolution: {integrity: sha512-oj5O5DmiMWE+ih+SioX2ayC1kbK7d3fpLx0B75fPJr9nY3zU+hoW010yr64qXsY/9fyiLVE2bn5mGNV3owm8RQ==} peerDependencies: react: ^19.2.3 react-dom: ^19.2.3 @@ -22098,8 +22098,8 @@ packages: peerDependencies: solid-js: 1.9.12 - '@tanstack/store@0.11.1': - resolution: {integrity: sha512-mzTOBhypOuDJAy/D8n2MfUZ1HFkXnmSETviRyhqEC8LUE7/IZQExOTxMANj3KjTofYTkFNpBY67qaVrT41YccA==} + '@tanstack/store@0.11.2': + resolution: {integrity: sha512-sJ4mjol8uQsHV0gOJzzjwXfh2Fwm+Sz0+8deqiTm4jGbMdjzNSW+xZCFm0kUa870uhd8yi+DpKnZb5Kc4apa0Q==} '@tanstack/virtual-core@3.13.0': resolution: {integrity: sha512-NBKJP3OIdmZY3COJdWkSonr50FMVIi+aj5ZJ7hI/DTpEKg2RMfo/KvP8A3B/zOSpMgIe52B5E2yn7rryULzA6g==} @@ -22137,8 +22137,8 @@ packages: '@vue/composition-api': optional: true - '@tanstack/vue-store@0.11.1': - resolution: {integrity: sha512-0YmYwbiCQKhzfFTLpHybjoAVUh3GkQVYGguvGTzk/0wx0oWuni60huvRs1RqqRLJH6nig3PTYuLuQQ+X5s05gA==} + '@tanstack/vue-store@0.11.2': + resolution: {integrity: sha512-wZmkfsvc0dNvOg/Xb/a7uTPKejleI0dR3HHi0t3ZyVM/23MJ7AC0bH6C7rp2seSY4mIYo0pLLbGJGZ/UpO93Zw==} peerDependencies: '@vue/composition-api': ^1.2.1 vue: ^2.5.0 || ^3.0.0 @@ -36577,9 +36577,9 @@ snapshots: '@tanstack/query-core': 5.102.0 react: 19.2.3 - '@tanstack/react-store@0.11.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': + '@tanstack/react-store@0.11.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: - '@tanstack/store': 0.11.1 + '@tanstack/store': 0.11.2 react: 19.2.3 react-dom: 19.2.3(react@19.2.3) use-sync-external-store: 1.6.0(react@19.2.3) @@ -36615,7 +36615,7 @@ snapshots: '@tanstack/virtual-core': 3.13.12 solid-js: 1.9.12 - '@tanstack/store@0.11.1': {} + '@tanstack/store@0.11.2': {} '@tanstack/virtual-core@3.13.0': {} @@ -36707,9 +36707,9 @@ snapshots: vue: 3.5.25(typescript@7.0.2) vue-demi: 0.14.10(vue@3.5.25(typescript@7.0.2)) - '@tanstack/vue-store@0.11.1(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@tanstack/vue-store@0.11.2(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: - '@tanstack/store': 0.11.1 + '@tanstack/store': 0.11.2 vue: 3.5.25(@typescript/typescript6@6.0.2) vue-demi: 0.14.10(vue@3.5.25(@typescript/typescript6@6.0.2)) From d521abd71c69f1ff010bb3def4d417cb5fa058cb Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 30 Sep 2026 11:29:54 -0600 Subject: [PATCH 076/175] fix(start): align server function transport behavior (#8573) --- .changeset/quiet-apes-protect.md | 6 ++ .../router-core/src/ssr/handlerCallback.ts | 32 +++++++--- .../start-client-core/src/createServerFn.ts | 3 +- .../start-server-core/src/request-response.ts | 62 ++++++++++++++----- .../ServerFunctionSerializationAdapter.ts | 12 +++- .../src/server-functions-handler.ts | 39 +++++++----- 6 files changed, 112 insertions(+), 42 deletions(-) create mode 100644 .changeset/quiet-apes-protect.md diff --git a/.changeset/quiet-apes-protect.md b/.changeset/quiet-apes-protect.md new file mode 100644 index 0000000000..9b5f721653 --- /dev/null +++ b/.changeset/quiet-apes-protect.md @@ -0,0 +1,6 @@ +--- +'@tanstack/router-core': patch +'@tanstack/start-server-core': patch +--- + +Align server function request and response handling. diff --git a/packages/router-core/src/ssr/handlerCallback.ts b/packages/router-core/src/ssr/handlerCallback.ts index c64f5c0d0c..45f3255c5b 100644 --- a/packages/router-core/src/ssr/handlerCallback.ts +++ b/packages/router-core/src/ssr/handlerCallback.ts @@ -14,20 +14,38 @@ export type SsrResponse = export type HandlerCallbackResult = Response | SsrResponse export function isSsrResponse(value: unknown): value is SsrResponse { + if ( + typeof value !== 'object' || + value === null || + !('response' in value) || + !(value.response instanceof Response) || + !('serverSsrCleanup' in value) + ) { + return false + } + + if (value.serverSsrCleanup === 'none') { + return true + } + return ( - typeof value === 'object' && - value !== null && - 'response' in value && - 'serverSsrCleanup' in value + value.serverSsrCleanup === 'stream' && + 'dispose' in value && + typeof value.dispose === 'function' ) } export function normalizeSsrResponse( result: HandlerCallbackResult, ): SsrResponse { - return isSsrResponse(result) - ? result - : { response: result, serverSsrCleanup: 'none' } + if (result instanceof Response) { + return { response: result, serverSsrCleanup: 'none' } + } + if (isSsrResponse(result)) { + return result + } + + throw new TypeError('Expected a Response from the SSR handler') } function cancelResponseBody(response: Response, reason?: unknown): void { diff --git a/packages/start-client-core/src/createServerFn.ts b/packages/start-client-core/src/createServerFn.ts index c363fdad78..3d74619cbd 100644 --- a/packages/start-client-core/src/createServerFn.ts +++ b/packages/start-client-core/src/createServerFn.ts @@ -186,7 +186,8 @@ export const createServerFn: CreateServerFn = (options, __opts) => { startContext.contextAfterGlobalMiddlewares const ctx = { ...extractedFn, - ...opts, + data: opts.data, + method: opts.method ?? resolvedOptions.method, // Ensure we use the full serverFnMeta from the provider file's extractedFn // (which has id, name, filename) rather than the partial one from SSR/client // callers (which only has id) diff --git a/packages/start-server-core/src/request-response.ts b/packages/start-server-core/src/request-response.ts index 2f0456bedf..bde014a153 100644 --- a/packages/start-server-core/src/request-response.ts +++ b/packages/start-server-core/src/request-response.ts @@ -65,8 +65,12 @@ type HeadersWithGetSetCookie = Headers & { type MaybePromise = T | Promise -function isPromiseLike(value: MaybePromise): value is Promise { - return typeof (value as Promise).then === 'function' +function isPromiseLike(value: unknown): value is PromiseLike { + return ( + (typeof value === 'object' || typeof value === 'function') && + value !== null && + typeof (value as PromiseLike).then === 'function' + ) } function getSetCookieValues(headers: Headers): Array { @@ -98,24 +102,43 @@ function mergeEventResponseHeaders(response: Response, event: H3Event): void { } } -function attachResponseHeaders( - value: MaybePromise, +function finalizeResponse(value: unknown, event: H3Event): Response { + const response = ensureResponse(value) + mergeEventResponseHeaders(response, event) + return response +} + +function finalizeMaybeResponse( + value: unknown, event: H3Event, -): MaybePromise { +): MaybePromise { if (isPromiseLike(value)) { - return value.then((resolved) => { - if (resolved instanceof Response) { - mergeEventResponseHeaders(resolved, event) - } - return resolved - }) + return Promise.resolve(value).then( + (resolved) => finalizeResponse(resolved, event), + (error) => finalizeResponse(handleResponseError(error), event), + ) } + return finalizeResponse(value, event) +} + +function ensureResponse(value: unknown): Response { if (value instanceof Response) { - mergeEventResponseHeaders(value, event) + return value } - return value + return new Response('Internal Server Error', { status: 500 }) +} + +function handleResponseError(error: unknown): Response { + if (error instanceof Response) { + return error + } + if (error instanceof Error) { + throw error + } + + return new Response('Internal Server Error', { status: 500 }) } export function requestHandler( @@ -135,10 +158,15 @@ export function requestHandler( throw error } - const response = eventStorage.run({ h3Event }, () => - handler(request, requestOpts), - ) - return h3_toResponse(attachResponseHeaders(response, h3Event), h3Event) + let response: unknown + try { + response = eventStorage.run({ h3Event }, () => + handler(request, requestOpts), + ) + } catch (error) { + response = handleResponseError(error) + } + return h3_toResponse(finalizeMaybeResponse(response, h3Event), h3Event) } } diff --git a/packages/start-server-core/src/serializer/ServerFunctionSerializationAdapter.ts b/packages/start-server-core/src/serializer/ServerFunctionSerializationAdapter.ts index d127b253d5..96ee0b3b60 100644 --- a/packages/start-server-core/src/serializer/ServerFunctionSerializationAdapter.ts +++ b/packages/start-server-core/src/serializer/ServerFunctionSerializationAdapter.ts @@ -18,7 +18,17 @@ export const ServerFunctionSerializationAdapter = createSerializationAdapter({ // to another server function), it originates from the client and must be // validated the same way as direct HTTP calls to server functions. const serverFn = await getServerFnById(functionId, { origin: 'client' }) - const result = await serverFn(opts ?? {}, signal) + const result = await serverFn( + { + data: opts?.data, + context: opts?.context, + method: serverFn.method ?? 'GET', + }, + signal, + ) + if (result.error !== undefined) { + throw result.error + } return result.result } return fn as never diff --git a/packages/start-server-core/src/server-functions-handler.ts b/packages/start-server-core/src/server-functions-handler.ts index 48922e2ab6..5288fa5de2 100644 --- a/packages/start-server-core/src/server-functions-handler.ts +++ b/packages/start-server-core/src/server-functions-handler.ts @@ -155,26 +155,35 @@ export const handleServerAction = async ({ } const payload: any = payloadParam ? fromJSON(JSON.parse(payloadParam), { plugins: serovalPlugins }) - : {} - payload.context = safeObjectMerge(payload.context, context) - payload.method = methodUpper - res = await action(payload) + : undefined + res = await action({ + data: payload?.data, + context: safeObjectMerge(payload?.context, context), + method: methodUpper, + }) } else { const payload: any = contentType?.includes('application/json') ? fromJSON(await request.json(), { plugins: serovalPlugins }) - : {} - payload.context = safeObjectMerge(payload.context, context) - payload.method = methodUpper - res = await action(payload) + : undefined + res = await action({ + data: payload?.data, + context: safeObjectMerge(payload?.context, context), + method: methodUpper, + }) } - const unwrapped = res.result !== undefined ? res.result : res.error + const unwrapped = res.error !== undefined ? res.error : res.result if (isNotFound(res)) { res = isNotFoundResponse(res) } - if (!isServerFn) { + if ( + !isServerFn && + (unwrapped instanceof Response || + unwrapped === null || + typeof unwrapped !== 'object') + ) { return unwrapped } @@ -517,12 +526,10 @@ function serializeResult( function isNotFoundResponse(error: any) { const { headers, ...rest } = error - - return new Response(JSON.stringify(rest), { + const response = new Response(JSON.stringify(rest), { status: 404, - headers: { - 'Content-Type': 'application/json', - ...(headers || {}), - }, + headers, }) + response.headers.set('Content-Type', 'application/json') + return response } From 57e126e99dbd86f735ead2ba98ba5e98ef0cc668 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Sep 2026 11:41:29 -0600 Subject: [PATCH 077/175] ci: Version Packages (#8531) ci: changeset release Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/calm-boundaries-flow.md | 5 - .changeset/eighty-shoes-flow.md | 5 - .changeset/fresh-store-dependencies.md | 6 -- .changeset/new-socks-judge.md | 5 - .changeset/quiet-apes-protect.md | 6 -- .changeset/quiet-match-provider-experiment.md | 5 - .changeset/rude-socks-learn.md | 5 - .../package.json | 4 +- .../react/authenticated-routes/package.json | 4 +- .../basic-default-search-params/package.json | 2 +- .../react/basic-devtools-panel/package.json | 2 +- examples/react/basic-file-based/package.json | 4 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-react-query-file-based/package.json | 4 +- examples/react/basic-react-query/package.json | 2 +- .../react/basic-ssr-file-based/package.json | 4 +- .../package.json | 4 +- .../basic-virtual-file-based/package.json | 4 +- .../package.json | 4 +- examples/react/basic/package.json | 2 +- examples/react/deferred-data/package.json | 2 +- examples/react/i18n-paraglide/package.json | 4 +- .../kitchen-sink-file-based/package.json | 4 +- .../package.json | 4 +- .../kitchen-sink-react-query/package.json | 2 +- examples/react/kitchen-sink/package.json | 2 +- examples/react/large-file-based/package.json | 4 +- examples/react/location-masking/package.json | 2 +- .../react/navigation-blocking/package.json | 2 +- .../package.json | 4 +- .../react/quickstart-file-based/package.json | 4 +- .../quickstart-rspack-file-based/package.json | 4 +- .../package.json | 4 +- examples/react/quickstart/package.json | 2 +- .../router-monorepo-react-query/package.json | 4 +- .../packages/router/package.json | 4 +- .../router-monorepo-simple-lazy/package.json | 4 +- .../packages/router/package.json | 4 +- .../react/router-monorepo-simple/package.json | 4 +- .../packages/router/package.json | 4 +- .../react/scroll-restoration/package.json | 2 +- .../search-validator-adapters/package.json | 4 +- examples/react/start-bare/package.json | 4 +- examples/react/start-basic-auth/package.json | 4 +- .../react/start-basic-authjs/package.json | 4 +- .../react/start-basic-cloudflare/package.json | 4 +- .../start-basic-react-query/package.json | 4 +- .../react/start-basic-rsbuild/package.json | 4 +- .../react/start-basic-static/package.json | 6 +- examples/react/start-basic/package.json | 4 +- examples/react/start-bun/package.json | 6 +- examples/react/start-clerk-basic/package.json | 4 +- .../react/start-convex-trellaux/package.json | 4 +- examples/react/start-counter/package.json | 4 +- .../react/start-i18n-paraglide/package.json | 4 +- examples/react/start-large/package.json | 4 +- examples/react/start-material-ui/package.json | 4 +- .../react/start-next-migration/package.json | 4 +- examples/react/start-rscs/package.json | 4 +- .../package.json | 4 +- .../react/start-supabase-basic/package.json | 4 +- examples/react/start-tailwind-v4/package.json | 4 +- examples/react/start-trellaux/package.json | 4 +- examples/react/start-workos/package.json | 4 +- examples/react/view-transitions/package.json | 4 +- .../react/with-framer-motion/package.json | 2 +- .../react/with-trpc-react-query/package.json | 4 +- examples/react/with-trpc/package.json | 4 +- .../package.json | 4 +- .../solid/authenticated-routes/package.json | 4 +- .../basic-default-search-params/package.json | 2 +- .../solid/basic-devtools-panel/package.json | 2 +- examples/solid/basic-file-based/package.json | 4 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-solid-query-file-based/package.json | 4 +- examples/solid/basic-solid-query/package.json | 4 +- .../solid/basic-ssr-file-based/package.json | 4 +- .../package.json | 4 +- .../basic-virtual-file-based/package.json | 4 +- .../package.json | 4 +- examples/solid/basic/package.json | 2 +- examples/solid/deferred-data/package.json | 2 +- examples/solid/i18n-paraglide/package.json | 4 +- .../kitchen-sink-file-based/package.json | 4 +- .../package.json | 4 +- .../kitchen-sink-solid-query/package.json | 2 +- examples/solid/kitchen-sink/package.json | 2 +- examples/solid/large-file-based/package.json | 4 +- examples/solid/location-masking/package.json | 2 +- .../solid/navigation-blocking/package.json | 2 +- .../package.json | 4 +- .../solid/quickstart-file-based/package.json | 4 +- .../quickstart-rspack-file-based/package.json | 4 +- .../package.json | 4 +- examples/solid/quickstart/package.json | 2 +- .../router-monorepo-simple-lazy/package.json | 4 +- .../packages/router/package.json | 4 +- .../solid/router-monorepo-simple/package.json | 4 +- .../packages/router/package.json | 4 +- .../router-monorepo-solid-query/package.json | 4 +- .../packages/router/package.json | 4 +- .../solid/scroll-restoration/package.json | 2 +- .../search-validator-adapters/package.json | 4 +- examples/solid/start-basic-auth/package.json | 4 +- .../solid/start-basic-authjs/package.json | 4 +- .../solid/start-basic-cloudflare/package.json | 4 +- .../solid/start-basic-netlify/package.json | 4 +- examples/solid/start-basic-nitro/package.json | 4 +- .../start-basic-solid-query/package.json | 4 +- .../solid/start-basic-static/package.json | 6 +- examples/solid/start-basic/package.json | 4 +- examples/solid/start-bun/package.json | 6 +- .../start-convex-better-auth/package.json | 4 +- examples/solid/start-counter/package.json | 4 +- .../solid/start-i18n-paraglide/package.json | 4 +- examples/solid/start-large/package.json | 4 +- .../package.json | 4 +- .../solid/start-supabase-basic/package.json | 4 +- examples/solid/start-tailwind-v4/package.json | 4 +- examples/solid/view-transitions/package.json | 4 +- .../solid/with-framer-motion/package.json | 2 +- examples/solid/with-trpc/package.json | 4 +- .../vue/basic-file-based-jsx/package.json | 4 +- .../vue/basic-file-based-sfc/package.json | 4 +- examples/vue/basic/package.json | 2 +- packages/react-router/CHANGELOG.md | 15 +++ packages/react-router/package.json | 2 +- packages/react-start-client/CHANGELOG.md | 9 ++ packages/react-start-client/package.json | 2 +- packages/react-start-rsc/CHANGELOG.md | 11 ++ packages/react-start-rsc/package.json | 2 +- packages/react-start-server/CHANGELOG.md | 9 ++ packages/react-start-server/package.json | 2 +- packages/react-start/CHANGELOG.md | 13 +++ packages/react-start/package.json | 2 +- packages/router-cli/CHANGELOG.md | 7 ++ packages/router-cli/package.json | 2 +- packages/router-core/CHANGELOG.md | 6 ++ packages/router-core/package.json | 2 +- packages/router-generator/CHANGELOG.md | 7 ++ packages/router-generator/package.json | 2 +- packages/router-plugin/CHANGELOG.md | 9 ++ packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/CHANGELOG.md | 7 ++ packages/router-vite-plugin/package.json | 2 +- packages/solid-router/CHANGELOG.md | 7 ++ packages/solid-router/package.json | 2 +- packages/solid-start-client/CHANGELOG.md | 9 ++ packages/solid-start-client/package.json | 2 +- packages/solid-start-server/CHANGELOG.md | 9 ++ packages/solid-start-server/package.json | 2 +- packages/solid-start/CHANGELOG.md | 12 +++ packages/solid-start/package.json | 2 +- packages/start-client-core/CHANGELOG.md | 8 ++ packages/start-client-core/package.json | 2 +- packages/start-plugin-core/CHANGELOG.md | 14 +++ packages/start-plugin-core/package.json | 2 +- packages/start-server-core/CHANGELOG.md | 11 ++ packages/start-server-core/package.json | 2 +- .../CHANGELOG.md | 9 ++ .../package.json | 2 +- packages/start-storage-context/CHANGELOG.md | 7 ++ packages/start-storage-context/package.json | 2 +- packages/vue-router/CHANGELOG.md | 9 ++ packages/vue-router/package.json | 2 +- packages/vue-start-client/CHANGELOG.md | 9 ++ packages/vue-start-client/package.json | 2 +- packages/vue-start-server/CHANGELOG.md | 9 ++ packages/vue-start-server/package.json | 2 +- packages/vue-start/CHANGELOG.md | 12 +++ packages/vue-start/package.json | 2 +- pnpm-lock.yaml | 102 +++++++++--------- 172 files changed, 506 insertions(+), 325 deletions(-) delete mode 100644 .changeset/calm-boundaries-flow.md delete mode 100644 .changeset/eighty-shoes-flow.md delete mode 100644 .changeset/fresh-store-dependencies.md delete mode 100644 .changeset/new-socks-judge.md delete mode 100644 .changeset/quiet-apes-protect.md delete mode 100644 .changeset/quiet-match-provider-experiment.md delete mode 100644 .changeset/rude-socks-learn.md diff --git a/.changeset/calm-boundaries-flow.md b/.changeset/calm-boundaries-flow.md deleted file mode 100644 index 1dbf552774..0000000000 --- a/.changeset/calm-boundaries-flow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/react-router': patch ---- - -Compose only enabled route boundaries instead of rendering inactive wrapper components. diff --git a/.changeset/eighty-shoes-flow.md b/.changeset/eighty-shoes-flow.md deleted file mode 100644 index 3fc449c154..0000000000 --- a/.changeset/eighty-shoes-flow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/start-plugin-core': patch ---- - -fix: use http scheme for sitemap xmlns per sitemaps.org spec diff --git a/.changeset/fresh-store-dependencies.md b/.changeset/fresh-store-dependencies.md deleted file mode 100644 index 04b328ffac..0000000000 --- a/.changeset/fresh-store-dependencies.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/react-router': patch -'@tanstack/vue-router': patch ---- - -Update TanStack Store to 0.11.2 to prevent unrelated atom reads inside subscription observers from triggering extra notifications. diff --git a/.changeset/new-socks-judge.md b/.changeset/new-socks-judge.md deleted file mode 100644 index db8d21cdad..0000000000 --- a/.changeset/new-socks-judge.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/start-plugin-core': patch ---- - -Defer sitemap and XML dependencies until sitemap generation is enabled to reduce Start plugin startup work. diff --git a/.changeset/quiet-apes-protect.md b/.changeset/quiet-apes-protect.md deleted file mode 100644 index 9b5f721653..0000000000 --- a/.changeset/quiet-apes-protect.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/router-core': patch -'@tanstack/start-server-core': patch ---- - -Align server function request and response handling. diff --git a/.changeset/quiet-match-provider-experiment.md b/.changeset/quiet-match-provider-experiment.md deleted file mode 100644 index 81f1cc9f40..0000000000 --- a/.changeset/quiet-match-provider-experiment.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/react-router': patch ---- - -Consolidate the root match context provider while preserving match context in the root shell. diff --git a/.changeset/rude-socks-learn.md b/.changeset/rude-socks-learn.md deleted file mode 100644 index af9bf99e7b..0000000000 --- a/.changeset/rude-socks-learn.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/react-router': patch ---- - -Reuse Link href classification and active/inactive results across location updates while preserving live history href formatting. diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 09b7ea7ed2..d004ca1ef8 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "firebase": "^11.4.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 1f66c97c21..7a0cc86f74 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 0ea069260d..f0bb6a799e 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index ff86384aac..78adb70017 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.67.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 40710c347f..45a3b81f56 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 2910358d80..87f10c282f 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 1b1da5c22f..7fa657f708 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 7d7ede1a55..92fbe68771 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.json index 621311c997..6298367f2e 100644 --- a/examples/react/basic-ssr-file-based/package.json +++ b/examples/react/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.41", + "@tanstack/router-plugin": "^1.168.42", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/react/basic-ssr-streaming-file-based/package.json b/examples/react/basic-ssr-streaming-file-based/package.json index 43aa8c8f7c..7fe0401001 100644 --- a/examples/react/basic-ssr-streaming-file-based/package.json +++ b/examples/react/basic-ssr-streaming-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.41", + "@tanstack/router-plugin": "^1.168.42", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index e75bb75988..722e1e5435 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index f0c6db9217..f7e7840df1 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 5ce1c929cb..be0d99ea7f 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 6ed9b61c60..c5c60c9db3 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/i18n-paraglide/package.json b/examples/react/i18n-paraglide/package.json index 25e1258efc..f9c5517f5f 100644 --- a/examples/react/i18n-paraglide/package.json +++ b/examples/react/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 585b12c54e..85ffa317d5 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index b81bf11139..36cad3b0ae 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index d1e9db300d..6d9224d95a 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 0a4e3f60e8..8e10ec0ae1 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index b15bb13b8b..78a52e2aa5 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -13,9 +13,9 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index c165069dac..1971a8587a 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -12,7 +12,7 @@ "@radix-ui/react-dialog": "^1.1.6", "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 0dd8a4f73d..6366890725 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 2cbb377a85..bc71ef0f9d 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 6ca5236b7d..9f332b3ad0 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index b4110e08bf..43eb7e0452 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "postcss": "^8.5.1", "react": "^19.0.0", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index ddba5fc358..11bce91420 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.15.33", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 73d131378f..628f7c37fe 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index de5ac60fe8..394fa70001 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index a58b096975..77e00b2305 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -11,8 +11,8 @@ "@router-mono-react-query/post-query": "workspace:*", "@tanstack/history": "^1.162.4", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 10dc01c314..a0b2d9cc20 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index ba511891a9..51f91b1bdb 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.40", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index fc68e1ee9e..4d506c30ed 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index f6c543e8da..b4a607f882 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.40", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-router": "^1.170.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 325cd7d0d7..1757b8e59a 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-virtual": "^3.13.0", "react": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 67c8a90523..c70fefb31e 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 8bf0b58659..6db668ac66 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "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 70f7d7fcdc..7e7ced3576 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index 798ca34f45..76abc1f98f 100644 --- a/examples/react/start-basic-authjs/package.json +++ b/examples/react/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "react": "^19.0.0", "react-dom": "^19.0.0", "start-authjs": "^1.0.0", diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index 815925fd3e..d3a5a81a5e 100644 --- a/examples/react/start-basic-cloudflare/package.json +++ b/examples/react/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index bf8a6d26e9..568aa7d943 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -13,10 +13,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json index 3065c2ba39..168c78a008 100644 --- a/examples/react/start-basic-rsbuild/package.json +++ b/examples/react/start-basic-rsbuild/package.json @@ -10,9 +10,9 @@ "start": "srvx --prod -s ../client dist/server/index.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "react": "^19.2.3", "react-dom": "^19.2.3", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 94b94775ba..fdfa825ed7 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", - "@tanstack/start-static-server-functions": "^1.167.38", + "@tanstack/react-start": "^1.168.60", + "@tanstack/start-static-server-functions": "^1.167.39", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 66d9f5987f..9da7be6f4e 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index 70c2a4af09..911b8ab47e 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.59", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/react-start": "^1.168.60", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index aff3e95b30..90991d624e 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "^0.27.14", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 29e3494cc4..3e28d116fa 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -15,10 +15,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 3508fb17f7..b650b73513 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "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 b78c8e6228..09b096be25 100644 --- a/examples/react/start-i18n-paraglide/package.json +++ b/examples/react/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "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 8f9e225cf4..d00d93cd83 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "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 2839c9061c..90c205f860 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,9 +15,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json index c365d555a9..6c10f9eb1b 100644 --- a/examples/react/start-next-migration/package.json +++ b/examples/react/start-next-migration/package.json @@ -12,8 +12,8 @@ "test:e2e": "playwright test" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-router": "^1.170.41", + "@tanstack/react-start": "^1.168.60", "iron-session": "^9.0.0", "next": "16.3.4", "react": "^19.2.3", diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index c00e7a55cd..3fe4b24db7 100644 --- a/examples/react/start-rscs/package.json +++ b/examples/react/start-rscs/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "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 06de97786e..5150636f76 100644 --- a/examples/react/start-streaming-data-from-server-functions/package.json +++ b/examples/react/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "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 057e37f534..a210f757eb 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 3828761570..d10a003749 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "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 d4a0e62951..3648fbebaa 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index b0f95f34be..f499975cf7 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.3.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.59", + "@tanstack/react-start": "^1.168.60", "@workos/authkit-tanstack-react-start": "^0.5.0", "react": "^19.0.0", "react-dom": "^19.0.0" diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 03715bd570..77d36aebb8 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 6b2a6584f3..4afbcb19c0 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", "framer-motion": "^11.18.2", "react": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 3f253c17ef..231cfa78ce 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "@trpc/tanstack-react-query": "^11.4.3", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 416d55c3fd..1802a9bc67 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.40", + "@tanstack/react-router": "^1.170.41", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "express": "^5.2.1", diff --git a/examples/solid/authenticated-routes-firebase/package.json b/examples/solid/authenticated-routes-firebase/package.json index e8bed7ffe5..6c2a3c8c6f 100644 --- a/examples/solid/authenticated-routes-firebase/package.json +++ b/examples/solid/authenticated-routes-firebase/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.42", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "firebase": "^11.4.0", "redaxios": "^0.5.1", diff --git a/examples/solid/authenticated-routes/package.json b/examples/solid/authenticated-routes/package.json index 1b0ac9a259..0cd8c0934b 100644 --- a/examples/solid/authenticated-routes/package.json +++ b/examples/solid/authenticated-routes/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.42", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-default-search-params/package.json b/examples/solid/basic-default-search-params/package.json index 7199987de4..9ea4a4e70f 100644 --- a/examples/solid/basic-default-search-params/package.json +++ b/examples/solid/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 9b4105e4b5..504b5c1a72 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index 022ee7cd9a..5d2d8aae0c 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -18,7 +18,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 62b48a8fa5..e83d0d4163 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 364b7b396b..187d822d88 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -13,7 +13,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -21,7 +21,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 92534998dd..9984bf0e16 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -12,14 +12,14 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-ssr-file-based/package.json b/examples/solid/basic-ssr-file-based/package.json index 8c59282b86..42b026beee 100644 --- a/examples/solid/basic-ssr-file-based/package.json +++ b/examples/solid/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.42", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json index 881ae633c1..bf5aa4efbe 100644 --- a/examples/solid/basic-ssr-streaming-file-based/package.json +++ b/examples/solid/basic-ssr-streaming-file-based/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "compression": "^1.8.0", "express": "^5.2.1", @@ -24,7 +24,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@types/express": "^5.0.6", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/solid/basic-virtual-file-based/package.json b/examples/solid/basic-virtual-file-based/package.json index abd6208dec..7ec4c48f5f 100644 --- a/examples/solid/basic-virtual-file-based/package.json +++ b/examples/solid/basic-virtual-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.42", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", diff --git a/examples/solid/basic-virtual-inside-file-based/package.json b/examples/solid/basic-virtual-inside-file-based/package.json index e4643a6d24..b8aadff060 100644 --- a/examples/solid/basic-virtual-inside-file-based/package.json +++ b/examples/solid/basic-virtual-inside-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.42", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index b1c7e55471..89be1c3c6d 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/deferred-data/package.json b/examples/solid/deferred-data/package.json index 0a41821b81..139c02172f 100644 --- a/examples/solid/deferred-data/package.json +++ b/examples/solid/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json index 51baa39b13..efd32a9ebd 100644 --- a/examples/solid/i18n-paraglide/package.json +++ b/examples/solid/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.42", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 1b3fb511b1..c0b6d196e1 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/kitchen-sink-solid-query-file-based/package.json b/examples/solid/kitchen-sink-solid-query-file-based/package.json index e3ba18f052..ae6308b47f 100644 --- a/examples/solid/kitchen-sink-solid-query-file-based/package.json +++ b/examples/solid/kitchen-sink-solid-query-file-based/package.json @@ -10,10 +10,10 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json index 0182cb34c2..d5d4925716 100644 --- a/examples/solid/kitchen-sink-solid-query/package.json +++ b/examples/solid/kitchen-sink-solid-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/kitchen-sink/package.json b/examples/solid/kitchen-sink/package.json index 100685148b..f5937ce601 100644 --- a/examples/solid/kitchen-sink/package.json +++ b/examples/solid/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/large-file-based/package.json b/examples/solid/large-file-based/package.json index a4da1300fe..11f47616b1 100644 --- a/examples/solid/large-file-based/package.json +++ b/examples/solid/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/location-masking/package.json b/examples/solid/location-masking/package.json index a5a8aaa55f..4695c1ef13 100644 --- a/examples/solid/location-masking/package.json +++ b/examples/solid/location-masking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/navigation-blocking/package.json b/examples/solid/navigation-blocking/package.json index 8e4c9ce263..37ce89e6a8 100644 --- a/examples/solid/navigation-blocking/package.json +++ b/examples/solid/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json index b2b846492d..1618a02dc1 100644 --- a/examples/solid/quickstart-esbuild-file-based/package.json +++ b/examples/solid/quickstart-esbuild-file-based/package.json @@ -9,8 +9,8 @@ "start": "dev" }, "dependencies": { - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.42", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index 6b655f1ee1..491f241f6c 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -18,7 +18,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/quickstart-rspack-file-based/package.json b/examples/solid/quickstart-rspack-file-based/package.json index e58f521ba3..da3ed69cca 100644 --- a/examples/solid/quickstart-rspack-file-based/package.json +++ b/examples/solid/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "postcss": "^8.5.1", "solid-js": "^1.9.10", @@ -19,7 +19,7 @@ "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2" } diff --git a/examples/solid/quickstart-webpack-file-based/package.json b/examples/solid/quickstart-webpack-file-based/package.json index bba936a622..9cf3451821 100644 --- a/examples/solid/quickstart-webpack-file-based/package.json +++ b/examples/solid/quickstart-webpack-file-based/package.json @@ -7,7 +7,7 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" @@ -15,7 +15,7 @@ "devDependencies": { "@babel/core": "^7.28.5", "@babel/preset-typescript": "^7.27.1", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "babel-loader": "^10.0.0", "babel-preset-solid": "^1.9.10", "css-loader": "^7.1.2", diff --git a/examples/solid/quickstart/package.json b/examples/solid/quickstart/package.json index c557555fd9..c5980947c5 100644 --- a/examples/solid/quickstart/package.json +++ b/examples/solid/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/router-monorepo-simple-lazy/package.json b/examples/solid/router-monorepo-simple-lazy/package.json index 52fff0114a..0049aad99d 100644 --- a/examples/solid/router-monorepo-simple-lazy/package.json +++ b/examples/solid/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json index 5f28049d68..906f2d666d 100644 --- a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.42", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json index 87a60b7782..90261498eb 100644 --- a/examples/solid/router-monorepo-simple/package.json +++ b/examples/solid/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple/packages/router/package.json b/examples/solid/router-monorepo-simple/packages/router/package.json index ea825b7076..5d4fcba6e4 100644 --- a/examples/solid/router-monorepo-simple/packages/router/package.json +++ b/examples/solid/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.4", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.42", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json index 60e781abd4..169e5af341 100644 --- a/examples/solid/router-monorepo-solid-query/package.json +++ b/examples/solid/router-monorepo-solid-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-solid-query/packages/router/package.json b/examples/solid/router-monorepo-solid-query/packages/router/package.json index 11e27b2f39..381898acfd 100644 --- a/examples/solid/router-monorepo-solid-query/packages/router/package.json +++ b/examples/solid/router-monorepo-solid-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.162.4", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.42", "@router-solid-mono-solid-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^4.4.3", diff --git a/examples/solid/scroll-restoration/package.json b/examples/solid/scroll-restoration/package.json index 66c90340e9..0c133651bd 100644 --- a/examples/solid/scroll-restoration/package.json +++ b/examples/solid/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-virtual": "^3.13.0", "solid-js": "^1.9.10", diff --git a/examples/solid/search-validator-adapters/package.json b/examples/solid/search-validator-adapters/package.json index 437f9b5a05..747e982935 100644 --- a/examples/solid/search-validator-adapters/package.json +++ b/examples/solid/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/router-plugin": "^1.168.42", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json index f1dc374ff1..78cb5db303 100644 --- a/examples/solid/start-basic-auth/package.json +++ b/examples/solid/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index af3c5ea0a9..fd03336a33 100644 --- a/examples/solid/start-basic-authjs/package.json +++ b/examples/solid/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "solid-js": "^1.9.10", "start-authjs": "^1.0.0", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json index d5c5709181..2651bb9e54 100644 --- a/examples/solid/start-basic-cloudflare/package.json +++ b/examples/solid/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json index ae129053d4..eccedc8782 100644 --- a/examples/solid/start-basic-netlify/package.json +++ b/examples/solid/start-basic-netlify/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json index d40d96e2cb..578b6edcca 100644 --- a/examples/solid/start-basic-nitro/package.json +++ b/examples/solid/start-basic-nitro/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json index ecd73d92c4..d4ed4ded06 100644 --- a/examples/solid/start-basic-solid-query/package.json +++ b/examples/solid/start-basic-solid-query/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 5b8a5571a2..25580202aa 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", - "@tanstack/start-static-server-functions": "^1.167.38", + "@tanstack/solid-start": "^1.168.57", + "@tanstack/start-static-server-functions": "^1.167.39", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 2cc32e2a01..be3eef525c 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index 00c9e74977..cf8300ceb0 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.56", - "@tanstack/router-plugin": "^1.168.41", + "@tanstack/solid-start": "^1.168.57", + "@tanstack/router-plugin": "^1.168.42", "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 8e3e77ecc7..939d2fd018 100644 --- a/examples/solid/start-convex-better-auth/package.json +++ b/examples/solid/start-convex-better-auth/package.json @@ -13,9 +13,9 @@ "dependencies": { "@convex-dev/better-auth": "^0.9.7", "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "better-auth": "^1.6.19", "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 202c2eab5a..bcb22e5d03 100644 --- a/examples/solid/start-counter/package.json +++ b/examples/solid/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "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 304f36d516..54c9e4e41c 100644 --- a/examples/solid/start-i18n-paraglide/package.json +++ b/examples/solid/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index 0e1ea333fb..cd940c026a 100644 --- a/examples/solid/start-large/package.json +++ b/examples/solid/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "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 dc20fa777c..47b8e00770 100644 --- a/examples/solid/start-streaming-data-from-server-functions/package.json +++ b/examples/solid/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "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 3a1b92f76c..1f1fec3d4a 100644 --- a/examples/solid/start-supabase-basic/package.json +++ b/examples/solid/start-supabase-basic/package.json @@ -14,9 +14,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "solid-js": "^1.9.9", "redaxios": "^0.5.1" }, diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json index 4578e7001c..5e68861a9d 100644 --- a/examples/solid/start-tailwind-v4/package.json +++ b/examples/solid/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.56", + "@tanstack/solid-start": "^1.168.57", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json index 54e1ab07ab..8c67d0ba78 100644 --- a/examples/solid/view-transitions/package.json +++ b/examples/solid/view-transitions/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.42", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json index b4b271c63f..f3fe96c08a 100644 --- a/examples/solid/with-framer-motion/package.json +++ b/examples/solid/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json index 8a52f09805..2cf06b137a 100644 --- a/examples/solid/with-trpc/package.json +++ b/examples/solid/with-trpc/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/solid-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.42", + "@tanstack/solid-router": "^1.170.38", "@tanstack/solid-router-devtools": "^1.167.2", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", diff --git a/examples/vue/basic-file-based-jsx/package.json b/examples/vue/basic-file-based-jsx/package.json index e9891e1f43..16788d6320 100644 --- a/examples/vue/basic-file-based-jsx/package.json +++ b/examples/vue/basic-file-based-jsx/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/vue-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.42", + "@tanstack/vue-router": "^1.170.37", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", diff --git a/examples/vue/basic-file-based-sfc/package.json b/examples/vue/basic-file-based-sfc/package.json index 5c698cced8..de28937097 100644 --- a/examples/vue/basic-file-based-sfc/package.json +++ b/examples/vue/basic-file-based-sfc/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.41", - "@tanstack/vue-router": "^1.170.36", + "@tanstack/router-plugin": "^1.168.42", + "@tanstack/vue-router": "^1.170.37", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", diff --git a/examples/vue/basic/package.json b/examples/vue/basic/package.json index b1695cffd6..9416d216b8 100644 --- a/examples/vue/basic/package.json +++ b/examples/vue/basic/package.json @@ -9,7 +9,7 @@ "start": "vite" }, "dependencies": { - "@tanstack/vue-router": "^1.170.36", + "@tanstack/vue-router": "^1.170.37", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "vue": "^3.5.13", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 0cbde261ce..f610095b28 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,20 @@ # @tanstack/react-router +## 1.170.41 + +### Patch Changes + +- [#8529](https://github.com/TanStack/router/pull/8529) [`60b8ad1`](https://github.com/TanStack/router/commit/60b8ad1ad00812bf966a8eeee6be238c37ddad74) - Compose only enabled route boundaries instead of rendering inactive wrapper components. + +- [#8568](https://github.com/TanStack/router/pull/8568) [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949) - Update TanStack Store to 0.11.2 to prevent unrelated atom reads inside subscription observers from triggering extra notifications. + +- [#8530](https://github.com/TanStack/router/pull/8530) [`ff66a03`](https://github.com/TanStack/router/commit/ff66a03df4816f44a48a4a37189fc4021b1c8480) - Consolidate the root match context provider while preserving match context in the root shell. + +- [#8522](https://github.com/TanStack/router/pull/8522) [`863c8a7`](https://github.com/TanStack/router/commit/863c8a736b96746c56278a16c50554356f5523d1) - Reuse Link href classification and active/inactive results across location updates while preserving live history href formatting. + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + ## 1.170.40 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 0755b40aa3..4b004dd879 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.170.40", + "version": "1.170.41", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/CHANGELOG.md b/packages/react-start-client/CHANGELOG.md index 05d493cad2..1629dec515 100644 --- a/packages/react-start-client/CHANGELOG.md +++ b/packages/react-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-start-client +## 1.168.39 + +### Patch Changes + +- Updated dependencies [[`60b8ad1`](https://github.com/TanStack/router/commit/60b8ad1ad00812bf966a8eeee6be238c37ddad74), [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb), [`ff66a03`](https://github.com/TanStack/router/commit/ff66a03df4816f44a48a4a37189fc4021b1c8480), [`863c8a7`](https://github.com/TanStack/router/commit/863c8a736b96746c56278a16c50554356f5523d1)]: + - @tanstack/react-router@1.170.41 + - @tanstack/router-core@1.171.34 + - @tanstack/start-client-core@1.170.34 + ## 1.168.38 ### Patch Changes diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 1ba7594f6d..0d41558a1f 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.168.38", + "version": "1.168.39", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index 0eac4439fd..f911c0307e 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,5 +1,16 @@ # @tanstack/react-start-rsc +## 0.1.59 + +### Patch Changes + +- Updated dependencies [[`60b8ad1`](https://github.com/TanStack/router/commit/60b8ad1ad00812bf966a8eeee6be238c37ddad74), [`41ebd28`](https://github.com/TanStack/router/commit/41ebd288677beacb8eb56953f5f8c26e9d33313e), [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`05223c2`](https://github.com/TanStack/router/commit/05223c2ada4d48af4b3881f10e3b6261898b2d40), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb), [`ff66a03`](https://github.com/TanStack/router/commit/ff66a03df4816f44a48a4a37189fc4021b1c8480), [`863c8a7`](https://github.com/TanStack/router/commit/863c8a736b96746c56278a16c50554356f5523d1)]: + - @tanstack/react-router@1.170.41 + - @tanstack/start-plugin-core@1.171.49 + - @tanstack/router-core@1.171.34 + - @tanstack/start-client-core@1.170.34 + - @tanstack/start-storage-context@1.167.36 + ## 0.1.58 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index 9cd7d0ee29..34c446b37f 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.58", + "version": "0.1.59", "description": "React Server Components support for TanStack Start", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/CHANGELOG.md b/packages/react-start-server/CHANGELOG.md index 370829a92b..758053adb5 100644 --- a/packages/react-start-server/CHANGELOG.md +++ b/packages/react-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-start-server +## 1.167.46 + +### Patch Changes + +- Updated dependencies [[`60b8ad1`](https://github.com/TanStack/router/commit/60b8ad1ad00812bf966a8eeee6be238c37ddad74), [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb), [`ff66a03`](https://github.com/TanStack/router/commit/ff66a03df4816f44a48a4a37189fc4021b1c8480), [`863c8a7`](https://github.com/TanStack/router/commit/863c8a736b96746c56278a16c50554356f5523d1)]: + - @tanstack/react-router@1.170.41 + - @tanstack/router-core@1.171.34 + - @tanstack/start-server-core@1.169.39 + ## 1.167.45 ### Patch Changes diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index c0d6cd06bc..76b1aa7eb3 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.167.45", + "version": "1.167.46", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/CHANGELOG.md b/packages/react-start/CHANGELOG.md index 72f34da2cd..5fcfc22f08 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,5 +1,18 @@ # @tanstack/react-start +## 1.168.60 + +### Patch Changes + +- Updated dependencies [[`60b8ad1`](https://github.com/TanStack/router/commit/60b8ad1ad00812bf966a8eeee6be238c37ddad74), [`41ebd28`](https://github.com/TanStack/router/commit/41ebd288677beacb8eb56953f5f8c26e9d33313e), [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`05223c2`](https://github.com/TanStack/router/commit/05223c2ada4d48af4b3881f10e3b6261898b2d40), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb), [`ff66a03`](https://github.com/TanStack/router/commit/ff66a03df4816f44a48a4a37189fc4021b1c8480), [`863c8a7`](https://github.com/TanStack/router/commit/863c8a736b96746c56278a16c50554356f5523d1)]: + - @tanstack/react-router@1.170.41 + - @tanstack/start-plugin-core@1.171.49 + - @tanstack/start-server-core@1.169.39 + - @tanstack/react-start-client@1.168.39 + - @tanstack/react-start-rsc@0.1.59 + - @tanstack/react-start-server@1.167.46 + - @tanstack/start-client-core@1.170.34 + ## 1.168.59 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 9eb7ad03d7..7edacd9d72 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.168.59", + "version": "1.168.60", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/CHANGELOG.md b/packages/router-cli/CHANGELOG.md index 0a24b5eee7..deba113f88 100644 --- a/packages/router-cli/CHANGELOG.md +++ b/packages/router-cli/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-cli +## 1.167.40 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-generator@1.167.40 + ## 1.167.39 ### Patch Changes diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 6b933f813c..63e1f1a52a 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.167.39", + "version": "1.167.40", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/CHANGELOG.md b/packages/router-core/CHANGELOG.md index 48adb2a91a..146d5ceb44 100644 --- a/packages/router-core/CHANGELOG.md +++ b/packages/router-core/CHANGELOG.md @@ -1,5 +1,11 @@ # @tanstack/router-core +## 1.171.34 + +### Patch Changes + +- [#8573](https://github.com/TanStack/router/pull/8573) [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb) - Align server function request and response handling. + ## 1.171.33 ### Patch Changes diff --git a/packages/router-core/package.json b/packages/router-core/package.json index 12cf13b6c6..b4e6fd6e75 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.171.33", + "version": "1.171.34", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/CHANGELOG.md b/packages/router-generator/CHANGELOG.md index 418275e2db..b686f27dc6 100644 --- a/packages/router-generator/CHANGELOG.md +++ b/packages/router-generator/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-generator +## 1.167.40 + +### Patch Changes + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + ## 1.167.39 ### Patch Changes diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index b27ea01b5b..351589e5e9 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.167.39", + "version": "1.167.40", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/CHANGELOG.md b/packages/router-plugin/CHANGELOG.md index 57357f9746..00ec297c09 100644 --- a/packages/router-plugin/CHANGELOG.md +++ b/packages/router-plugin/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/router-plugin +## 1.168.42 + +### Patch Changes + +- Updated dependencies [[`60b8ad1`](https://github.com/TanStack/router/commit/60b8ad1ad00812bf966a8eeee6be238c37ddad74), [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb), [`ff66a03`](https://github.com/TanStack/router/commit/ff66a03df4816f44a48a4a37189fc4021b1c8480), [`863c8a7`](https://github.com/TanStack/router/commit/863c8a736b96746c56278a16c50554356f5523d1)]: + - @tanstack/react-router@1.170.41 + - @tanstack/router-core@1.171.34 + - @tanstack/router-generator@1.167.40 + ## 1.168.41 ### Patch Changes diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index affae0bab4..7a36e2c7f4 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.168.41", + "version": "1.168.42", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/CHANGELOG.md b/packages/router-vite-plugin/CHANGELOG.md index be7211da3a..3344a1135f 100644 --- a/packages/router-vite-plugin/CHANGELOG.md +++ b/packages/router-vite-plugin/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-vite-plugin +## 1.167.42 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-plugin@1.168.42 + ## 1.167.41 ### Patch Changes diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index cfcfd02130..b98a0cdc32 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.167.41", + "version": "1.167.42", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/CHANGELOG.md b/packages/solid-router/CHANGELOG.md index 5b094ae86b..239f34bc88 100644 --- a/packages/solid-router/CHANGELOG.md +++ b/packages/solid-router/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/solid-router +## 1.170.38 + +### Patch Changes + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + ## 1.170.37 ### Patch Changes diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 6e0c833e16..d8ffcd2f31 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.170.37", + "version": "1.170.38", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/CHANGELOG.md b/packages/solid-start-client/CHANGELOG.md index 4ac8dde2fa..608534af4a 100644 --- a/packages/solid-start-client/CHANGELOG.md +++ b/packages/solid-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start-client +## 1.168.37 + +### Patch Changes + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + - @tanstack/solid-router@1.170.38 + - @tanstack/start-client-core@1.170.34 + ## 1.168.36 ### Patch Changes diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index ae7c9c0fe8..5cde7dc982 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.168.36", + "version": "1.168.37", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/CHANGELOG.md b/packages/solid-start-server/CHANGELOG.md index bec2966ba2..334ebf7c15 100644 --- a/packages/solid-start-server/CHANGELOG.md +++ b/packages/solid-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start-server +## 1.167.44 + +### Patch Changes + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + - @tanstack/start-server-core@1.169.39 + - @tanstack/solid-router@1.170.38 + ## 1.167.43 ### Patch Changes diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 07df57429e..04cff794d7 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.167.43", + "version": "1.167.44", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/CHANGELOG.md b/packages/solid-start/CHANGELOG.md index e56a4e7ef9..da089aa385 100644 --- a/packages/solid-start/CHANGELOG.md +++ b/packages/solid-start/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/solid-start +## 1.168.57 + +### Patch Changes + +- Updated dependencies [[`41ebd28`](https://github.com/TanStack/router/commit/41ebd288677beacb8eb56953f5f8c26e9d33313e), [`05223c2`](https://github.com/TanStack/router/commit/05223c2ada4d48af4b3881f10e3b6261898b2d40), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/start-plugin-core@1.171.49 + - @tanstack/start-server-core@1.169.39 + - @tanstack/solid-router@1.170.38 + - @tanstack/solid-start-client@1.168.37 + - @tanstack/solid-start-server@1.167.44 + - @tanstack/start-client-core@1.170.34 + ## 1.168.56 ### Patch Changes diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 91f7b707bd..ecda690bc3 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.168.56", + "version": "1.168.57", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/CHANGELOG.md b/packages/start-client-core/CHANGELOG.md index 22b2a1c6d1..d97716d8ee 100644 --- a/packages/start-client-core/CHANGELOG.md +++ b/packages/start-client-core/CHANGELOG.md @@ -1,5 +1,13 @@ # @tanstack/start-client-core +## 1.170.34 + +### Patch Changes + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + - @tanstack/start-storage-context@1.167.36 + ## 1.170.33 ### Patch Changes diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 55a3f56edb..9e911146a8 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.170.33", + "version": "1.170.34", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/CHANGELOG.md b/packages/start-plugin-core/CHANGELOG.md index bde1d3f9c8..58d85a47c3 100644 --- a/packages/start-plugin-core/CHANGELOG.md +++ b/packages/start-plugin-core/CHANGELOG.md @@ -1,5 +1,19 @@ # @tanstack/start-plugin-core +## 1.171.49 + +### Patch Changes + +- [#8127](https://github.com/TanStack/router/pull/8127) [`41ebd28`](https://github.com/TanStack/router/commit/41ebd288677beacb8eb56953f5f8c26e9d33313e) - fix: use http scheme for sitemap xmlns per sitemaps.org spec + +- [#8533](https://github.com/TanStack/router/pull/8533) [`05223c2`](https://github.com/TanStack/router/commit/05223c2ada4d48af4b3881f10e3b6261898b2d40) - Defer sitemap and XML dependencies until sitemap generation is enabled to reduce Start plugin startup work. + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + - @tanstack/start-server-core@1.169.39 + - @tanstack/router-generator@1.167.40 + - @tanstack/router-plugin@1.168.42 + ## 1.171.48 ### Patch Changes diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index b837c5edcc..46336e366b 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.48", + "version": "1.171.49", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/CHANGELOG.md b/packages/start-server-core/CHANGELOG.md index 87db4bb072..81b9ea6dfb 100644 --- a/packages/start-server-core/CHANGELOG.md +++ b/packages/start-server-core/CHANGELOG.md @@ -1,5 +1,16 @@ # @tanstack/start-server-core +## 1.169.39 + +### Patch Changes + +- [#8573](https://github.com/TanStack/router/pull/8573) [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb) - Align server function request and response handling. + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + - @tanstack/start-client-core@1.170.34 + - @tanstack/start-storage-context@1.167.36 + ## 1.169.38 ### Patch Changes diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 4587a6d3ec..dd4b15506e 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.169.38", + "version": "1.169.39", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-static-server-functions/CHANGELOG.md b/packages/start-static-server-functions/CHANGELOG.md index 5cf90eee96..b212575d5e 100644 --- a/packages/start-static-server-functions/CHANGELOG.md +++ b/packages/start-static-server-functions/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/start-static-server-functions +## 1.167.39 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/react-start@1.168.60 + - @tanstack/solid-start@1.168.57 + - @tanstack/start-client-core@1.170.34 + ## 1.167.38 ### Patch Changes diff --git a/packages/start-static-server-functions/package.json b/packages/start-static-server-functions/package.json index 3bda76b2ad..f18c4a6588 100644 --- a/packages/start-static-server-functions/package.json +++ b/packages/start-static-server-functions/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-static-server-functions", - "version": "1.167.38", + "version": "1.167.39", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-storage-context/CHANGELOG.md b/packages/start-storage-context/CHANGELOG.md index b18837c3a3..6a6d0e4002 100644 --- a/packages/start-storage-context/CHANGELOG.md +++ b/packages/start-storage-context/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/start-storage-context +## 1.167.36 + +### Patch Changes + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + ## 1.167.35 ### Patch Changes diff --git a/packages/start-storage-context/package.json b/packages/start-storage-context/package.json index 47d65c1e00..2e8033123f 100644 --- a/packages/start-storage-context/package.json +++ b/packages/start-storage-context/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-storage-context", - "version": "1.167.35", + "version": "1.167.36", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-router/CHANGELOG.md b/packages/vue-router/CHANGELOG.md index 1224692281..4d27c2d8ad 100644 --- a/packages/vue-router/CHANGELOG.md +++ b/packages/vue-router/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-router +## 1.170.37 + +### Patch Changes + +- [#8568](https://github.com/TanStack/router/pull/8568) [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949) - Update TanStack Store to 0.11.2 to prevent unrelated atom reads inside subscription observers from triggering extra notifications. + +- Updated dependencies [[`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/router-core@1.171.34 + ## 1.170.36 ### Patch Changes diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index 97952fa240..e02f7aa4af 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-router", - "version": "1.170.36", + "version": "1.170.37", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-client/CHANGELOG.md b/packages/vue-start-client/CHANGELOG.md index eaf98f2385..8e4ff25b0c 100644 --- a/packages/vue-start-client/CHANGELOG.md +++ b/packages/vue-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-start-client +## 1.167.40 + +### Patch Changes + +- Updated dependencies [[`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/vue-router@1.170.37 + - @tanstack/router-core@1.171.34 + - @tanstack/start-client-core@1.170.34 + ## 1.167.39 ### Patch Changes diff --git a/packages/vue-start-client/package.json b/packages/vue-start-client/package.json index 7f5a621dfb..58b878b841 100644 --- a/packages/vue-start-client/package.json +++ b/packages/vue-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-client", - "version": "1.167.39", + "version": "1.167.40", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-server/CHANGELOG.md b/packages/vue-start-server/CHANGELOG.md index d5a4218807..209d848178 100644 --- a/packages/vue-start-server/CHANGELOG.md +++ b/packages/vue-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-start-server +## 1.167.44 + +### Patch Changes + +- Updated dependencies [[`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/vue-router@1.170.37 + - @tanstack/router-core@1.171.34 + - @tanstack/start-server-core@1.169.39 + ## 1.167.43 ### Patch Changes diff --git a/packages/vue-start-server/package.json b/packages/vue-start-server/package.json index a0dd73bfc4..de1d4abbbd 100644 --- a/packages/vue-start-server/package.json +++ b/packages/vue-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-server", - "version": "1.167.43", + "version": "1.167.44", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start/CHANGELOG.md b/packages/vue-start/CHANGELOG.md index 60b7289a42..7d3317a376 100644 --- a/packages/vue-start/CHANGELOG.md +++ b/packages/vue-start/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/vue-start +## 1.168.56 + +### Patch Changes + +- Updated dependencies [[`41ebd28`](https://github.com/TanStack/router/commit/41ebd288677beacb8eb56953f5f8c26e9d33313e), [`614bc27`](https://github.com/TanStack/router/commit/614bc27034c8ec98747bf305ed41d4a619640949), [`05223c2`](https://github.com/TanStack/router/commit/05223c2ada4d48af4b3881f10e3b6261898b2d40), [`d521abd`](https://github.com/TanStack/router/commit/d521abd71c69f1ff010bb3def4d417cb5fa058cb)]: + - @tanstack/start-plugin-core@1.171.49 + - @tanstack/vue-router@1.170.37 + - @tanstack/start-server-core@1.169.39 + - @tanstack/vue-start-client@1.167.40 + - @tanstack/vue-start-server@1.167.44 + - @tanstack/start-client-core@1.170.34 + ## 1.168.55 ### Patch Changes diff --git a/packages/vue-start/package.json b/packages/vue-start/package.json index 8b46cc8448..6e3c35d44f 100644 --- a/packages/vue-start/package.json +++ b/packages/vue-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start", - "version": "1.168.55", + "version": "1.168.56", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4f52909cae..102917b107 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11290,7 +11290,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11330,7 +11330,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11373,7 +11373,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11416,7 +11416,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11453,7 +11453,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11487,7 +11487,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11527,7 +11527,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11573,7 +11573,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11616,7 +11616,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11656,7 +11656,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router compression: specifier: ^1.8.0 @@ -11699,7 +11699,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11757,7 +11757,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11800,7 +11800,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11840,7 +11840,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11880,7 +11880,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router solid-js: specifier: 1.9.12 @@ -11914,7 +11914,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11954,7 +11954,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12003,7 +12003,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12052,7 +12052,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12098,7 +12098,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12138,7 +12138,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12175,7 +12175,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12209,7 +12209,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12240,7 +12240,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12271,7 +12271,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12311,7 +12311,7 @@ importers: specifier: ^4.2.2 version: 4.2.2 '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12348,7 +12348,7 @@ importers: examples/solid/quickstart-webpack-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12412,7 +12412,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12449,7 +12449,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12492,7 +12492,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12529,7 +12529,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12572,7 +12572,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12627,7 +12627,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12682,7 +12682,7 @@ importers: specifier: ^7.0.0 version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12734,7 +12734,7 @@ importers: specifier: ^0.41.1 version: 0.41.1 '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12777,7 +12777,7 @@ importers: examples/solid/start-basic-cloudflare: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12820,7 +12820,7 @@ importers: examples/solid/start-basic-netlify: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12860,7 +12860,7 @@ importers: examples/solid/start-basic-nitro: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12906,7 +12906,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12952,7 +12952,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13007,7 +13007,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13074,7 +13074,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13132,7 +13132,7 @@ importers: examples/solid/start-counter: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13178,7 +13178,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13221,7 +13221,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13267,7 +13267,7 @@ importers: examples/solid/start-streaming-data-from-server-functions: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13307,7 +13307,7 @@ importers: specifier: ^2.48.1 version: 2.48.1 '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13347,7 +13347,7 @@ importers: examples/solid/start-tailwind-v4: dependencies: '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13396,7 +13396,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13433,7 +13433,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@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.9.0)) '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13476,7 +13476,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.37 + specifier: ^1.170.38 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From d35aab425b07b46e222a507c0f0239644669757b Mon Sep 17 00:00:00 2001 From: Flo Date: Thu, 1 Oct 2026 13:52:43 +0200 Subject: [PATCH 078/175] fix(router): cancel pending link preload before navigation (#8579) --- .changeset/quick-links-cancel.md | 7 +++++++ packages/react-router/src/link.tsx | 1 + packages/solid-router/src/link.tsx | 1 + packages/vue-router/src/link.tsx | 1 + 4 files changed, 10 insertions(+) create mode 100644 .changeset/quick-links-cancel.md diff --git a/.changeset/quick-links-cancel.md b/.changeset/quick-links-cancel.md new file mode 100644 index 0000000000..0c0dab233a --- /dev/null +++ b/.changeset/quick-links-cancel.md @@ -0,0 +1,7 @@ +--- +'@tanstack/react-router': patch +'@tanstack/solid-router': patch +'@tanstack/vue-router': patch +--- + +Cancel pending link preload timers when starting navigation to avoid redundant preloading while the destination is loading. diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 7861827719..b99ad65662 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -446,6 +446,7 @@ export function useLinkProps< e.button === 0 ) { e.preventDefault() + cancelPreload(innerRef) // All is well? Navigate! // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing diff --git a/packages/solid-router/src/link.tsx b/packages/solid-router/src/link.tsx index a26483706c..94f453bb2c 100644 --- a/packages/solid-router/src/link.tsx +++ b/packages/solid-router/src/link.tsx @@ -409,6 +409,7 @@ export function useLinkProps< e.button === 0 ) { e.preventDefault() + cancelPreload(ref) // All is well? Navigate! // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing diff --git a/packages/vue-router/src/link.tsx b/packages/vue-router/src/link.tsx index cb964c7381..2c1ae102e9 100644 --- a/packages/vue-router/src/link.tsx +++ b/packages/vue-router/src/link.tsx @@ -345,6 +345,7 @@ function useLinkPropsImpl( } e.preventDefault() + enqueuePreload() // All is well? Navigate! router.navigate({ From 1f0f20a3206a28365d74fd2485b9a8eedbf74dd0 Mon Sep 17 00:00:00 2001 From: Sarah Gerrard Date: Thu, 1 Oct 2026 11:50:06 -0700 Subject: [PATCH 079/175] chore(react-start-rsc): upgrade Rspack to 2.2.7 (#8542) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- packages/react-start-rsc/package.json | 2 +- pnpm-lock.yaml | 398 +++++++++----------------- 2 files changed, 136 insertions(+), 264 deletions(-) diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index 34c446b37f..0be518d39e 100644 --- a/packages/react-start-rsc/package.json +++ b/packages/react-start-rsc/package.json @@ -107,7 +107,7 @@ "pathe": "catalog:" }, "devDependencies": { - "@rspack/core": "2.0.0", + "@rspack/core": "2.2.7", "@testing-library/react": "catalog:", "@vitejs/plugin-react": "catalog:", "@vitejs/plugin-rsc": "^0.5.30", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 102917b107..3a44f02d76 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -150,13 +150,13 @@ importers: version: 2.30.0(@types/node@25.0.9) '@nx/devkit': specifier: 23.2.0 - version: 23.2.0(nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23))) + version: 23.2.0(nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23))) '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@swc-node/register': specifier: ^1.11.1 - version: 1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0) + version: 1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0) '@tanstack/eslint-config': specifier: 0.4.0 version: 0.4.0(@typescript-eslint/utils@8.57.1(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0))(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) @@ -177,7 +177,7 @@ importers: version: 4.0.3 nx: specifier: 23.2.0 - version: 23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)) + version: 23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)) prettier: specifier: ^3.8.0 version: 3.8.1 @@ -247,7 +247,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../packages/router-plugin @@ -1477,7 +1477,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -1532,7 +1532,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -1761,7 +1761,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -2188,7 +2188,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2368,7 +2368,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -2426,7 +2426,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2631,7 +2631,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -2747,7 +2747,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2992,7 +2992,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3038,7 +3038,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tanstack/eslint-plugin-start': specifier: workspace:^ version: link:../../../packages/eslint-plugin-start @@ -3206,7 +3206,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3447,7 +3447,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -3828,7 +3828,7 @@ importers: version: link:../../../packages/start-static-server-functions nitro: specifier: ^3.0.1-alpha.2 - version: 3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0)) + version: 3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0)) react: specifier: ^19.2.3 version: 19.2.3 @@ -6536,7 +6536,7 @@ importers: version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) '@rsbuild/plugin-vue': specifier: ^1.2.7 - version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) '@rsbuild/plugin-vue-jsx': specifier: ^2.0.0 version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(supports-color@10.2.2) @@ -6594,7 +6594,7 @@ importers: version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) '@rsbuild/plugin-vue': specifier: ^1.2.7 - version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) '@rsbuild/plugin-vue-jsx': specifier: ^2.0.0 version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(supports-color@10.2.2) @@ -6820,7 +6820,7 @@ importers: version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) '@rsbuild/plugin-vue': specifier: ^1.2.7 - version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) '@rsbuild/plugin-vue-jsx': specifier: ^2.0.0 version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(supports-color@10.2.2) @@ -9062,7 +9062,7 @@ importers: version: 2.1.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -10180,10 +10180,10 @@ importers: version: 2.0.14 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.0.14)(@rspack/core@2.2.3(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.0.14)(@rspack/core@2.2.7(@swc/helpers@0.5.23)) '@rsbuild/plugin-tailwindcss': specifier: ^2.0.3 - version: 2.0.3(@rsbuild/core@2.0.14)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(webpack@5.110.3) + version: 2.0.3(@rsbuild/core@2.0.14)(@rspack/core@2.2.7(@swc/helpers@0.5.23))(webpack@5.110.3) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13801,7 +13801,7 @@ importers: dependencies: nitropack: specifier: ^2.13.4 - version: 2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@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.9.0))(webpack@5.110.3) + version: 2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.2.7(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@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.9.0))(webpack@5.110.3) pathe: specifier: 'catalog:' version: 2.0.3 @@ -14188,8 +14188,8 @@ importers: specifier: 'catalog:' version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@rspack/core': - specifier: 2.0.0 - version: 2.0.0(@swc/helpers@0.5.23) + specifier: 2.2.7 + version: 2.2.7(@swc/helpers@0.5.23) '@tanstack/vite-config': specifier: 'catalog:' version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) @@ -14225,7 +14225,7 @@ importers: version: 19.2.3(react@19.2.3) react-server-dom-rspack: specifier: ^0.0.2 - version: 0.0.2(@rspack/core@2.0.0(@swc/helpers@0.5.23))(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + version: 0.0.2(@rspack/core@2.2.7(@swc/helpers@0.5.23))(react-dom@19.2.3(react@19.2.3))(react@19.2.3) rimraf: specifier: 'catalog:' version: 6.1.2 @@ -14561,7 +14561,7 @@ importers: version: 5.0.0 unplugin: specifier: ^3.3.0 - version: 3.3.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) + version: 3.3.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) vite: 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.9.0) @@ -21015,11 +21015,6 @@ packages: '@rsbuild/core': optional: true - '@rspack/binding-darwin-arm64@2.0.0': - resolution: {integrity: sha512-ICBHDKYyndFqljLhjxvKfWWZu39RJSH2jkSmbceXl0kmptLSE0cLWpvk+eGSzLqtxKN0jVchwCw+5P5mWCzwAw==} - cpu: [arm64] - os: [darwin] - '@rspack/binding-darwin-arm64@2.0.8': resolution: {integrity: sha512-vCgbgH7B7qom+uID+RCZsTCOYFb9wC4/4+1U6rMfytrXGVJ72eNQs2tbdjOl0lb18CT3N/n+VkWynUiLk84GwA==} cpu: [arm64] @@ -21030,16 +21025,11 @@ packages: cpu: [arm64] os: [darwin] - '@rspack/binding-darwin-arm64@2.2.3': - resolution: {integrity: sha512-MGLx4lMTY6XEtJi55S+fk83+683GeUDuoqzjixbq6ehHdr/l6nGiHhgvMtV5DYt9sCytUDzyrCkcJ0AWqJxnTA==} + '@rspack/binding-darwin-arm64@2.2.7': + resolution: {integrity: sha512-m0ijteZwZfUZeFcbyxwTe6N+I7aceV5/iW39b7fIIoMN/mSv9zL0ieeRzwuFe7mTYGwCuwNieDZHXfMFdp2Q2w==} cpu: [arm64] os: [darwin] - '@rspack/binding-darwin-x64@2.0.0': - resolution: {integrity: sha512-YQ96LMmzIzhZt9cZWUDWXSxS9UWWHWoLxJyZ5f42DSaVPVelBg5ThbVORDwOP5QDA2xFXj60rVnmmcZLzg/aDA==} - cpu: [x64] - os: [darwin] - '@rspack/binding-darwin-x64@2.0.8': resolution: {integrity: sha512-satPm2PD4B7jDTVlVAdvMVdUszwLvWUEnUDzLb77mvVkezKNDZmuhb+e8s+FfKs8hJpNbZ9VAejuA2rr8o985w==} cpu: [x64] @@ -21050,17 +21040,11 @@ packages: cpu: [x64] os: [darwin] - '@rspack/binding-darwin-x64@2.2.3': - resolution: {integrity: sha512-5B/c1YTYEz9m7TyqtGQgTmXMr9PoPewyqsyHB4N0AB7nxDhtgmki0GniP2Lqtx3LJzOvQMjwet+I2lmWxvxwCg==} + '@rspack/binding-darwin-x64@2.2.7': + resolution: {integrity: sha512-f27/OubIeCe5Hzze1bm+k/CQ2XX9hk3E/FuK4lym1bjqZ9spWSuolC3sK/yU/Pc3kwMPuf53byUm3FM+QC/blw==} cpu: [x64] os: [darwin] - '@rspack/binding-linux-arm64-gnu@2.0.0': - resolution: {integrity: sha512-Ufn33gzkIV7JY69k6vJQEdOzRvBqThIgH46pwXksHSMwRZp8IbJhXfyYIAVsRWCk8fXpr9t1nAvCDvJXT2EeyA==} - cpu: [arm64] - os: [linux] - libc: [glibc] - '@rspack/binding-linux-arm64-gnu@2.0.8': resolution: {integrity: sha512-pSI+npPQE/uDtiboqvcOIRJbEV2+B+H1xffmko/gw50la92oTUW60kVULFwsb6L0+GVCzIcwX3yq60GtYIn+Ug==} cpu: [arm64] @@ -21073,18 +21057,12 @@ packages: os: [linux] libc: [glibc] - '@rspack/binding-linux-arm64-gnu@2.2.3': - resolution: {integrity: sha512-sU+jPGD2xz3BxFvsdBQVGce538YHqrSKMB4ZSfKhj6RSKjeGzpJ1BVl8+IndiQsfTgaUxi7N+r5cs/ezGy1TVQ==} + '@rspack/binding-linux-arm64-gnu@2.2.7': + resolution: {integrity: sha512-uGEX6kY/Pi3wPZgaEk6vTevZOHjKw8qmd5pqWVwRmpLhwvPB7LGqVqx5BMnNYBjsndVUWJQQRlGL8DoVG5IXXQ==} cpu: [arm64] os: [linux] libc: [glibc] - '@rspack/binding-linux-arm64-musl@2.0.0': - resolution: {integrity: sha512-CZbvFKlNY9UC0C+Czz6i8JFCzGpuL9oX8gEqcJA1+84Y6eEEBH50UiTzeCewxKW3dOofkZdvT5vgNMXz6aMUmg==} - cpu: [arm64] - os: [linux] - libc: [musl] - '@rspack/binding-linux-arm64-musl@2.0.8': resolution: {integrity: sha512-igjJ43yxWQ72GZqjDDZSSHax9/Vg+6rLMmOvFglTJUkQpB4Tyvu/YjW+WRjYj2xRw6blOjLxUSJWASvuSqqlvg==} cpu: [arm64] @@ -21097,14 +21075,14 @@ packages: os: [linux] libc: [musl] - '@rspack/binding-linux-arm64-musl@2.2.3': - resolution: {integrity: sha512-EQuADbqWbVgNAh5ep/u/B7Z/8UUkZjMLzHAOKZJklBpe4Y8mnhFNjieX0xc9NadR+drj9tqmEANxzTOkFtVPyQ==} + '@rspack/binding-linux-arm64-musl@2.2.7': + resolution: {integrity: sha512-qBvztXsOgdi69zi8BhIUz+yc/alqR/wQVmcdCh+1SbhcsNpMsFUndxvVoR1tOboBsEo//gxOG4GxH8zlemhbUA==} cpu: [arm64] os: [linux] libc: [musl] - '@rspack/binding-linux-ppc64-gnu@2.2.3': - resolution: {integrity: sha512-kyXROzr519a5juBII9ysuc5ZD2apEZ0DJqL5PPCAOVHjzMfThEIBwnX3gicNCmp+kY0CCIOl2LagwbtFaOzoiA==} + '@rspack/binding-linux-ppc64-gnu@2.2.7': + resolution: {integrity: sha512-t+/tOPoMu3ZZF8I1Wvqd4Jrib1teOOgb0S4jGb4nSVryuDIWgjny0FLGv5xc8RC7e4esVF93D4wF62Kt9Pxfvw==} cpu: [ppc64] os: [linux] libc: [glibc] @@ -21115,8 +21093,8 @@ packages: os: [linux] libc: [glibc] - '@rspack/binding-linux-riscv64-gnu@2.2.3': - resolution: {integrity: sha512-F3x6Nu0RUSoLtiaMse3hYQ3Nf5A2de6vTWWDXj14Ll6BpGWXGn+U/eXT/nB199fFnDEYf+CJEa7d6fzcYdwdjA==} + '@rspack/binding-linux-riscv64-gnu@2.2.7': + resolution: {integrity: sha512-ZkN6K4PRTPqfYI7gPYv1PqgUXKsZDeeFPFoQ4LLiFxhIGczdJY5XAPPoHN+N7d91hAGWi6u+UHYrUp1HvudBOw==} cpu: [riscv64] os: [linux] libc: [glibc] @@ -21127,24 +21105,18 @@ packages: os: [linux] libc: [musl] - '@rspack/binding-linux-riscv64-musl@2.2.3': - resolution: {integrity: sha512-O3HK7OnPvoBxZu4MX2j+t3gk4qiUsFYqj/29L3WgU1iQsdUSIN6PInW2JvbiLqyuzt09VltIEXTKayY8EysCpQ==} + '@rspack/binding-linux-riscv64-musl@2.2.7': + resolution: {integrity: sha512-ywcmeNAC59HtVJ4a5jy5cEUA4JNa19QlVtTW09Pzh0+luNEasWaDfOaXJpYJTGWcycVwzMm3A9aNN3MqvO87EQ==} cpu: [riscv64] os: [linux] libc: [musl] - '@rspack/binding-linux-s390x-gnu@2.2.3': - resolution: {integrity: sha512-SIxfGdwBdAjwJ8pDlPTb8MPIZIv/i2lKHn4/ywuDpFOxlUA4Bo/OKqQOenHx2MFD2mN8jigBZQTF0KVe5YP1uQ==} + '@rspack/binding-linux-s390x-gnu@2.2.7': + resolution: {integrity: sha512-U/np+nOj9mka5CdM9FKNkrAShw0UoaarBLzOxbBHu4sqMt3iXQCi91fblLdhUDoWuIQrnV/WrqygFeIP2qAHIw==} cpu: [s390x] os: [linux] libc: [glibc] - '@rspack/binding-linux-x64-gnu@2.0.0': - resolution: {integrity: sha512-dPjFGpoCvZfFpJBsWAUR+PR7mWYxpou6L026qIOpAVkz7WiTzErwKD3P1jVrpP4dM9yLb3fVE+PHHjTglhTJ4g==} - cpu: [x64] - os: [linux] - libc: [glibc] - '@rspack/binding-linux-x64-gnu@2.0.8': resolution: {integrity: sha512-zrkoEOnqj1hOEBO5T2I/2Ts2HSJsYFh1qXwMpK4dMJFGGNWDfNeUa6/LF5uq3VINF3JUl7RL47AgrucoSZJXPA==} cpu: [x64] @@ -21157,18 +21129,12 @@ packages: os: [linux] libc: [glibc] - '@rspack/binding-linux-x64-gnu@2.2.3': - resolution: {integrity: sha512-IzQGcw09WYn/IzwB1SQpg7FQ211MBr+fJB2/WoRrPS6CNdtlkDHZaI8z2oq+2Oc5Su21jgX75VlWFajirUx5Dw==} + '@rspack/binding-linux-x64-gnu@2.2.7': + resolution: {integrity: sha512-PkryZX3GZeBQfzvKEhwGGd9m43PwqcsqWd14kmsVADeBCqHLxJahMGiGmajd28vSa42xbw7HTb8yY4jXzv5QtA==} cpu: [x64] os: [linux] libc: [glibc] - '@rspack/binding-linux-x64-musl@2.0.0': - resolution: {integrity: sha512-4fgDTMWt0mJDiugdia2mdOjTbnm7yM1Drzl1JpPqlUlOr113byOhc+qgN57LURSGypz2yz/h/Zad7/UnVAxYJw==} - cpu: [x64] - os: [linux] - libc: [musl] - '@rspack/binding-linux-x64-musl@2.0.8': resolution: {integrity: sha512-6CtDaGZjNDvJd9TBp7a9zABbrPORO21W96+3ZcGBn0YNUPUk4ARxIxrTTpeJ/1F41QDM8AYIkGDdqEYMqTYBsA==} cpu: [x64] @@ -21181,16 +21147,12 @@ packages: os: [linux] libc: [musl] - '@rspack/binding-linux-x64-musl@2.2.3': - resolution: {integrity: sha512-9OKSx2ickrR+PFal94XE6Hkj49AQ2HI3KuR9XeRkKOwSxjwrskV/Pn1wc2itDOHkm/QHP7k+MttsYb4FGuNIqw==} + '@rspack/binding-linux-x64-musl@2.2.7': + resolution: {integrity: sha512-atJn62IgXnc/RhWiFgEiNx7IHAJbHunttzjMpWJLjWiFuJ2c+tLQrTBIiqO3VAIXh+haN1jZLHXuMVj5/J+edA==} cpu: [x64] os: [linux] libc: [musl] - '@rspack/binding-wasm32-wasi@2.0.0': - resolution: {integrity: sha512-ANk73ZKtPrZf9gdtyRK2nQUfhi1uXoC5P2KF89pyVAE8+zcoLBnYtZGYpWa/cmNi5BcO5g4Z+v2l1UA3bUPLQQ==} - cpu: [wasm32] - '@rspack/binding-wasm32-wasi@2.0.8': resolution: {integrity: sha512-Yf4SiqTUroT5Ju+te0YAY2xxKOb35tECsO21v7hYyGa705wrgoAK/MmF7enOvs9GR1iZIqgiLD/wxsIxl8GjJw==} cpu: [wasm32] @@ -21199,15 +21161,10 @@ packages: resolution: {integrity: sha512-OicgaB3Dcd+KXsH/I3DkJG7XQyREJScg/jLkCtycFn9BhT0IVJvgi37F8QNJKl8Bp9YZIGehsqK9HpQWav6SLw==} cpu: [wasm32] - '@rspack/binding-wasm32-wasi@2.2.3': - resolution: {integrity: sha512-gici3jWJi0GDy9kbYh57LoA57H8A2EAD9cV2jFKp1YoJ2aX2U9lANh4L+xoKPTvVQYpRvleoA5jkAvyfeLQ5bw==} + '@rspack/binding-wasm32-wasi@2.2.7': + resolution: {integrity: sha512-SRDYrqWnD8Y+VNj8+11KggFaVMFSbyu+9WC2f9sygzjFu78GmF0kLKaHNQMaJv6MUMSBk/OhtEbUB4hmH7czVQ==} cpu: [wasm32] - '@rspack/binding-win32-arm64-msvc@2.0.0': - resolution: {integrity: sha512-IHZFRtJ85ONbM+BCtF4TeYXS2Fu9X0IJS2phX1rPibYq9iEtHGfBt4cNlnsJPhbPAXVvi4Oli/yiLRJ1zxtCIg==} - cpu: [arm64] - os: [win32] - '@rspack/binding-win32-arm64-msvc@2.0.8': resolution: {integrity: sha512-8NCuiQsAhXrwRBy57QZoypqrws/zLBkaQVGiB8hksr6v++8hNigNjqpQARLbd0iyMuHsQQ++8+auGk6xlDXmzw==} cpu: [arm64] @@ -21218,16 +21175,11 @@ packages: cpu: [arm64] os: [win32] - '@rspack/binding-win32-arm64-msvc@2.2.3': - resolution: {integrity: sha512-1MG66kcuqAGFs9ewiBc+/NJSTQr1jHrkZ2nCVMyhukl1o8embmFZa3BCibYgBYs5P7FRc6Sa+CDXcrfDZOLInQ==} + '@rspack/binding-win32-arm64-msvc@2.2.7': + resolution: {integrity: sha512-etHFjzSP/jnnrVYuim9C/nhSlN0/tQowVz0CSJOUHtDH7ZZiUsvWtkH9Zx3tDaZOB7sAw9cbL36mbmdkb4U6cw==} cpu: [arm64] os: [win32] - '@rspack/binding-win32-ia32-msvc@2.0.0': - resolution: {integrity: sha512-n4tbIqacq/FhNJflMlgZV50AeQFTLh5hnDS3v4W+rJWa3IW1VfgB0+XppdeW+Dqhw7QcMIsCmro01kwNdlXZDQ==} - cpu: [ia32] - os: [win32] - '@rspack/binding-win32-ia32-msvc@2.0.8': resolution: {integrity: sha512-bxiekytbX7V9KFAra+HkwtNWC6pYfHEBBZFpiT0xUs3mCFOmAAFVBsBSQsoCP9AdCEXoMAvNdnrHNw3iov4OZw==} cpu: [ia32] @@ -21238,16 +21190,11 @@ packages: cpu: [ia32] os: [win32] - '@rspack/binding-win32-ia32-msvc@2.2.3': - resolution: {integrity: sha512-CAigxxh9DYJmEwH9f6FRkSsmt0GhKVqKaFRVFFrF9WDL7gXP3hyE/h/cCeMdmlTzRt8Mht87AvnDX7PG3neMrA==} + '@rspack/binding-win32-ia32-msvc@2.2.7': + resolution: {integrity: sha512-26HiMUQk8QKVw477gW9HorIQ3r0le3AL4OFigJr1/HAumi5qyOPazck+wWtUDh1R9bSf8etZjkuseBGtjN5+KQ==} cpu: [ia32] os: [win32] - '@rspack/binding-win32-x64-msvc@2.0.0': - resolution: {integrity: sha512-cJOgikIW2t3S+42TQZsv+DJriJt2m6lnUk+pUFu/fO93rrMvNrx8gfMxR8W5zDTreBX0cfMx2pw6EVmyi/YzsQ==} - cpu: [x64] - os: [win32] - '@rspack/binding-win32-x64-msvc@2.0.8': resolution: {integrity: sha512-7zPs8YCe/ZVJTwd+5lpB0CP0tkn2pONf/T1ycmVY76u21Nrwt8mXQGc/2yH2eWP4B7fikYBr3hGr7mpR2fajqQ==} cpu: [x64] @@ -21258,34 +21205,19 @@ packages: cpu: [x64] os: [win32] - '@rspack/binding-win32-x64-msvc@2.2.3': - resolution: {integrity: sha512-qa5Wc34a+Uux5foZ1Z+9fPQceVRbgTunaIulHezVF/ZxvqKO4DkAC7tFl53shB0YRVBAPg8R78MGd8cByfoxLQ==} + '@rspack/binding-win32-x64-msvc@2.2.7': + resolution: {integrity: sha512-ut8tVSXP8DWQE/JUwQ1oqwuAaAgySgYF66HpWmxfR9J4nLzGmhd7CnnaCTT3vUyQQNmLKFida/AbiqJ/gWmPrw==} cpu: [x64] os: [win32] - '@rspack/binding@2.0.0': - resolution: {integrity: sha512-WA2f9eQpejkvf5Vrnf6wNCn1m8RT1p08NjgOZpKhsCzr0uBjWeRvGduawlrFFHZh/jPnWZTVaVdQ08FEAWbwGw==} - '@rspack/binding@2.0.8': resolution: {integrity: sha512-3uZ+y8aQxq33ty2srMxg2Nu0XuBI6vVrG50rkDaXqwWqOohfgGUSfFuQK7EnSUNy4aFUQlCG6NHialQHJov0wg==} '@rspack/binding@2.1.1': resolution: {integrity: sha512-6062hZP33fn1w51ClpQnum19GGXl/3eS754xrRYbQ7wwBNZk94HVwfSyiqcNCtY/pB1lsFjnaTKiW/Q+jv0axQ==} - '@rspack/binding@2.2.3': - resolution: {integrity: sha512-532+T5N6yIdukChiL85H4NFN2vn9oi8wlLa1ByPNtpNYriE9s24fUhn0RiK7w/xACqnNpYmXCqLYCvjOzyCy+w==} - - '@rspack/core@2.0.0': - resolution: {integrity: sha512-WD1mJM9LbZ7Z399Rbv9dE3BNEV0+3sE5OzDdzV8hOxUb3mX++ynK5n9kil8w60B6nGdcKeV9ly5aN4PgqiwWUg==} - engines: {node: ^20.19.0 || >=22.12.0} - peerDependencies: - '@module-federation/runtime-tools': ^0.24.1 || ^2.0.0 - '@swc/helpers': '>=0.5.1' - peerDependenciesMeta: - '@module-federation/runtime-tools': - optional: true - '@swc/helpers': - optional: true + '@rspack/binding@2.2.7': + resolution: {integrity: sha512-opY7Sw6iwtBa23CeNj18GOqKBlaJUZXp52kNIGyNq+7jpCQKrJYeX5wiK7uBn8/ZpHQfhwNL2xxu5yzG4JFH1g==} '@rspack/core@2.0.8': resolution: {integrity: sha512-+NLGJf8gZxihDmMFzjlly3toc2SMjeDmuvz0/Cai9AMdV4F+Pqcnt2BA9V4e3SY2jmhJQtPwgyyLtR1RiJO77g==} @@ -21311,8 +21243,8 @@ packages: '@swc/helpers': optional: true - '@rspack/core@2.2.3': - resolution: {integrity: sha512-VHejw+PDd5B5v6VduFyjLSTIFaHBMNGPMKw+Y0zjkMqjYhDD1hjLOBC5frRKjTWcfYdk+Q73auWPp9k/H9PfIQ==} + '@rspack/core@2.2.7': + resolution: {integrity: sha512-kWKd4lYp13GPAQy2eQITLTvPbl+ST7ffG/MCGHoX138o5eTetMQMe/oc7UAZAfjervAM6UOzEhiiCirPTpRBUQ==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: '@module-federation/runtime-tools': ^0.24.1 || ^2.0.0 @@ -33346,13 +33278,6 @@ snapshots: '@tybys/wasm-util': 0.10.2 optional: true - '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)': - dependencies: - '@emnapi/core': 1.11.1 - '@emnapi/runtime': 1.11.3 - '@tybys/wasm-util': 0.10.2 - optional: true - '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': dependencies: '@emnapi/core': 1.11.3 @@ -33832,11 +33757,11 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.19.0 - '@nx/devkit@23.2.0(nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)))': + '@nx/devkit@23.2.0(nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)))': dependencies: ejs: 5.0.1 minimatch: 10.2.5 - nx: 23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)) + nx: 23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)) semver: 7.8.5 tslib: 2.8.1 yargs-parser: 21.1.1 @@ -34005,9 +33930,9 @@ snapshots: '@oxc-minify/binding-openharmony-arm64@0.110.0': optional: true - '@oxc-minify/binding-wasm32-wasi@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)': + '@oxc-minify/binding-wasm32-wasi@0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) transitivePeerDependencies: - '@emnapi/core' - '@emnapi/runtime' @@ -34074,9 +33999,9 @@ snapshots: '@oxc-resolver/binding-openharmony-arm64@11.19.1': optional: true - '@oxc-resolver/binding-wasm32-wasi@11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)': + '@oxc-resolver/binding-wasm32-wasi@11.19.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) transitivePeerDependencies: - '@emnapi/core' - '@emnapi/runtime' @@ -34139,9 +34064,9 @@ snapshots: '@oxc-transform/binding-openharmony-arm64@0.110.0': optional: true - '@oxc-transform/binding-wasm32-wasi@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)': + '@oxc-transform/binding-wasm32-wasi@0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) transitivePeerDependencies: - '@emnapi/core' - '@emnapi/runtime' @@ -35480,7 +35405,7 @@ snapshots: '@rsbuild/core@2.2.5': dependencies: - '@rspack/core': 2.2.3(@swc/helpers@0.5.23) + '@rspack/core': 2.2.7(@swc/helpers@0.5.23) '@swc/helpers': 0.5.23 transitivePeerDependencies: - '@module-federation/runtime-tools' @@ -35498,18 +35423,18 @@ snapshots: transitivePeerDependencies: - supports-color - '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.0.14)(@rspack/core@2.2.3(@swc/helpers@0.5.23))': + '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.0.14)(@rspack/core@2.2.7(@swc/helpers@0.5.23))': dependencies: - '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(react-refresh@0.18.0) + '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(react-refresh@0.18.0) react-refresh: 0.18.0 optionalDependencies: '@rsbuild/core': 2.0.14 transitivePeerDependencies: - '@rspack/core' - '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))': + '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23))': dependencies: - '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(react-refresh@0.18.0) + '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(react-refresh@0.18.0) react-refresh: 0.18.0 optionalDependencies: '@rsbuild/core': 2.1.1 @@ -35528,9 +35453,9 @@ snapshots: - solid-js - supports-color - '@rsbuild/plugin-tailwindcss@2.0.3(@rsbuild/core@2.0.14)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(webpack@5.110.3)': + '@rsbuild/plugin-tailwindcss@2.0.3(@rsbuild/core@2.0.14)(@rspack/core@2.2.7(@swc/helpers@0.5.23))(webpack@5.110.3)': dependencies: - '@tailwindcss/webpack': 4.3.1(@rspack/core@2.2.3(@swc/helpers@0.5.23))(webpack@5.110.3) + '@tailwindcss/webpack': 4.3.1(@rspack/core@2.2.7(@swc/helpers@0.5.23))(webpack@5.110.3) optionalDependencies: '@rsbuild/core': 2.0.14 transitivePeerDependencies: @@ -35548,9 +35473,9 @@ snapshots: - '@babel/core' - supports-color - '@rsbuild/plugin-vue@1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@rsbuild/plugin-vue@1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.2.7(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: - rspack-vue-loader: 17.5.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) + rspack-vue-loader: 17.5.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)) optionalDependencies: '@rsbuild/core': 2.1.1 transitivePeerDependencies: @@ -35558,19 +35483,13 @@ snapshots: - '@vue/compiler-sfc' - vue - '@rspack/binding-darwin-arm64@2.0.0': - optional: true - '@rspack/binding-darwin-arm64@2.0.8': optional: true '@rspack/binding-darwin-arm64@2.1.1': optional: true - '@rspack/binding-darwin-arm64@2.2.3': - optional: true - - '@rspack/binding-darwin-x64@2.0.0': + '@rspack/binding-darwin-arm64@2.2.7': optional: true '@rspack/binding-darwin-x64@2.0.8': @@ -35579,10 +35498,7 @@ snapshots: '@rspack/binding-darwin-x64@2.1.1': optional: true - '@rspack/binding-darwin-x64@2.2.3': - optional: true - - '@rspack/binding-linux-arm64-gnu@2.0.0': + '@rspack/binding-darwin-x64@2.2.7': optional: true '@rspack/binding-linux-arm64-gnu@2.0.8': @@ -35591,10 +35507,7 @@ snapshots: '@rspack/binding-linux-arm64-gnu@2.1.1': optional: true - '@rspack/binding-linux-arm64-gnu@2.2.3': - optional: true - - '@rspack/binding-linux-arm64-musl@2.0.0': + '@rspack/binding-linux-arm64-gnu@2.2.7': optional: true '@rspack/binding-linux-arm64-musl@2.0.8': @@ -35603,28 +35516,25 @@ snapshots: '@rspack/binding-linux-arm64-musl@2.1.1': optional: true - '@rspack/binding-linux-arm64-musl@2.2.3': + '@rspack/binding-linux-arm64-musl@2.2.7': optional: true - '@rspack/binding-linux-ppc64-gnu@2.2.3': + '@rspack/binding-linux-ppc64-gnu@2.2.7': optional: true '@rspack/binding-linux-riscv64-gnu@2.1.1': optional: true - '@rspack/binding-linux-riscv64-gnu@2.2.3': + '@rspack/binding-linux-riscv64-gnu@2.2.7': optional: true '@rspack/binding-linux-riscv64-musl@2.1.1': optional: true - '@rspack/binding-linux-riscv64-musl@2.2.3': + '@rspack/binding-linux-riscv64-musl@2.2.7': optional: true - '@rspack/binding-linux-s390x-gnu@2.2.3': - optional: true - - '@rspack/binding-linux-x64-gnu@2.0.0': + '@rspack/binding-linux-s390x-gnu@2.2.7': optional: true '@rspack/binding-linux-x64-gnu@2.0.8': @@ -35633,10 +35543,7 @@ snapshots: '@rspack/binding-linux-x64-gnu@2.1.1': optional: true - '@rspack/binding-linux-x64-gnu@2.2.3': - optional: true - - '@rspack/binding-linux-x64-musl@2.0.0': + '@rspack/binding-linux-x64-gnu@2.2.7': optional: true '@rspack/binding-linux-x64-musl@2.0.8': @@ -35645,14 +35552,7 @@ snapshots: '@rspack/binding-linux-x64-musl@2.1.1': optional: true - '@rspack/binding-linux-x64-musl@2.2.3': - optional: true - - '@rspack/binding-wasm32-wasi@2.0.0': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) + '@rspack/binding-linux-x64-musl@2.2.7': optional: true '@rspack/binding-wasm32-wasi@2.0.8': @@ -35669,26 +35569,20 @@ snapshots: '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) optional: true - '@rspack/binding-wasm32-wasi@2.2.3': + '@rspack/binding-wasm32-wasi@2.2.7': dependencies: '@emnapi/core': 1.11.3 '@emnapi/runtime': 1.11.3 '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) optional: true - '@rspack/binding-win32-arm64-msvc@2.0.0': - optional: true - '@rspack/binding-win32-arm64-msvc@2.0.8': optional: true '@rspack/binding-win32-arm64-msvc@2.1.1': optional: true - '@rspack/binding-win32-arm64-msvc@2.2.3': - optional: true - - '@rspack/binding-win32-ia32-msvc@2.0.0': + '@rspack/binding-win32-arm64-msvc@2.2.7': optional: true '@rspack/binding-win32-ia32-msvc@2.0.8': @@ -35697,10 +35591,7 @@ snapshots: '@rspack/binding-win32-ia32-msvc@2.1.1': optional: true - '@rspack/binding-win32-ia32-msvc@2.2.3': - optional: true - - '@rspack/binding-win32-x64-msvc@2.0.0': + '@rspack/binding-win32-ia32-msvc@2.2.7': optional: true '@rspack/binding-win32-x64-msvc@2.0.8': @@ -35709,22 +35600,9 @@ snapshots: '@rspack/binding-win32-x64-msvc@2.1.1': optional: true - '@rspack/binding-win32-x64-msvc@2.2.3': + '@rspack/binding-win32-x64-msvc@2.2.7': optional: true - '@rspack/binding@2.0.0': - optionalDependencies: - '@rspack/binding-darwin-arm64': 2.0.0 - '@rspack/binding-darwin-x64': 2.0.0 - '@rspack/binding-linux-arm64-gnu': 2.0.0 - '@rspack/binding-linux-arm64-musl': 2.0.0 - '@rspack/binding-linux-x64-gnu': 2.0.0 - '@rspack/binding-linux-x64-musl': 2.0.0 - '@rspack/binding-wasm32-wasi': 2.0.0 - '@rspack/binding-win32-arm64-msvc': 2.0.0 - '@rspack/binding-win32-ia32-msvc': 2.0.0 - '@rspack/binding-win32-x64-msvc': 2.0.0 - '@rspack/binding@2.0.8': optionalDependencies: '@rspack/binding-darwin-arm64': 2.0.8 @@ -35753,28 +35631,22 @@ snapshots: '@rspack/binding-win32-ia32-msvc': 2.1.1 '@rspack/binding-win32-x64-msvc': 2.1.1 - '@rspack/binding@2.2.3': + '@rspack/binding@2.2.7': optionalDependencies: - '@rspack/binding-darwin-arm64': 2.2.3 - '@rspack/binding-darwin-x64': 2.2.3 - '@rspack/binding-linux-arm64-gnu': 2.2.3 - '@rspack/binding-linux-arm64-musl': 2.2.3 - '@rspack/binding-linux-ppc64-gnu': 2.2.3 - '@rspack/binding-linux-riscv64-gnu': 2.2.3 - '@rspack/binding-linux-riscv64-musl': 2.2.3 - '@rspack/binding-linux-s390x-gnu': 2.2.3 - '@rspack/binding-linux-x64-gnu': 2.2.3 - '@rspack/binding-linux-x64-musl': 2.2.3 - '@rspack/binding-wasm32-wasi': 2.2.3 - '@rspack/binding-win32-arm64-msvc': 2.2.3 - '@rspack/binding-win32-ia32-msvc': 2.2.3 - '@rspack/binding-win32-x64-msvc': 2.2.3 - - '@rspack/core@2.0.0(@swc/helpers@0.5.23)': - dependencies: - '@rspack/binding': 2.0.0 - optionalDependencies: - '@swc/helpers': 0.5.23 + '@rspack/binding-darwin-arm64': 2.2.7 + '@rspack/binding-darwin-x64': 2.2.7 + '@rspack/binding-linux-arm64-gnu': 2.2.7 + '@rspack/binding-linux-arm64-musl': 2.2.7 + '@rspack/binding-linux-ppc64-gnu': 2.2.7 + '@rspack/binding-linux-riscv64-gnu': 2.2.7 + '@rspack/binding-linux-riscv64-musl': 2.2.7 + '@rspack/binding-linux-s390x-gnu': 2.2.7 + '@rspack/binding-linux-x64-gnu': 2.2.7 + '@rspack/binding-linux-x64-musl': 2.2.7 + '@rspack/binding-wasm32-wasi': 2.2.7 + '@rspack/binding-win32-arm64-msvc': 2.2.7 + '@rspack/binding-win32-ia32-msvc': 2.2.7 + '@rspack/binding-win32-x64-msvc': 2.2.7 '@rspack/core@2.0.8(@swc/helpers@0.5.23)': dependencies: @@ -35788,19 +35660,19 @@ snapshots: optionalDependencies: '@swc/helpers': 0.5.23 - '@rspack/core@2.2.3(@swc/helpers@0.5.23)': + '@rspack/core@2.2.7(@swc/helpers@0.5.23)': dependencies: - '@rspack/binding': 2.2.3 + '@rspack/binding': 2.2.7 optionalDependencies: '@swc/helpers': 0.5.23 '@rspack/lite-tapable@1.1.0': {} - '@rspack/plugin-react-refresh@2.0.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(react-refresh@0.18.0)': + '@rspack/plugin-react-refresh@2.0.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(react-refresh@0.18.0)': dependencies: react-refresh: 0.18.0 optionalDependencies: - '@rspack/core': 2.2.3(@swc/helpers@0.5.23) + '@rspack/core': 2.2.7(@swc/helpers@0.5.23) '@rushstack/node-core-library@5.7.0(@types/node@25.0.9)': dependencies: @@ -36200,14 +36072,14 @@ snapshots: '@swc/core': 1.15.33(@swc/helpers@0.5.23) '@swc/types': 0.1.26 - '@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0)': + '@swc-node/register@1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0)': dependencies: '@swc-node/core': 1.14.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26) '@swc-node/sourcemap-support': 0.6.1 '@swc/core': 1.15.33(@swc/helpers@0.5.23) colorette: 2.0.20 debug: 4.4.3(supports-color@7.2.0) - oxc-resolver: 11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) + oxc-resolver: 11.19.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) pirates: 4.0.7 tslib: 2.8.1 typescript: '@typescript/typescript6@6.0.2' @@ -36428,14 +36300,14 @@ snapshots: tailwindcss: 4.2.2 vite: 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.9.0) - '@tailwindcss/webpack@4.3.1(@rspack/core@2.2.3(@swc/helpers@0.5.23))(webpack@5.110.3)': + '@tailwindcss/webpack@4.3.1(@rspack/core@2.2.7(@swc/helpers@0.5.23))(webpack@5.110.3)': dependencies: '@alloc/quick-lru': 5.2.0 '@tailwindcss/node': 4.3.1 '@tailwindcss/oxide': 4.3.1 tailwindcss: 4.3.1 optionalDependencies: - '@rspack/core': 2.2.3(@swc/helpers@0.5.23) + '@rspack/core': 2.2.7(@swc/helpers@0.5.23) webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) '@tanstack/devtools-client@0.0.4': @@ -42677,7 +42549,7 @@ snapshots: nf3@0.3.6: {} - nitro@3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0)): + nitro@3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0)): dependencies: consola: 3.4.2 crossws: 0.4.3(srvx@0.10.1) @@ -42687,8 +42559,8 @@ snapshots: nf3: 0.3.6 ofetch: 2.0.0-alpha.3 ohash: 2.0.11 - oxc-minify: 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) - oxc-transform: 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) + oxc-minify: 0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) + oxc-transform: 0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) srvx: 0.10.1 undici: 7.24.4 unenv: 2.0.0-rc.24 @@ -42890,7 +42762,7 @@ snapshots: - sqlite3 - uploadthing - nitropack@2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.2.3(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@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.9.0))(webpack@5.110.3): + nitropack@2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.2.7(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@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.9.0))(webpack@5.110.3): dependencies: '@cloudflare/kv-asset-handler': 0.4.2 '@rollup/plugin-alias': 6.0.0(rollup@4.63.1) @@ -42955,7 +42827,7 @@ snapshots: uncrypto: 0.1.3 unctx: 2.5.0 unenv: 2.0.0-rc.24 - unimport: 6.4.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) + unimport: 6.4.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) unplugin-utils: 0.3.1 unstorage: 1.17.5(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) untyped: 2.0.0 @@ -43090,7 +42962,7 @@ snapshots: nwsapi@2.2.16: {} - nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)): + nx@23.2.0(@swc-node/register@1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0))(@swc/core@1.15.33(@swc/helpers@0.5.23)): dependencies: '@clack/core': 1.4.3 '@clack/prompts': 1.7.0 @@ -43227,7 +43099,7 @@ snapshots: '@nx/nx-linux-x64-musl': 23.2.0 '@nx/nx-win32-arm64-msvc': 23.2.0 '@nx/nx-win32-x64-msvc': 23.2.0 - '@swc-node/register': 1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0) + '@swc-node/register': 1.11.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(@typescript/typescript6@6.0.2)(supports-color@7.2.0) '@swc/core': 1.15.33(@swc/helpers@0.5.23) nypm@0.6.0: @@ -43347,7 +43219,7 @@ snapshots: outvariant@1.4.3: {} - oxc-minify@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3): + oxc-minify@0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3): optionalDependencies: '@oxc-minify/binding-android-arm-eabi': 0.110.0 '@oxc-minify/binding-android-arm64': 0.110.0 @@ -43365,7 +43237,7 @@ snapshots: '@oxc-minify/binding-linux-x64-gnu': 0.110.0 '@oxc-minify/binding-linux-x64-musl': 0.110.0 '@oxc-minify/binding-openharmony-arm64': 0.110.0 - '@oxc-minify/binding-wasm32-wasi': 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) + '@oxc-minify/binding-wasm32-wasi': 0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) '@oxc-minify/binding-win32-arm64-msvc': 0.110.0 '@oxc-minify/binding-win32-ia32-msvc': 0.110.0 '@oxc-minify/binding-win32-x64-msvc': 0.110.0 @@ -43373,7 +43245,7 @@ snapshots: - '@emnapi/core' - '@emnapi/runtime' - oxc-resolver@11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3): + oxc-resolver@11.19.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3): optionalDependencies: '@oxc-resolver/binding-android-arm-eabi': 11.19.1 '@oxc-resolver/binding-android-arm64': 11.19.1 @@ -43391,7 +43263,7 @@ snapshots: '@oxc-resolver/binding-linux-x64-gnu': 11.19.1 '@oxc-resolver/binding-linux-x64-musl': 11.19.1 '@oxc-resolver/binding-openharmony-arm64': 11.19.1 - '@oxc-resolver/binding-wasm32-wasi': 11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) + '@oxc-resolver/binding-wasm32-wasi': 11.19.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) '@oxc-resolver/binding-win32-arm64-msvc': 11.19.1 '@oxc-resolver/binding-win32-ia32-msvc': 11.19.1 '@oxc-resolver/binding-win32-x64-msvc': 11.19.1 @@ -43399,7 +43271,7 @@ snapshots: - '@emnapi/core' - '@emnapi/runtime' - oxc-transform@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3): + oxc-transform@0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3): optionalDependencies: '@oxc-transform/binding-android-arm-eabi': 0.110.0 '@oxc-transform/binding-android-arm64': 0.110.0 @@ -43417,7 +43289,7 @@ snapshots: '@oxc-transform/binding-linux-x64-gnu': 0.110.0 '@oxc-transform/binding-linux-x64-musl': 0.110.0 '@oxc-transform/binding-openharmony-arm64': 0.110.0 - '@oxc-transform/binding-wasm32-wasi': 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.3) + '@oxc-transform/binding-wasm32-wasi': 0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) '@oxc-transform/binding-win32-arm64-msvc': 0.110.0 '@oxc-transform/binding-win32-ia32-msvc': 0.110.0 '@oxc-transform/binding-win32-x64-msvc': 0.110.0 @@ -44066,9 +43938,9 @@ snapshots: optionalDependencies: '@types/react': 19.2.9 - react-server-dom-rspack@0.0.2(@rspack/core@2.0.0(@swc/helpers@0.5.23))(react-dom@19.2.3(react@19.2.3))(react@19.2.3): + react-server-dom-rspack@0.0.2(@rspack/core@2.2.7(@swc/helpers@0.5.23))(react-dom@19.2.3(react@19.2.3))(react@19.2.3): dependencies: - '@rspack/core': 2.0.0(@swc/helpers@0.5.23) + '@rspack/core': 2.2.7(@swc/helpers@0.5.23) react: 19.2.3 react-dom: 19.2.3(react@19.2.3) @@ -44408,12 +44280,12 @@ snapshots: rrweb-cssom@0.8.0: {} - rspack-vue-loader@17.5.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)): + rspack-vue-loader@17.5.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(@vue/compiler-sfc@3.5.25)(vue@3.5.25(@typescript/typescript6@6.0.2)): dependencies: '@rspack/lite-tapable': 1.1.0 chalk: 4.1.2 optionalDependencies: - '@rspack/core': 2.2.3(@swc/helpers@0.5.23) + '@rspack/core': 2.2.7(@swc/helpers@0.5.23) '@vue/compiler-sfc': 3.5.25 vue: 3.5.25(@typescript/typescript6@6.0.2) @@ -45467,7 +45339,7 @@ snapshots: unicorn-magic@0.4.0: {} - unimport@6.4.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3): + unimport@6.4.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3): dependencies: acorn: 8.18.0 escape-string-regexp: 5.0.0 @@ -45481,7 +45353,7 @@ snapshots: scule: 1.3.0 strip-literal: 4.0.0 tinyglobby: 0.2.17 - unplugin: 3.3.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) + unplugin: 3.3.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) unplugin-utils: 0.3.2 optionalDependencies: rolldown: 1.0.2 @@ -45529,13 +45401,13 @@ snapshots: picomatch: 4.0.7 webpack-virtual-modules: 0.6.2 - unplugin@3.3.0(@rspack/core@2.2.3(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3): + unplugin@3.3.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3): dependencies: '@jridgewell/remapping': 2.3.5 picomatch: 4.0.7 webpack-virtual-modules: 0.6.2 optionalDependencies: - '@rspack/core': 2.2.3(@swc/helpers@0.5.23) + '@rspack/core': 2.2.7(@swc/helpers@0.5.23) esbuild: 0.28.2 rolldown: 1.0.2 rollup: 4.63.1 From 2413cc009826fba4f97b166a35a8a50a4a8fe4bb Mon Sep 17 00:00:00 2001 From: Flo Date: Sat, 3 Oct 2026 22:33:29 +0200 Subject: [PATCH 080/175] perf(react-router): reduce component nesting per route match (#8594) * perf(react-router): reduce component nesting per route match * make it stable between server and client --- .changeset/cold-icons-teach.md | 5 ++++ packages/react-router/src/Match.tsx | 44 ++++++++++++----------------- 2 files changed, 23 insertions(+), 26 deletions(-) create mode 100644 .changeset/cold-icons-teach.md diff --git a/.changeset/cold-icons-teach.md b/.changeset/cold-icons-teach.md new file mode 100644 index 0000000000..71d89d79d2 --- /dev/null +++ b/.changeset/cold-icons-teach.md @@ -0,0 +1,5 @@ +--- +'@tanstack/react-router': patch +--- + +reduce component nesting per route match diff --git a/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx index 474a155fbf..db1d341ec4 100644 --- a/packages/react-router/src/Match.tsx +++ b/packages/react-router/src/Match.tsx @@ -68,22 +68,16 @@ export const Match = React.memo(function MatchImpl({ if (isServer ?? router.isServer) { const match = router.stores.byRoute.get(routeId)!.get()! - return + return matchView(router, match) } const matchStore = router.stores.getMatchStore(routeId) // eslint-disable-next-line react-hooks/rules-of-hooks - const match = useSelector(matchStore) - return + const match = useSelector(matchStore)! + return matchView(router, match) }) -function MatchView({ - router, - match, -}: { - router: ReturnType - match: AnyRouteMatch -}) { +function matchView(router: ReturnType, match: AnyRouteMatch) { const route: AnyRoute = router.routesById[match.routeId] const pendingElement = renderPending(router, route) @@ -169,24 +163,22 @@ function MatchView({ router.options.scrollRestoration ? ( ) : null - const ShellComponent = route.isRoot - ? (route.options as RootRouteOptions).shellComponent - : undefined - // The shell and route boundaries must share this match's context. - return ( + const ShellComponent = + route.isRoot && (route.options as RootRouteOptions).shellComponent + + return ShellComponent ? ( + // The shell and route boundaries must share this match's context. - {ShellComponent ? ( - - {content} - {scrollRestoration} - - ) : ( - <> - {content} - {scrollRestoration} - - )} + + {content} + {scrollRestoration} + + + ) : ( + + {content} + {scrollRestoration} ) } From b839f47027956f71ed2db51f436701801addb1d6 Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 4 Oct 2026 13:02:43 +0200 Subject: [PATCH 081/175] test(e2e): wait for the destination route before asserting shared widget CSS (#8603) /lazy-css-lazy and /lazy-css-static both render `shared-widget`, and the URL updates before the departing route unmounts, so assertions after `waitForURL` could hit the old widget while it was being detached and read `""`. Wait for a destination-only marker and use retrying `toHaveCSS` assertions instead. Co-authored-by: Claude Opus 5.5 --- .../tests/start-manifest.spec.ts | 73 ++++++------------- .../tests/start-manifest.spec.ts | 70 +++++++----------- .../tests/start-manifest.spec.ts | 70 +++++++----------- 3 files changed, 73 insertions(+), 140 deletions(-) diff --git a/e2e/react-start/start-manifest/tests/start-manifest.spec.ts b/e2e/react-start/start-manifest/tests/start-manifest.spec.ts index 7dfa390997..bd7bd20e98 100644 --- a/e2e/react-start/start-manifest/tests/start-manifest.spec.ts +++ b/e2e/react-start/start-manifest/tests/start-manifest.spec.ts @@ -27,12 +27,6 @@ async function getBackgroundColor(testId: string, page: Page) { .evaluate((element) => getComputedStyle(element).backgroundColor) } -async function getBorderTopColor(testId: string, page: Page) { - return page - .getByTestId(testId) - .evaluate((element) => getComputedStyle(element).borderTopColor) -} - function getStylesheetHrefsFromHtml(html: string) { return Array.from( html.matchAll(/]+rel="stylesheet"[^>]+href="([^"]+)"/g), @@ -362,24 +356,19 @@ test('shared widget CSS stays applied when navigating from static to lazy route' const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - expect(await getBackgroundColor('shared-widget', page)).toBe(SHARED_WIDGET_BG) - await expect - .poll(() => getBorderTopColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') + // Both routes render `shared-widget`: wait for the destination route before + // asserting on it, so the assertions cannot match the departing widget. await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS stays applied when navigating from lazy to static route', async ({ @@ -389,28 +378,19 @@ test('shared widget CSS stays applied when navigating from lazy to static route' await page.goto(buildUrl(baseURL!, '/lazy-css-lazy')) await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + const widget = page.getByTestId('shared-widget') + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) await page.getByTestId('nav-/lazy-css-static').click() await page.waitForURL('**/lazy-css-static') + // The URL updates before the lazy route unmounts, and both routes render + // `shared-widget`: wait for a marker only the static route renders. await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() - const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) - await expect - .poll(() => getBorderTopColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS is applied on direct navigation to lazy route', async ({ @@ -422,17 +402,8 @@ test('shared widget CSS is applied on direct navigation to lazy route', async ({ const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) - await expect - .poll(() => getBorderTopColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS persists after navigating away from lazy and back', async ({ @@ -442,19 +413,21 @@ test('shared widget CSS persists after navigating away from lazy and back', asyn await page.goto(buildUrl(baseURL!, '/lazy-css-static')) await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() + const widget = page.getByTestId('shared-widget') + await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') - await expect(page.getByTestId('shared-widget')).toBeVisible() + await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() + await expect(widget).toBeVisible() await page.getByTestId('nav-home').click() await page.waitForURL((url) => url.pathname === '/') + await expect(page.getByTestId('home-copy')).toBeVisible() await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') + await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) diff --git a/e2e/solid-start/start-manifest/tests/start-manifest.spec.ts b/e2e/solid-start/start-manifest/tests/start-manifest.spec.ts index 836f62a97f..ba74448d54 100644 --- a/e2e/solid-start/start-manifest/tests/start-manifest.spec.ts +++ b/e2e/solid-start/start-manifest/tests/start-manifest.spec.ts @@ -356,24 +356,19 @@ test('shared widget CSS stays applied when navigating from static to lazy route' const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - expect(await getBackgroundColor('shared-widget', page)).toBe(SHARED_WIDGET_BG) - expect( - await widget.evaluate( - (element) => getComputedStyle(element).borderTopColor, - ), - ).toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') + // Both routes render `shared-widget`: wait for the destination route before + // asserting on it, so the assertions cannot match the departing widget. await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS stays applied when navigating from lazy to static route', async ({ @@ -383,27 +378,19 @@ test('shared widget CSS stays applied when navigating from lazy to static route' await page.goto(buildUrl(baseURL!, '/lazy-css-lazy')) await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + const widget = page.getByTestId('shared-widget') + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) await page.getByTestId('nav-/lazy-css-static').click() await page.waitForURL('**/lazy-css-static') + // The URL updates before the lazy route unmounts, and both routes render + // `shared-widget`: wait for a marker only the static route renders. + await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() - const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) - expect( - await widget.evaluate( - (element) => getComputedStyle(element).borderTopColor, - ), - ).toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS is applied on direct navigation to lazy route', async ({ @@ -415,17 +402,8 @@ test('shared widget CSS is applied on direct navigation to lazy route', async ({ const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) - expect( - await widget.evaluate( - (element) => getComputedStyle(element).borderTopColor, - ), - ).toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS persists after navigating away from lazy and back', async ({ @@ -435,19 +413,21 @@ test('shared widget CSS persists after navigating away from lazy and back', asyn await page.goto(buildUrl(baseURL!, '/lazy-css-static')) await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() + const widget = page.getByTestId('shared-widget') + await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') - await expect(page.getByTestId('shared-widget')).toBeVisible() + await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() + await expect(widget).toBeVisible() await page.getByTestId('nav-home').click() - await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) + await page.waitForURL((url) => url.pathname === '/') + await expect(page.getByTestId('home-copy')).toBeVisible() await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') + await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) diff --git a/e2e/vue-start/start-manifest/tests/start-manifest.spec.ts b/e2e/vue-start/start-manifest/tests/start-manifest.spec.ts index 6c0f0d15ab..4d5bea0a33 100644 --- a/e2e/vue-start/start-manifest/tests/start-manifest.spec.ts +++ b/e2e/vue-start/start-manifest/tests/start-manifest.spec.ts @@ -372,24 +372,19 @@ test('shared widget CSS stays applied when navigating from static to lazy route' const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - expect(await getBackgroundColor('shared-widget', page)).toBe(SHARED_WIDGET_BG) - expect( - await widget.evaluate( - (element) => getComputedStyle(element).borderTopColor, - ), - ).toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') + // Both routes render `shared-widget`: wait for the destination route before + // asserting on it, so the assertions cannot match the departing widget. await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS stays applied when navigating from lazy to static route', async ({ @@ -399,27 +394,19 @@ test('shared widget CSS stays applied when navigating from lazy to static route' await page.goto(buildUrl(baseURL!, '/lazy-css-lazy')) await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + const widget = page.getByTestId('shared-widget') + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) await page.getByTestId('nav-/lazy-css-static').click() await page.waitForURL('**/lazy-css-static') + // The URL updates before the lazy route unmounts, and both routes render + // `shared-widget`: wait for a marker only the static route renders. + await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() - const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) - expect( - await widget.evaluate( - (element) => getComputedStyle(element).borderTopColor, - ), - ).toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS is applied on direct navigation to lazy route', async ({ @@ -431,17 +418,8 @@ test('shared widget CSS is applied on direct navigation to lazy route', async ({ const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) - expect( - await widget.evaluate( - (element) => getComputedStyle(element).borderTopColor, - ), - ).toBe(SHARED_WIDGET_BORDER) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) test('shared widget CSS persists after navigating away from lazy and back', async ({ @@ -451,19 +429,21 @@ test('shared widget CSS persists after navigating away from lazy and back', asyn await page.goto(buildUrl(baseURL!, '/lazy-css-static')) await expect(page.getByTestId('lazy-css-static-hydrated')).toBeVisible() + const widget = page.getByTestId('shared-widget') + await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') - await expect(page.getByTestId('shared-widget')).toBeVisible() + await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() + await expect(widget).toBeVisible() await page.getByTestId('nav-home').click() - await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) + await page.waitForURL((url) => url.pathname === '/') + await expect(page.getByTestId('home-copy')).toBeVisible() await page.getByTestId('nav-/lazy-css-lazy').click() await page.waitForURL('**/lazy-css-lazy') + await expect(page.getByTestId('lazy-css-lazy-heading')).toBeVisible() - await expect - .poll(() => getBackgroundColor('shared-widget', page), { - timeout: 5_000, - }) - .toBe(SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) + await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) }) From dfe3dea88a28400db1677111e2b15ae7914782c2 Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 4 Oct 2026 18:52:45 +0200 Subject: [PATCH 082/175] perf(router-core, history): small parsing and bundle-size cleanups (#8605) * fix(history): keep a leading query or fragment out of parseHref's pathname parseHref compared the '?' and '#' indexes with '> 0', so an href that starts with a query or fragment (reachable via hash history '/#?x=1' or memory entries) kept it in the pathname as well, and the router location became '?x=1?x=1'. Co-Authored-By: Claude Opus 5.5 * perf(history): read hash-history locations with indexOf/slice Replace split('#').slice(1)/join('#') with one indexOf and two slices when reading the hash-history location. Characterization tests from #8351 cover nested fragments, encoded '#', and an empty hash. Co-Authored-By: Claude Opus 5.5 * perf(router-core,history): use slice where substring bounds are ordered Every converted call has non-negative, ordered bounds (fixed offsets, indexOf results within the same segment, or guarded by a '<' check). extractParams' affix-stripping calls and the wildcard-tail suffix in parseSegments keep substring: their bounds can cross. Co-Authored-By: Claude Opus 5.5 * perf(router-core,history): drop a duplicated flag and a createHref wrapper buildLocation's currentMatch now reads the location through current(), which already marks the build as location-dependent. Browser history passes its createHref directly; createHistory already wraps it. Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- .changeset/build-location-one-liners.md | 6 ++ .changeset/history-hash-allocations.md | 5 + .changeset/history-leading-query-pathname.md | 5 + .changeset/ordered-slice-bounds.md | 6 ++ packages/history/src/index.ts | 33 ++++--- .../history/tests/createHashHistory.test.ts | 98 +++++++++++++++++++ packages/history/tests/parseHref.test.ts | 12 +++ .../router-core/src/new-process-route-tree.ts | 14 +-- packages/router-core/src/router.ts | 6 +- packages/router-core/src/searchParams.ts | 2 +- .../tests/history-normalization.test.ts | 22 +++++ 11 files changed, 182 insertions(+), 27 deletions(-) create mode 100644 .changeset/build-location-one-liners.md create mode 100644 .changeset/history-hash-allocations.md create mode 100644 .changeset/history-leading-query-pathname.md create mode 100644 .changeset/ordered-slice-bounds.md diff --git a/.changeset/build-location-one-liners.md b/.changeset/build-location-one-liners.md new file mode 100644 index 0000000000..6986df6704 --- /dev/null +++ b/.changeset/build-location-one-liners.md @@ -0,0 +1,6 @@ +--- +'@tanstack/history': patch +'@tanstack/router-core': patch +--- + +Drop a duplicated current-location flag and a redundant `createHref` wrapper. diff --git a/.changeset/history-hash-allocations.md b/.changeset/history-hash-allocations.md new file mode 100644 index 0000000000..ba8755bb97 --- /dev/null +++ b/.changeset/history-hash-allocations.md @@ -0,0 +1,5 @@ +--- +'@tanstack/history': patch +--- + +Avoid temporary arrays when reading hash-history locations. diff --git a/.changeset/history-leading-query-pathname.md b/.changeset/history-leading-query-pathname.md new file mode 100644 index 0000000000..5eef2604d0 --- /dev/null +++ b/.changeset/history-leading-query-pathname.md @@ -0,0 +1,5 @@ +--- +'@tanstack/history': patch +--- + +Keep a leading query or fragment out of the parsed pathname, so hash-history URLs like `/#?x=1` no longer repeat the query in the router location. diff --git a/.changeset/ordered-slice-bounds.md b/.changeset/ordered-slice-bounds.md new file mode 100644 index 0000000000..0838a6aee8 --- /dev/null +++ b/.changeset/ordered-slice-bounds.md @@ -0,0 +1,6 @@ +--- +'@tanstack/history': patch +'@tanstack/router-core': patch +--- + +Use `slice` instead of `substring` where the bounds are always ordered and non-negative. diff --git a/packages/history/src/index.ts b/packages/history/src/index.ts index 1c9bd5ed18..9924779d8f 100644 --- a/packages/history/src/index.ts +++ b/packages/history/src/index.ts @@ -546,7 +546,7 @@ export function createBrowserHistory(opts?: { } win.history.go(n) }, - createHref: (href) => createHref(href), + createHref, flush, destroy: () => { win.history.pushState = originalPushState @@ -613,14 +613,17 @@ export function createHashHistory(opts?: { window?: any }): RouterHistory { return createBrowserHistory({ window: win, parseLocation: () => { - const hashSplit = win.location.hash.split('#').slice(1) - const pathPart = hashSplit[0] ?? '/' - const searchPart = win.location.search - const hashEntries = hashSplit.slice(1) - const hashPart = - hashEntries.length === 0 ? '' : `#${hashEntries.join('#')}` - const hashHref = `${pathPart}${searchPart}${hashPart}` - return parseHref(hashHref, win.history.state) + // `#/path?query#fragment`: the router's own fragment starts at the + // second '#'. A non-empty `location.hash` always starts with '#'. + const hash = win.location.hash + let hashIndex = hash.indexOf('#', 1) + if (hashIndex < 0) { + hashIndex = hash.length + } + return parseHref( + `${hash ? hash.slice(1, hashIndex) : '/'}${win.location.search}${hash.slice(hashIndex)}`, + win.history.state, + ) }, createHref: (href) => `${win.location.pathname}${win.location.search}#${href}`, @@ -753,17 +756,17 @@ export function parseHref( return { href: sanitizedHref, - pathname: sanitizedHref.substring( + pathname: sanitizedHref.slice( 0, - hashIndex > 0 - ? searchIndex > 0 + hashIndex > -1 + ? searchIndex > -1 ? Math.min(hashIndex, searchIndex) : hashIndex - : searchIndex > 0 + : searchIndex > -1 ? searchIndex : sanitizedHref.length, ), - hash: hashIndex > -1 ? sanitizedHref.substring(hashIndex) : '', + hash: hashIndex > -1 ? sanitizedHref.slice(hashIndex) : '', search: searchIndex > -1 ? sanitizedHref.slice( @@ -777,5 +780,5 @@ export function parseHref( // Thanks co-pilot! function createRandomKey() { - return (Math.random() + 1).toString(36).substring(7) + return (Math.random() + 1).toString(36).slice(7) } diff --git a/packages/history/tests/createHashHistory.test.ts b/packages/history/tests/createHashHistory.test.ts index 621cefe156..e54b1a1ae1 100644 --- a/packages/history/tests/createHashHistory.test.ts +++ b/packages/history/tests/createHashHistory.test.ts @@ -25,6 +25,32 @@ describe('createHashHistory', () => { }, ) + test('reads a hash route that starts with a query without leaking it into the pathname', () => { + const window = { + location: { pathname: '/', search: '', hash: '#?x=1' }, + history: { + state: { __TSR_index: 0, __TSR_key: 'initial' }, + length: 1, + pushState: vi.fn(), + replaceState: vi.fn(), + back: vi.fn(), + forward: vi.fn(), + go: vi.fn(), + }, + addEventListener: vi.fn(), + removeEventListener: vi.fn(), + } + const history = createHashHistory({ window }) + + expect(history.location).toMatchObject({ + href: '?x=1', + pathname: '', + search: '?x=1', + hash: '', + }) + history.destroy() + }) + test('normalizes the final browser href without changing the logical hash location', async () => { const pushState = vi.fn() const window = { @@ -59,6 +85,78 @@ describe('createHashHistory', () => { history.destroy() }) + test.each([ + [ + '/?shell=1#/hello#section#tail', + { + href: '/hello?shell=1#section#tail', + pathname: '/hello', + search: '?shell=1', + hash: '#section#tail', + }, + ], + [ + '/?shell=1#/hello?route=2#section', + { + href: '/hello?route=2?shell=1#section', + pathname: '/hello', + search: '?route=2?shell=1', + hash: '#section', + }, + ], + [ + '/#/hello##tail#', + { + href: '/hello##tail#', + pathname: '/hello', + search: '', + hash: '##tail#', + }, + ], + [ + '/#/hello%23nested?value=%23#anchor%23tail', + { + href: '/hello%23nested?value=%23#anchor%23tail', + pathname: '/hello%23nested', + search: '?value=%23', + hash: '#anchor%23tail', + }, + ], + [ + '/?shell=1#//evil.example/path#fragment', + { + href: '/evil.example/path?shell=1#fragment', + pathname: '/evil.example/path', + search: '?shell=1', + hash: '#fragment', + }, + ], + [ + '/?shell=1#', + { + href: '/?shell=1', + pathname: '/', + search: '?shell=1', + hash: '', + }, + ], + ])('preserves the logical URL when reading %s', (href, expected) => { + const originalHref = window.location.href + const originalState = window.history.state + window.history.replaceState(null, '', href) + const history = createHashHistory() + + try { + expect(history.location).toMatchObject(expected) + window.history.replaceState(window.history.state, '', '/shell') + window.history.pushState(window.history.state, '', href) + expect(history.location).toMatchObject(expected) + } finally { + history.destroy() + window.history.replaceState(originalState, '', originalHref) + } + }) + describe('parseLocation', () => { describe.each([ ['/', { pathname: '/', search: '' }, 'neither search params nor hash'], diff --git a/packages/history/tests/parseHref.test.ts b/packages/history/tests/parseHref.test.ts index 10df49d330..aa6882e6fc 100644 --- a/packages/history/tests/parseHref.test.ts +++ b/packages/history/tests/parseHref.test.ts @@ -21,6 +21,18 @@ describe('parseHref', () => { expect(parsed.hash).toEqual('#qux') }) + test.each([ + ['?x=1', { pathname: '', search: '?x=1', hash: '' }], + ['#top', { pathname: '', search: '', hash: '#top' }], + ['?x=1#top', { pathname: '', search: '?x=1', hash: '#top' }], + ['#top?x=1', { pathname: '', search: '', hash: '#top?x=1' }], + ])( + 'keeps a leading query or fragment out of the pathname: %j', + (href, expected) => { + expect(parseHref(href, undefined)).toMatchObject({ href, ...expected }) + }, + ) + test.each([ { __TSR_index: 2 }, { __TSR_index: 2, key: 'legacy-key', __TSR_key: 'current-key' }, diff --git a/packages/router-core/src/new-process-route-tree.ts b/packages/router-core/src/new-process-route-tree.ts index df1e224e82..fd63889df2 100644 --- a/packages/router-core/src/new-process-route-tree.ts +++ b/packages/router-core/src/new-process-route-tree.ts @@ -60,11 +60,11 @@ export function parseSegment( /** The next slash, or the length of the path. */ end: number, ): InterpolationSegment { - const part = path.substring(start, end) + const part = path.slice(start, end) if (part.charCodeAt(0) === 36) { return part.length === 1 ? [SEGMENT_TYPE_WILDCARD, '_splat', '', undefined] - : [SEGMENT_TYPE_PARAM, part.substring(1), '', ''] + : [SEGMENT_TYPE_PARAM, part.slice(1), '', ''] } const open = part.indexOf('{') if (open >= 0) { @@ -76,7 +76,7 @@ export function parseSegment( part.charCodeAt(nameStart - 1) === 36 && (!optional || nameStart < close) ) { - const key = part.substring(nameStart, close) + const key = part.slice(nameStart, close) return [ optional ? SEGMENT_TYPE_OPTIONAL_PARAM @@ -84,8 +84,8 @@ export function parseSegment( ? SEGMENT_TYPE_PARAM : SEGMENT_TYPE_WILDCARD, key || '_splat', - part.substring(0, open), - path.substring(start + close + 1, key ? end : path.length), + part.slice(0, open), + path.slice(start + close + 1, key ? end : path.length), ] } } @@ -193,7 +193,7 @@ export function parseSegments( if (interpolation && literalStart < end) { // Retain original spelling before matcher case folding. if (literalStart < start - 1) { - interpolation.push(path.substring(literalStart, start - 1)) + interpolation.push(path.slice(literalStart, start - 1)) } segment[2 /* prefix */] = '/' + prefix if ( @@ -253,7 +253,7 @@ export function parseSegments( } if (interpolation && literalStart < literalEnd) { - interpolation.push(path.substring(literalStart, literalEnd)) + interpolation.push(path.slice(literalStart, literalEnd)) } // Discard push()'s spare capacity before retaining this array on both owners. const segmentData = interpolation?.slice() diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index a70df71652..d3379a85f2 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -1926,10 +1926,8 @@ export class RouterCore< usedCurrent = true return currentLocation } - const currentMatch = () => { - usedCurrent = true - return (lightweight ??= this.matchRoutesLightweight(currentLocation)) - } + const currentMatch = () => + (lightweight ??= this.matchRoutesLightweight(current())) // check that from path exists in the current route tree // do this check only on navigations during test or development diff --git a/packages/router-core/src/searchParams.ts b/packages/router-core/src/searchParams.ts index 926e4e53dd..19155586e8 100644 --- a/packages/router-core/src/searchParams.ts +++ b/packages/router-core/src/searchParams.ts @@ -27,7 +27,7 @@ export function parseSearchWith(parser: (str: string) => any) { const isJsonParser = parser === JSON.parse return (searchStr: string): AnySchema => { if (searchStr[0] === '?') { - searchStr = searchStr.substring(1) + searchStr = searchStr.slice(1) } const query: Record = decode(searchStr) diff --git a/packages/router-core/tests/history-normalization.test.ts b/packages/router-core/tests/history-normalization.test.ts index 3d0bf8fbbc..b862a35b7d 100644 --- a/packages/router-core/tests/history-normalization.test.ts +++ b/packages/router-core/tests/history-normalization.test.ts @@ -190,4 +190,26 @@ describe('history normalization boundaries', () => { } }, ) + + test('reads a hash route that starts with a query once', async () => { + window.history.replaceState(null, '', '/shell#?x=1') + const history = createHashHistory() + try { + const root = new BaseRootRoute() + const index = new BaseRoute({ getParentRoute: () => root, path: '/' }) + const router = createTestRouter({ + routeTree: root.addChildren([index]), + history, + isServer: false, + }) + await router.load() + expect(router.state.location.search).toEqual({ x: 1 }) + // The query must not also be read as part of the pathname. + expect(router.state.location.href).toMatch(/^\/?\?x=1$/) + expect(router.state.matches.at(-1)?.routeId).toBe(index.id) + } finally { + history.destroy() + window.history.replaceState(null, '', '/') + } + }) }) From 2741b159af279ce6db14c5e85aa8671ddbed1b9e Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 4 Oct 2026 19:25:58 +0200 Subject: [PATCH 083/175] test(benchmarks): add a client-nav scenario for departing, staying and mounting Links (#8604) * test(benchmarks): add a client-nav scenario for departing, staying and mounting Links Co-Authored-By: Claude Opus 5.5 * test(benchmarks): size link-churn to 60 staying and 200 departing Links Co-Authored-By: Claude Opus 5.5 * test(benchmarks): halve link-churn to 30 staying and 100 departing Links Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- benchmarks/client-nav/README.md | 1 + benchmarks/client-nav/package.json | 6 + .../scenarios/link-churn/react/project.json | 40 ++++ .../scenarios/link-churn/react/setup.ts | 18 ++ .../scenarios/link-churn/react/speed.bench.ts | 32 ++++ .../scenarios/link-churn/react/speed.flame.ts | 18 ++ .../scenarios/link-churn/react/src/main.tsx | 37 ++++ .../link-churn/react/src/routeTree.gen.ts | 121 ++++++++++++ .../link-churn/react/src/routes/__root.tsx | 39 ++++ .../react/src/routes/hub.detail.$id.tsx | 21 +++ .../link-churn/react/src/routes/hub.list.tsx | 65 +++++++ .../link-churn/react/src/routes/hub.tsx | 64 +++++++ .../link-churn/react/src/routes/other.tsx | 14 ++ .../scenarios/link-churn/react/tsconfig.json | 21 +++ .../scenarios/link-churn/react/vite.config.ts | 42 +++++ .../client-nav/scenarios/link-churn/shared.ts | 178 ++++++++++++++++++ .../scenarios/link-churn/solid/project.json | 40 ++++ .../scenarios/link-churn/solid/setup.ts | 18 ++ .../scenarios/link-churn/solid/speed.bench.ts | 32 ++++ .../scenarios/link-churn/solid/speed.flame.ts | 18 ++ .../scenarios/link-churn/solid/src/main.tsx | 34 ++++ .../link-churn/solid/src/routeTree.gen.ts | 121 ++++++++++++ .../link-churn/solid/src/routes/__root.tsx | 39 ++++ .../solid/src/routes/hub.detail.$id.tsx | 24 +++ .../link-churn/solid/src/routes/hub.list.tsx | 68 +++++++ .../link-churn/solid/src/routes/hub.tsx | 67 +++++++ .../link-churn/solid/src/routes/other.tsx | 14 ++ .../scenarios/link-churn/solid/tsconfig.json | 21 +++ .../scenarios/link-churn/solid/vite.config.ts | 50 +++++ .../scenarios/link-churn/vue/project.json | 40 ++++ .../scenarios/link-churn/vue/setup.ts | 18 ++ .../scenarios/link-churn/vue/speed.bench.ts | 32 ++++ .../scenarios/link-churn/vue/speed.flame.ts | 18 ++ .../scenarios/link-churn/vue/src/main.tsx | 41 ++++ .../link-churn/vue/src/routeTree.gen.ts | 121 ++++++++++++ .../link-churn/vue/src/routes/__root.tsx | 46 +++++ .../vue/src/routes/hub.detail.$id.tsx | 27 +++ .../link-churn/vue/src/routes/hub.list.tsx | 74 ++++++++ .../link-churn/vue/src/routes/hub.tsx | 69 +++++++ .../link-churn/vue/src/routes/other.tsx | 17 ++ .../scenarios/link-churn/vue/tsconfig.json | 21 +++ .../scenarios/link-churn/vue/vite.config.ts | 44 +++++ 42 files changed, 1831 insertions(+) create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/project.json create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/setup.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/speed.bench.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/speed.flame.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/src/main.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/src/routeTree.gen.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/src/routes/__root.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.detail.$id.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.list.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/src/routes/other.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/tsconfig.json create mode 100644 benchmarks/client-nav/scenarios/link-churn/react/vite.config.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/shared.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/project.json create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/setup.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/speed.bench.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/speed.flame.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/src/main.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/src/routeTree.gen.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/src/routes/__root.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.detail.$id.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.list.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/src/routes/other.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/tsconfig.json create mode 100644 benchmarks/client-nav/scenarios/link-churn/solid/vite.config.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/project.json create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/setup.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/speed.bench.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/speed.flame.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/src/main.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/src/routeTree.gen.ts create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/src/routes/__root.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.detail.$id.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.list.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/src/routes/other.tsx create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/tsconfig.json create mode 100644 benchmarks/client-nav/scenarios/link-churn/vue/vite.config.ts diff --git a/benchmarks/client-nav/README.md b/benchmarks/client-nav/README.md index b49bc02376..ab09596200 100644 --- a/benchmarks/client-nav/README.md +++ b/benchmarks/client-nav/README.md @@ -59,6 +59,7 @@ be attributed to a specific feature area. | `head` | `HeadContent` per-navigation work: nested route `head()` evaluation, title/meta/link dedupe across matches, and head tag DOM updates during navigation. | | `history` | History push/replace/back/forward traversal, location masking, registered-but-never-blocking `useBlocker`, and `useCanGoBack`/`useLocation` subscriptions. | | `hydration` | Initial DOM hydration: execute the SSR payload, restore `beforeLoad` context and loader data, and hydrate 192 ordinary and eight hash-sensitive Links through their follow-up effects in React and Solid. | +| `link-churn` | Links that depart, stay and mount: 30 `/hub` layout Links stay while 100 `/hub/list` leaf Links leave (alone, or with the layout to `/other`) and remount on return; a search-only change rebuilds updater and `to="."` Links. Unlike `links`, whose root-layout Links never depart. | | `links` | Per-navigation cost of ~200 mounted ``s: link prop building, active-state recompute across `activeOptions` variants, `activeProps` swaps, and `useMatchRoute` probes (the `MatchRoute` component is avoided: vue-router's implementation leaks one subscription per render). | | `loaders` | Client loader dispatch: always-stale re-runs (`staleTime: 0`), cached revisits (re-run once per lap by the `invalidate` step), `loaderDeps`-keyed caching, `router.invalidate()`, and `useLoaderData` selectors. | | `mount` | Cold start: `createRouter` (route-tree processing) + first render + initial `router.load()` + unmount, with a fresh router per mount. | diff --git a/benchmarks/client-nav/package.json b/benchmarks/client-nav/package.json index 1aadf1e07c..bc2eb66c4c 100644 --- a/benchmarks/client-nav/package.json +++ b/benchmarks/client-nav/package.json @@ -65,6 +65,7 @@ "@benchmarks/client-nav-head-react", "@benchmarks/client-nav-history-react", "@benchmarks/client-nav-hydration-react", + "@benchmarks/client-nav-link-churn-react", "@benchmarks/client-nav-links-react", "@benchmarks/client-nav-loaders-react", "@benchmarks/client-nav-mount-react", @@ -94,6 +95,7 @@ "@benchmarks/client-nav-head-solid", "@benchmarks/client-nav-history-solid", "@benchmarks/client-nav-hydration-solid", + "@benchmarks/client-nav-link-churn-solid", "@benchmarks/client-nav-links-solid", "@benchmarks/client-nav-loaders-solid", "@benchmarks/client-nav-mount-solid", @@ -122,6 +124,7 @@ "@benchmarks/client-nav-control-flow-vue", "@benchmarks/client-nav-head-vue", "@benchmarks/client-nav-history-vue", + "@benchmarks/client-nav-link-churn-vue", "@benchmarks/client-nav-links-vue", "@benchmarks/client-nav-loaders-vue", "@benchmarks/client-nav-mount-vue", @@ -205,8 +208,11 @@ "@benchmarks/client-nav-history-vue", "@benchmarks/client-nav-hydration-react", "@benchmarks/client-nav-hydration-solid", + "@benchmarks/client-nav-link-churn-react", "@benchmarks/client-nav-links-react", + "@benchmarks/client-nav-link-churn-solid", "@benchmarks/client-nav-links-solid", + "@benchmarks/client-nav-link-churn-vue", "@benchmarks/client-nav-links-vue", "@benchmarks/client-nav-loaders-react", "@benchmarks/client-nav-loaders-solid", diff --git a/benchmarks/client-nav/scenarios/link-churn/react/project.json b/benchmarks/client-nav/scenarios/link-churn/react/project.json new file mode 100644 index 0000000000..1606b2c456 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/project.json @@ -0,0 +1,40 @@ +{ + "name": "@benchmarks/client-nav-link-churn-react", + "projectType": "application", + "targets": { + "build:client": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": [ + { + "projects": ["@tanstack/react-router", "@tanstack/router-plugin"], + "target": "build" + } + ], + "options": { + "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts" + } + }, + "test:types:client": { + "executor": "nx:run-commands", + "dependsOn": [ + { + "projects": ["@tanstack/react-router", "@tanstack/router-plugin"], + "target": "build" + } + ], + "options": { + "command": "tsc -p {projectRoot}/tsconfig.json --noEmit" + } + }, + "test:flame": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": ["build:client"], + "options": { + "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/link-churn/react/speed.flame.ts", + "cwd": "benchmarks/client-nav" + } + } + } +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/setup.ts b/benchmarks/client-nav/scenarios/link-churn/react/setup.ts new file mode 100644 index 0000000000..59221603da --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/setup.ts @@ -0,0 +1,18 @@ +import { createScenarioSetup } from '../../harness' +import { assertStepResult, initialUrl, scenarioSteps } from '../shared' +import type * as App from './src/main' + +const appModulePath = './dist/app.js' +const { mountTestApp } = (await import( + /* @vite-ignore */ appModulePath +)) as typeof App + +export function setup() { + return createScenarioSetup({ + frameworkLabel: 'React', + mount: mountTestApp, + steps: scenarioSteps, + assertAfterStep: assertStepResult, + initialUrl, + }) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/speed.bench.ts b/benchmarks/client-nav/scenarios/link-churn/react/speed.bench.ts new file mode 100644 index 0000000000..05197319b8 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/speed.bench.ts @@ -0,0 +1,32 @@ +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { benchOptions, ticksPerIteration } from '../shared' +import { setup } from './setup' + +describe('client-link-churn', () => { + const test = setup() + + /** + * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` + * and `teardown` options below. CodSpeed bypasses those options but supports + * `beforeEach` and `afterEach`. Only one lifecycle path runs in either + * environment, and every measured invocation receives fresh application state. + */ + + beforeEach(test.before) + afterEach(test.after) + + bench( + 'client-link-churn navigation loop (react)', + async () => { + for (let i = 0; i < ticksPerIteration; i++) { + await test.tick() + } + await test.finishBatch() + }, + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/react/speed.flame.ts b/benchmarks/client-nav/scenarios/link-churn/react/speed.flame.ts new file mode 100644 index 0000000000..f4a0b4e6ff --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/speed.flame.ts @@ -0,0 +1,18 @@ +import { window } from '../../../jsdom.ts' +import { setup } from './setup.ts' + +const DURATION_MS = 10_000 + +const test = setup() + +try { + await test.before() + + const startedAt = performance.now() + while (performance.now() - startedAt < DURATION_MS) { + await test.tick() + } +} finally { + test.after() + window.close() +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/main.tsx b/benchmarks/client-nav/scenarios/link-churn/react/src/main.tsx new file mode 100644 index 0000000000..5febd6f795 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/main.tsx @@ -0,0 +1,37 @@ +import type { RouterHistory } from '@tanstack/history' +import { RouterProvider, createRouter } from '@tanstack/react-router' +import { createRoot } from 'react-dom/client' +import { routeTree } from './routeTree.gen' + +export function createTestRouter(history: RouterHistory) { + return createRouter({ + routeTree, + history, + scrollRestoration: true, + // Key the scroll-restoration cache by pathname instead of the default + // random per-entry location key: with push navigations the default mints + // a fresh key per navigation and the module-level cache grows one entry + // per push for the whole run, which is non-stationary. + getScrollRestorationKey: (location) => location.pathname, + }) +} + +declare module '@tanstack/react-router' { + interface Register { + router: ReturnType + } +} + +export function mountTestApp(container: HTMLElement, history: RouterHistory) { + const router = createTestRouter(history) + + const reactRoot = createRoot(container) + reactRoot.render() + + return { + router, + unmount() { + reactRoot.unmount() + }, + } +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/link-churn/react/src/routeTree.gen.ts new file mode 100644 index 0000000000..4535430b61 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/routeTree.gen.ts @@ -0,0 +1,121 @@ +/* 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 HubRouteImport } from './routes/hub' +import { Route as OtherRouteImport } from './routes/other' +import { Route as HubListRouteImport } from './routes/hub.list' +import { Route as HubDetailIdRouteImport } from './routes/hub.detail.$id' + +const HubRoute = HubRouteImport.update({ + id: '/hub', + path: '/hub', + getParentRoute: () => rootRouteImport, +} as any) +const OtherRoute = OtherRouteImport.update({ + id: '/other', + path: '/other', + getParentRoute: () => rootRouteImport, +} as any) +const HubListRoute = HubListRouteImport.update({ + id: '/list', + path: '/list', + getParentRoute: () => HubRoute, +} as any) +const HubDetailIdRoute = HubDetailIdRouteImport.update({ + id: '/detail/$id', + path: '/detail/$id', + getParentRoute: () => HubRoute, +} as any) + +export interface FileRoutesByFullPath { + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRoutesByTo { + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + fileRoutesByTo: FileRoutesByTo + to: '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + id: '__root__' | '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + HubRoute: typeof HubRouteWithChildren + OtherRoute: typeof OtherRoute +} + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/hub': { + id: '/hub' + path: '/hub' + fullPath: '/hub' + preLoaderRoute: typeof HubRouteImport + parentRoute: typeof rootRouteImport + } + '/other': { + id: '/other' + path: '/other' + fullPath: '/other' + preLoaderRoute: typeof OtherRouteImport + parentRoute: typeof rootRouteImport + } + '/hub/list': { + id: '/hub/list' + path: '/list' + fullPath: '/hub/list' + preLoaderRoute: typeof HubListRouteImport + parentRoute: typeof HubRoute + } + '/hub/detail/$id': { + id: '/hub/detail/$id' + path: '/detail/$id' + fullPath: '/hub/detail/$id' + preLoaderRoute: typeof HubDetailIdRouteImport + parentRoute: typeof HubRoute + } + } +} + +interface HubRouteChildren { + HubListRoute: typeof HubListRoute + HubDetailIdRoute: typeof HubDetailIdRoute +} + +const HubRouteChildren: HubRouteChildren = { + HubListRoute: HubListRoute, + HubDetailIdRoute: HubDetailIdRoute, +} + +const HubRouteWithChildren = HubRoute._addFileChildren(HubRouteChildren) + +const rootRouteChildren: RootRouteChildren = { + HubRoute: HubRouteWithChildren, + OtherRoute: OtherRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/__root.tsx new file mode 100644 index 0000000000..199cf1ff73 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/__root.tsx @@ -0,0 +1,39 @@ +import { Link, Outlet, createRootRoute } from '@tanstack/react-router' +import { sortedSearch } from '../../../shared' + +export const Route = createRootRoute({ + component: RootComponent, +}) + +function RootComponent() { + return ( + <> + + + + ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.detail.$id.tsx b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.detail.$id.tsx new file mode 100644 index 0000000000..143cb39a7a --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.detail.$id.tsx @@ -0,0 +1,21 @@ +import { Link, createFileRoute } from '@tanstack/react-router' +import { detailMarker } from '../../../shared' + +export const Route = createFileRoute('/hub/detail/$id')({ + component: DetailPage, +}) + +function DetailPage() { + const params = Route.useParams() + + return ( +
+

{detailMarker(params.id)}

+ Back to list + + Next + + Elsewhere +
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.list.tsx b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.list.tsx new file mode 100644 index 0000000000..5aa37b20a7 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.list.tsx @@ -0,0 +1,65 @@ +import { Link, createFileRoute } from '@tanstack/react-router' +import { + listItemIds, + listMarker, + listRelativeTestId, + listSortedMarker, +} from '../../../shared' + +export const Route = createFileRoute('/hub/list')({ + component: ListPage, +}) + +const ascSearch = { sort: 'asc' } as const + +// List Links depart whenever the list leaf is left. +function ListLinks() { + return ( +
    + {listItemIds.map((id) => { + const page = Number(id) + return ( +
  • + + {`Item ${id}`} + + + {`Item ${id} asc`} + + + {`Item ${id} exact`} + + ({ ...prev, page })}> + {`Page ${id}`} + + ({ ...prev, page, sort: 'asc' as const })} + data-testid={id === '1' ? listRelativeTestId : undefined} + > + {`Page ${id} asc`} + +
  • + ) + })} +
+ ) +} + +function ListPage() { + const sort = Route.useSearch({ select: (search) => search.sort }) + + return ( +
+

+ {sort === 'desc' ? listSortedMarker : listMarker} +

+ +
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.tsx b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.tsx new file mode 100644 index 0000000000..ac12eae2da --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.tsx @@ -0,0 +1,64 @@ +import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { + hubItemIds, + hubRelativeTestId, + validateHubSearch, +} from '../../../shared' + +export const Route = createFileRoute('/hub')({ + validateSearch: validateHubSearch, + component: HubLayout, +}) + +// Layout Links stay mounted while the hub leaves change. +function HubLinks() { + return ( +
+ {hubItemIds.map((id) => { + const page = Number(id) + return ( +
+ + {`Detail ${id}`} + + + {`Detail ${id} exact`} + + + {`List page ${id}`} + + ({ ...prev, page })}> + {`List keep ${id}`} + + ({ ...prev, page })} + data-testid={id === '1' ? hubRelativeTestId : undefined} + > + {`Here page ${id}`} + +
+ ) + })} +
+ ) +} + +function HubLayout() { + return ( +
+ + +
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/other.tsx b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/other.tsx new file mode 100644 index 0000000000..1f146b789f --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/src/routes/other.tsx @@ -0,0 +1,14 @@ +import { createFileRoute } from '@tanstack/react-router' +import { otherMarker } from '../../../shared' + +export const Route = createFileRoute('/other')({ + component: OtherPage, +}) + +function OtherPage() { + return ( +
+

{otherMarker}

+
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/tsconfig.json b/benchmarks/client-nav/scenarios/link-churn/react/tsconfig.json new file mode 100644 index 0000000000..1d59cbb450 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/tsconfig.json @@ -0,0 +1,21 @@ +{ + "extends": "../../../../../tsconfig.json", + "compilerOptions": { + "jsx": "react-jsx", + "jsxImportSource": "react", + "allowImportingTsExtensions": true, + "types": ["node", "vite/client", "vitest/globals"] + }, + "include": [ + "speed.bench.ts", + "speed.flame.ts", + "setup.ts", + "vite.config.ts", + "../shared.ts", + "../../harness.ts", + "../../../setup-helpers.ts", + "../../../jsdom.ts", + "../../../vitest.setup.ts", + "./src/**/*" + ] +} diff --git a/benchmarks/client-nav/scenarios/link-churn/react/vite.config.ts b/benchmarks/client-nav/scenarios/link-churn/react/vite.config.ts new file mode 100644 index 0000000000..344974ebf9 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/react/vite.config.ts @@ -0,0 +1,42 @@ +import { fileURLToPath } from 'node:url' +import { defineConfig } from 'vitest/config' +import react from '@vitejs/plugin-react' +import codspeedPlugin from '@codspeed/vitest-plugin' +import { tanstackRouter } from '@tanstack/router-plugin/vite' +import { cpuSimulationExecArgv } from '../../../../cpu-simulation' + +const rootDir = fileURLToPath(new URL('.', import.meta.url)) + +export default defineConfig({ + root: rootDir, + define: { + 'process.env.NODE_ENV': JSON.stringify('production'), + }, + plugins: [ + !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) && + codspeedPlugin(), + tanstackRouter({ + target: 'react', + routesDirectory: `${rootDir}src/routes`, + generatedRouteTree: `${rootDir}src/routeTree.gen.ts`, + }), + react(), + ], + build: { + outDir: './dist', + emptyOutDir: true, + minify: false, + lib: { + entry: './src/main.tsx', + formats: ['es'], + fileName: 'app', + }, + }, + test: { + execArgv: cpuSimulationExecArgv(), + name: '@benchmarks/client-nav link-churn (react)', + watch: false, + environment: 'jsdom', + setupFiles: ['../../../vitest.setup.ts'], + }, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/shared.ts b/benchmarks/client-nav/scenarios/link-churn/shared.ts new file mode 100644 index 0000000000..d936af35cc --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/shared.ts @@ -0,0 +1,178 @@ +/** + * Shared definition of the `link-churn` scenario: Links that leave, stay and + * arrive across navigations. A `/hub` layout renders Links that stay mounted + * while its leaves change; the `/hub/list` leaf renders Links that depart when + * leaving it and mount again when returning; `/other` sits outside the layout + * so leaving the list there unmounts layout and leaf Links together. The + * existing `links` scenario keeps all its Links in the root layout, so none of + * them ever departs or remounts. The three framework apps consume these + * constants so the workload is identical modulo the rendering layer. + */ +import type { ScenarioStep } from '../harness' + +// Layout (staying) Links: HUB_ITEM_COUNT ids x 5 variants. +export const HUB_ITEM_COUNT = 6 +// List leaf (departing) Links: LIST_ITEM_COUNT ids x 5 variants. +export const LIST_ITEM_COUNT = 20 + +const ids = (count: number) => + Array.from({ length: count }, (_, index) => String(index + 1)) + +export const hubItemIds = ids(HUB_ITEM_COUNT) +export const listItemIds = ids(LIST_ITEM_COUNT) + +export interface HubSearch { + page?: number + sort?: 'asc' | 'desc' +} + +/** Search validation of the `/hub` layout, inherited by its leaves. */ +export function validateHubSearch(search: Record): HubSearch { + const result: HubSearch = {} + if (typeof search.page === 'number') { + result.page = search.page + } + if (search.sort === 'asc' || search.sort === 'desc') { + result.sort = search.sort + } + return result +} + +export const sortedSearch = { sort: 'desc' } as const + +export function detailMarker(id: string) { + return `detail-${id}` +} + +export const listMarker = 'list' +export const listSortedMarker = 'list-desc' +export const otherMarker = 'other' + +// Sampled Links whose href depends on the current location: the first layout +// `to="."` updater Link and the first list `to="."` updater Link. +export const hubRelativeTestId = 'hub-relative-1' +export const listRelativeTestId = 'list-relative-1' + +interface StepDef { + testId: string + marker: string + /** Expected number of `.active-link` elements after the step. */ + activeCount: number + /** Expected href of the sampled layout updater Link (null: not mounted). */ + hubRelativeHref: string | null + /** Expected href of the sampled list updater Link (null: not mounted). */ + listRelativeHref: string | null +} + +// On the list, every layout `includeSearch: false` Link to the list is active. +const listActiveCount = HUB_ITEM_COUNT + +export const stepDefs: ReadonlyArray = [ + // 1. list -> detail/1: list Links depart, layout Links stay and update. + { + testId: 'go-detail-1', + marker: detailMarker('1'), + activeCount: 1, + hubRelativeHref: '/hub/detail/1?page=1', + listRelativeHref: null, + }, + // 2. detail/1 -> detail/2: same route, new param; every Link stays. + { + testId: 'go-detail-2', + marker: detailMarker('2'), + activeCount: 1, + hubRelativeHref: '/hub/detail/2?page=1', + listRelativeHref: null, + }, + // 3. detail/2 -> list: list Links mount. + { + testId: 'go-list', + marker: listMarker, + activeCount: listActiveCount, + hubRelativeHref: '/hub/list?page=1', + listRelativeHref: '/hub/list?page=1&sort=asc', + }, + // 4. list -> other: layout and list Links depart together. + { + testId: 'go-other', + marker: otherMarker, + activeCount: 0, + hubRelativeHref: null, + listRelativeHref: null, + }, + // 5. other -> list: layout and list Links all mount. + { + testId: 'go-list', + marker: listMarker, + activeCount: listActiveCount, + hubRelativeHref: '/hub/list?page=1', + listRelativeHref: '/hub/list?page=1&sort=asc', + }, + // 6a. list -> list?sort=desc: nothing departs, updater Links rebuild. + { + testId: 'go-list-sorted', + marker: listSortedMarker, + activeCount: listActiveCount, + hubRelativeHref: '/hub/list?sort=desc&page=1', + listRelativeHref: '/hub/list?sort=asc&page=1', + }, + // 6b. back to the plain list so the lap ends on the initial location. + { + testId: 'go-list', + marker: listMarker, + activeCount: listActiveCount, + hubRelativeHref: '/hub/list?page=1', + listRelativeHref: '/hub/list?page=1&sort=asc', + }, +] + +export const initialUrl = '/hub/list' + +export const scenarioSteps: ReadonlyArray = stepDefs.map( + (step) => step.testId, +) + +function assertHref( + container: HTMLElement, + testId: string, + expected: string | null, + stepIndex: number, +) { + const link = container.querySelector(`[data-testid="${testId}"]`) + const href = link ? link.getAttribute('href') : null + if (href !== expected) { + throw new Error( + `Expected "${testId}" href ${JSON.stringify(expected)} after step ${stepIndex}, received ${JSON.stringify(href)}`, + ) + } +} + +export function assertStepResult(stepIndex: number, container: HTMLElement) { + const step = stepDefs[stepIndex]! + + const marker = container.querySelector('[data-testid="page-state"]') + if (marker?.textContent !== step.marker) { + throw new Error( + `Expected page marker "${step.marker}" after step ${stepIndex}, received "${marker?.textContent}"`, + ) + } + + const activeLinks = container.querySelectorAll('a.active-link') + if (activeLinks.length !== step.activeCount) { + throw new Error( + `Expected ${step.activeCount} active link(s) after step ${stepIndex}, received ${activeLinks.length}`, + ) + } + + assertHref(container, hubRelativeTestId, step.hubRelativeHref, stepIndex) + assertHref(container, listRelativeTestId, step.listRelativeHref, stepIndex) +} + +// One lap through the 7-step sequence per benchmark iteration. +export const ticksPerIteration = stepDefs.length + +export const benchOptions = { + warmupIterations: 50, + time: 10_000, + throws: true, +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/project.json b/benchmarks/client-nav/scenarios/link-churn/solid/project.json new file mode 100644 index 0000000000..4e46143b32 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/project.json @@ -0,0 +1,40 @@ +{ + "name": "@benchmarks/client-nav-link-churn-solid", + "projectType": "application", + "targets": { + "build:client": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": [ + { + "projects": ["@tanstack/solid-router", "@tanstack/router-plugin"], + "target": "build" + } + ], + "options": { + "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts" + } + }, + "test:types:client": { + "executor": "nx:run-commands", + "dependsOn": [ + { + "projects": ["@tanstack/solid-router", "@tanstack/router-plugin"], + "target": "build" + } + ], + "options": { + "command": "tsc -p {projectRoot}/tsconfig.json --noEmit" + } + }, + "test:flame": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": ["build:client"], + "options": { + "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/link-churn/solid/speed.flame.ts", + "cwd": "benchmarks/client-nav" + } + } + } +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/setup.ts b/benchmarks/client-nav/scenarios/link-churn/solid/setup.ts new file mode 100644 index 0000000000..a2a024341d --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/setup.ts @@ -0,0 +1,18 @@ +import { createScenarioSetup } from '../../harness' +import { assertStepResult, initialUrl, scenarioSteps } from '../shared' +import type * as App from './src/main' + +const appModulePath = './dist/app.js' +const { mountTestApp } = (await import( + /* @vite-ignore */ appModulePath +)) as typeof App + +export function setup() { + return createScenarioSetup({ + frameworkLabel: 'Solid', + mount: mountTestApp, + steps: scenarioSteps, + assertAfterStep: assertStepResult, + initialUrl, + }) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/link-churn/solid/speed.bench.ts new file mode 100644 index 0000000000..9efdb6e3f8 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/speed.bench.ts @@ -0,0 +1,32 @@ +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { benchOptions, ticksPerIteration } from '../shared' +import { setup } from './setup' + +describe('client-link-churn', () => { + const test = setup() + + /** + * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` + * and `teardown` options below. CodSpeed bypasses those options but supports + * `beforeEach` and `afterEach`. Only one lifecycle path runs in either + * environment, and every measured invocation receives fresh application state. + */ + + beforeEach(test.before) + afterEach(test.after) + + bench( + 'client-link-churn navigation loop (solid)', + async () => { + for (let i = 0; i < ticksPerIteration; i++) { + await test.tick() + } + await test.finishBatch() + }, + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/speed.flame.ts b/benchmarks/client-nav/scenarios/link-churn/solid/speed.flame.ts new file mode 100644 index 0000000000..f4a0b4e6ff --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/speed.flame.ts @@ -0,0 +1,18 @@ +import { window } from '../../../jsdom.ts' +import { setup } from './setup.ts' + +const DURATION_MS = 10_000 + +const test = setup() + +try { + await test.before() + + const startedAt = performance.now() + while (performance.now() - startedAt < DURATION_MS) { + await test.tick() + } +} finally { + test.after() + window.close() +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/main.tsx b/benchmarks/client-nav/scenarios/link-churn/solid/src/main.tsx new file mode 100644 index 0000000000..fa9d239418 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/main.tsx @@ -0,0 +1,34 @@ +import type { RouterHistory } from '@tanstack/history' +import { render } from 'solid-js/web' +import { RouterProvider, createRouter } from '@tanstack/solid-router' +import { routeTree } from './routeTree.gen' + +export function createTestRouter(history: RouterHistory) { + return createRouter({ + routeTree, + history, + scrollRestoration: true, + // Key the scroll-restoration cache by pathname instead of the default + // random per-entry location key: with push navigations the default mints + // a fresh key per navigation and the module-level cache grows one entry + // per push for the whole run, which is non-stationary. + getScrollRestorationKey: (location) => location.pathname, + }) +} + +declare module '@tanstack/solid-router' { + interface Register { + router: ReturnType + } +} + +export function mountTestApp(container: HTMLElement, history: RouterHistory) { + const router = createTestRouter(history) + + const unmount = render(() => , container) + + return { + router, + unmount, + } +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/link-churn/solid/src/routeTree.gen.ts new file mode 100644 index 0000000000..e3cb546963 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/routeTree.gen.ts @@ -0,0 +1,121 @@ +/* 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 HubRouteImport } from './routes/hub' +import { Route as OtherRouteImport } from './routes/other' +import { Route as HubListRouteImport } from './routes/hub.list' +import { Route as HubDetailIdRouteImport } from './routes/hub.detail.$id' + +const HubRoute = HubRouteImport.update({ + id: '/hub', + path: '/hub', + getParentRoute: () => rootRouteImport, +} as any) +const OtherRoute = OtherRouteImport.update({ + id: '/other', + path: '/other', + getParentRoute: () => rootRouteImport, +} as any) +const HubListRoute = HubListRouteImport.update({ + id: '/list', + path: '/list', + getParentRoute: () => HubRoute, +} as any) +const HubDetailIdRoute = HubDetailIdRouteImport.update({ + id: '/detail/$id', + path: '/detail/$id', + getParentRoute: () => HubRoute, +} as any) + +export interface FileRoutesByFullPath { + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRoutesByTo { + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + fileRoutesByTo: FileRoutesByTo + to: '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + id: '__root__' | '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + HubRoute: typeof HubRouteWithChildren + OtherRoute: typeof OtherRoute +} + +declare module '@tanstack/solid-router' { + interface FileRoutesByPath { + '/hub': { + id: '/hub' + path: '/hub' + fullPath: '/hub' + preLoaderRoute: typeof HubRouteImport + parentRoute: typeof rootRouteImport + } + '/other': { + id: '/other' + path: '/other' + fullPath: '/other' + preLoaderRoute: typeof OtherRouteImport + parentRoute: typeof rootRouteImport + } + '/hub/list': { + id: '/hub/list' + path: '/list' + fullPath: '/hub/list' + preLoaderRoute: typeof HubListRouteImport + parentRoute: typeof HubRoute + } + '/hub/detail/$id': { + id: '/hub/detail/$id' + path: '/detail/$id' + fullPath: '/hub/detail/$id' + preLoaderRoute: typeof HubDetailIdRouteImport + parentRoute: typeof HubRoute + } + } +} + +interface HubRouteChildren { + HubListRoute: typeof HubListRoute + HubDetailIdRoute: typeof HubDetailIdRoute +} + +const HubRouteChildren: HubRouteChildren = { + HubListRoute: HubListRoute, + HubDetailIdRoute: HubDetailIdRoute, +} + +const HubRouteWithChildren = HubRoute._addFileChildren(HubRouteChildren) + +const rootRouteChildren: RootRouteChildren = { + HubRoute: HubRouteWithChildren, + OtherRoute: OtherRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/__root.tsx new file mode 100644 index 0000000000..a9de4ea356 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/__root.tsx @@ -0,0 +1,39 @@ +import { Link, Outlet, createRootRoute } from '@tanstack/solid-router' +import { sortedSearch } from '../../../shared' + +export const Route = createRootRoute({ + component: RootComponent, +}) + +function RootComponent() { + return ( + <> + + + + ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.detail.$id.tsx b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.detail.$id.tsx new file mode 100644 index 0000000000..7aca4a9935 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.detail.$id.tsx @@ -0,0 +1,24 @@ +import { Link, createFileRoute } from '@tanstack/solid-router' +import { detailMarker } from '../../../shared' + +export const Route = createFileRoute('/hub/detail/$id')({ + component: DetailPage, +}) + +function DetailPage() { + const params = Route.useParams() + + return ( +
+

{detailMarker(params().id)}

+ Back to list + + Next + + Elsewhere +
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.list.tsx b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.list.tsx new file mode 100644 index 0000000000..5796a50b02 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.list.tsx @@ -0,0 +1,68 @@ +import { For } from 'solid-js' +import { Link, createFileRoute } from '@tanstack/solid-router' +import { + listItemIds, + listMarker, + listRelativeTestId, + listSortedMarker, +} from '../../../shared' + +export const Route = createFileRoute('/hub/list')({ + component: ListPage, +}) + +const ascSearch = { sort: 'asc' } as const + +// List Links depart whenever the list leaf is left. +function ListLinks() { + return ( +
    + + {(id) => { + const page = Number(id) + return ( +
  • + + {`Item ${id}`} + + + {`Item ${id} asc`} + + + {`Item ${id} exact`} + + ({ ...prev, page })}> + {`Page ${id}`} + + ({ ...prev, page, sort: 'asc' as const })} + data-testid={id === '1' ? listRelativeTestId : undefined} + > + {`Page ${id} asc`} + +
  • + ) + }} +
    +
+ ) +} + +function ListPage() { + const sort = Route.useSearch({ select: (search) => search.sort }) + + return ( +
+

+ {sort() === 'desc' ? listSortedMarker : listMarker} +

+ +
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.tsx b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.tsx new file mode 100644 index 0000000000..4682f85aae --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.tsx @@ -0,0 +1,67 @@ +import { For } from 'solid-js' +import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { + hubItemIds, + hubRelativeTestId, + validateHubSearch, +} from '../../../shared' + +export const Route = createFileRoute('/hub')({ + validateSearch: validateHubSearch, + component: HubLayout, +}) + +// Layout Links stay mounted while the hub leaves change. +function HubLinks() { + return ( +
+ + {(id) => { + const page = Number(id) + return ( +
+ + {`Detail ${id}`} + + + {`Detail ${id} exact`} + + + {`List page ${id}`} + + ({ ...prev, page })}> + {`List keep ${id}`} + + ({ ...prev, page })} + data-testid={id === '1' ? hubRelativeTestId : undefined} + > + {`Here page ${id}`} + +
+ ) + }} +
+
+ ) +} + +function HubLayout() { + return ( +
+ + +
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/other.tsx b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/other.tsx new file mode 100644 index 0000000000..2606089113 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/other.tsx @@ -0,0 +1,14 @@ +import { createFileRoute } from '@tanstack/solid-router' +import { otherMarker } from '../../../shared' + +export const Route = createFileRoute('/other')({ + component: OtherPage, +}) + +function OtherPage() { + return ( +
+

{otherMarker}

+
+ ) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/tsconfig.json b/benchmarks/client-nav/scenarios/link-churn/solid/tsconfig.json new file mode 100644 index 0000000000..98d76ad6b8 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/tsconfig.json @@ -0,0 +1,21 @@ +{ + "extends": "../../../../../tsconfig.json", + "compilerOptions": { + "jsx": "preserve", + "jsxImportSource": "solid-js", + "allowImportingTsExtensions": true, + "types": ["node", "vite/client", "vitest/globals"] + }, + "include": [ + "speed.bench.ts", + "speed.flame.ts", + "setup.ts", + "vite.config.ts", + "../shared.ts", + "../../harness.ts", + "../../../setup-helpers.ts", + "../../../jsdom.ts", + "../../../vitest.setup.ts", + "./src/**/*" + ] +} diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/vite.config.ts b/benchmarks/client-nav/scenarios/link-churn/solid/vite.config.ts new file mode 100644 index 0000000000..37718a2d6a --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/solid/vite.config.ts @@ -0,0 +1,50 @@ +import { fileURLToPath } from 'node:url' +import { defineConfig } from 'vitest/config' +import solid from 'vite-plugin-solid' +import codspeedPlugin from '@codspeed/vitest-plugin' +import { tanstackRouter } from '@tanstack/router-plugin/vite' +import { cpuSimulationExecArgv } from '../../../../cpu-simulation' + +const rootDir = fileURLToPath(new URL('.', import.meta.url)) + +export default defineConfig({ + root: rootDir, + define: { + 'process.env.NODE_ENV': JSON.stringify('production'), + }, + plugins: [ + !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) && + codspeedPlugin(), + tanstackRouter({ + target: 'solid', + routesDirectory: `${rootDir}src/routes`, + generatedRouteTree: `${rootDir}src/routeTree.gen.ts`, + }), + solid({ hot: false, dev: false }), + ], + build: { + outDir: './dist', + emptyOutDir: true, + minify: false, + lib: { + entry: './src/main.tsx', + formats: ['es'], + fileName: 'app', + }, + }, + resolve: { + conditions: ['solid', 'browser'], + }, + test: { + execArgv: cpuSimulationExecArgv(), + name: '@benchmarks/client-nav link-churn (solid)', + watch: false, + environment: 'jsdom', + setupFiles: ['../../../vitest.setup.ts'], + server: { + deps: { + inline: [/@solidjs/, /@tanstack\/solid-store/], + }, + }, + }, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/project.json b/benchmarks/client-nav/scenarios/link-churn/vue/project.json new file mode 100644 index 0000000000..fb890ddfb8 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/project.json @@ -0,0 +1,40 @@ +{ + "name": "@benchmarks/client-nav-link-churn-vue", + "projectType": "application", + "targets": { + "build:client": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": [ + { + "projects": ["@tanstack/vue-router", "@tanstack/router-plugin"], + "target": "build" + } + ], + "options": { + "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts" + } + }, + "test:types:client": { + "executor": "nx:run-commands", + "dependsOn": [ + { + "projects": ["@tanstack/vue-router", "@tanstack/router-plugin"], + "target": "build" + } + ], + "options": { + "command": "tsc -p {projectRoot}/tsconfig.json --noEmit" + } + }, + "test:flame": { + "executor": "nx:run-commands", + "cache": false, + "dependsOn": ["build:client"], + "options": { + "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/link-churn/vue/speed.flame.ts", + "cwd": "benchmarks/client-nav" + } + } + } +} diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/setup.ts b/benchmarks/client-nav/scenarios/link-churn/vue/setup.ts new file mode 100644 index 0000000000..95cacb9ea8 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/setup.ts @@ -0,0 +1,18 @@ +import { createScenarioSetup } from '../../harness' +import { assertStepResult, initialUrl, scenarioSteps } from '../shared' +import type * as App from './src/main' + +const appModulePath = './dist/app.js' +const { mountTestApp } = (await import( + /* @vite-ignore */ appModulePath +)) as typeof App + +export function setup() { + return createScenarioSetup({ + frameworkLabel: 'Vue', + mount: mountTestApp, + steps: scenarioSteps, + assertAfterStep: assertStepResult, + initialUrl, + }) +} diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/link-churn/vue/speed.bench.ts new file mode 100644 index 0000000000..4fbbaf4ca0 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/speed.bench.ts @@ -0,0 +1,32 @@ +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { benchOptions, ticksPerIteration } from '../shared' +import { setup } from './setup' + +describe('client-link-churn', () => { + const test = setup() + + /** + * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` + * and `teardown` options below. CodSpeed bypasses those options but supports + * `beforeEach` and `afterEach`. Only one lifecycle path runs in either + * environment, and every measured invocation receives fresh application state. + */ + + beforeEach(test.before) + afterEach(test.after) + + bench( + 'client-link-churn navigation loop (vue)', + async () => { + for (let i = 0; i < ticksPerIteration; i++) { + await test.tick() + } + await test.finishBatch() + }, + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/speed.flame.ts b/benchmarks/client-nav/scenarios/link-churn/vue/speed.flame.ts new file mode 100644 index 0000000000..f4a0b4e6ff --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/speed.flame.ts @@ -0,0 +1,18 @@ +import { window } from '../../../jsdom.ts' +import { setup } from './setup.ts' + +const DURATION_MS = 10_000 + +const test = setup() + +try { + await test.before() + + const startedAt = performance.now() + while (performance.now() - startedAt < DURATION_MS) { + await test.tick() + } +} finally { + test.after() + window.close() +} diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/main.tsx b/benchmarks/client-nav/scenarios/link-churn/vue/src/main.tsx new file mode 100644 index 0000000000..cae9b54f1d --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/main.tsx @@ -0,0 +1,41 @@ +import type { RouterHistory } from '@tanstack/history' +import * as Vue from 'vue' +import { RouterProvider, createRouter } from '@tanstack/vue-router' +import { routeTree } from './routeTree.gen' + +export function createTestRouter(history: RouterHistory) { + return createRouter({ + routeTree, + history, + scrollRestoration: true, + // Key the scroll-restoration cache by pathname instead of the default + // random per-entry location key: with push navigations the default mints + // a fresh key per navigation and the module-level cache grows one entry + // per push for the whole run, which is non-stationary. + getScrollRestorationKey: (location) => location.pathname, + }) +} + +declare module '@tanstack/vue-router' { + interface Register { + router: ReturnType + } +} + +export function mountTestApp(container: HTMLElement, history: RouterHistory) { + const router = createTestRouter(history) + + const component = + const app = Vue.createApp({ + render: () => component, + }) + + app.mount(container) + + return { + router, + unmount() { + app.unmount() + }, + } +} diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/link-churn/vue/src/routeTree.gen.ts new file mode 100644 index 0000000000..9327bbc01d --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/routeTree.gen.ts @@ -0,0 +1,121 @@ +/* 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 HubRouteImport } from './routes/hub' +import { Route as OtherRouteImport } from './routes/other' +import { Route as HubListRouteImport } from './routes/hub.list' +import { Route as HubDetailIdRouteImport } from './routes/hub.detail.$id' + +const HubRoute = HubRouteImport.update({ + id: '/hub', + path: '/hub', + getParentRoute: () => rootRouteImport, +} as any) +const OtherRoute = OtherRouteImport.update({ + id: '/other', + path: '/other', + getParentRoute: () => rootRouteImport, +} as any) +const HubListRoute = HubListRouteImport.update({ + id: '/list', + path: '/list', + getParentRoute: () => HubRoute, +} as any) +const HubDetailIdRoute = HubDetailIdRouteImport.update({ + id: '/detail/$id', + path: '/detail/$id', + getParentRoute: () => HubRoute, +} as any) + +export interface FileRoutesByFullPath { + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRoutesByTo { + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/hub': typeof HubRouteWithChildren + '/other': typeof OtherRoute + '/hub/list': typeof HubListRoute + '/hub/detail/$id': typeof HubDetailIdRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + fileRoutesByTo: FileRoutesByTo + to: '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + id: '__root__' | '/hub' | '/other' | '/hub/list' | '/hub/detail/$id' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + HubRoute: typeof HubRouteWithChildren + OtherRoute: typeof OtherRoute +} + +declare module '@tanstack/vue-router' { + interface FileRoutesByPath { + '/hub': { + id: '/hub' + path: '/hub' + fullPath: '/hub' + preLoaderRoute: typeof HubRouteImport + parentRoute: typeof rootRouteImport + } + '/other': { + id: '/other' + path: '/other' + fullPath: '/other' + preLoaderRoute: typeof OtherRouteImport + parentRoute: typeof rootRouteImport + } + '/hub/list': { + id: '/hub/list' + path: '/list' + fullPath: '/hub/list' + preLoaderRoute: typeof HubListRouteImport + parentRoute: typeof HubRoute + } + '/hub/detail/$id': { + id: '/hub/detail/$id' + path: '/detail/$id' + fullPath: '/hub/detail/$id' + preLoaderRoute: typeof HubDetailIdRouteImport + parentRoute: typeof HubRoute + } + } +} + +interface HubRouteChildren { + HubListRoute: typeof HubListRoute + HubDetailIdRoute: typeof HubDetailIdRoute +} + +const HubRouteChildren: HubRouteChildren = { + HubListRoute: HubListRoute, + HubDetailIdRoute: HubDetailIdRoute, +} + +const HubRouteWithChildren = HubRoute._addFileChildren(HubRouteChildren) + +const rootRouteChildren: RootRouteChildren = { + HubRoute: HubRouteWithChildren, + OtherRoute: OtherRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/__root.tsx new file mode 100644 index 0000000000..a4f7985c5a --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/__root.tsx @@ -0,0 +1,46 @@ +import * as Vue from 'vue' +import { Link, Outlet, createRootRoute } from '@tanstack/vue-router' +import { sortedSearch } from '../../../shared' + +const RootComponent = Vue.defineComponent({ + setup() { + return () => ( + <> + + + + ) + }, +}) + +export const Route = createRootRoute({ + component: RootComponent, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.detail.$id.tsx b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.detail.$id.tsx new file mode 100644 index 0000000000..4701ab44eb --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.detail.$id.tsx @@ -0,0 +1,27 @@ +import * as Vue from 'vue' +import { Link, createFileRoute } from '@tanstack/vue-router' +import { detailMarker } from '../../../shared' + +const DetailPage = Vue.defineComponent({ + setup() { + const params = Route.useParams() + + return () => ( +
+

{detailMarker(params.value.id)}

+ Back to list + + Next + + Elsewhere +
+ ) + }, +}) + +export const Route = createFileRoute('/hub/detail/$id')({ + component: DetailPage, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.list.tsx b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.list.tsx new file mode 100644 index 0000000000..02abd6db1b --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.list.tsx @@ -0,0 +1,74 @@ +import * as Vue from 'vue' +import { Link, createFileRoute } from '@tanstack/vue-router' +import { + listItemIds, + listMarker, + listRelativeTestId, + listSortedMarker, +} from '../../../shared' + +const ascSearch = { sort: 'asc' } as const + +// List Links depart whenever the list leaf is left. +const ListLinks = Vue.defineComponent({ + setup() { + return () => ( +
    + {listItemIds.map((id) => { + const page = Number(id) + return ( +
  • + + {`Item ${id}`} + + + {`Item ${id} asc`} + + + {`Item ${id} exact`} + + ({ ...prev, page })}> + {`Page ${id}`} + + ({ + ...prev, + page, + sort: 'asc' as const, + })} + data-testid={id === '1' ? listRelativeTestId : undefined} + > + {`Page ${id} asc`} + +
  • + ) + })} +
+ ) + }, +}) + +const ListPage = Vue.defineComponent({ + setup() { + const sort = Route.useSearch({ select: (search) => search.sort }) + + return () => ( +
+

+ {sort.value === 'desc' ? listSortedMarker : listMarker} +

+ +
+ ) + }, +}) + +export const Route = createFileRoute('/hub/list')({ + component: ListPage, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.tsx b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.tsx new file mode 100644 index 0000000000..5be17f3350 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.tsx @@ -0,0 +1,69 @@ +import * as Vue from 'vue' +import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' +import { + hubItemIds, + hubRelativeTestId, + validateHubSearch, +} from '../../../shared' + +// Layout Links stay mounted while the hub leaves change. +const HubLinks = Vue.defineComponent({ + setup() { + return () => ( +
+ {hubItemIds.map((id) => { + const page = Number(id) + return ( +
+ + {`Detail ${id}`} + + + {`Detail ${id} exact`} + + + {`List page ${id}`} + + ({ ...prev, page })}> + {`List keep ${id}`} + + ({ ...prev, page })} + data-testid={id === '1' ? hubRelativeTestId : undefined} + > + {`Here page ${id}`} + +
+ ) + })} +
+ ) + }, +}) + +const HubLayout = Vue.defineComponent({ + setup() { + return () => ( +
+ + +
+ ) + }, +}) + +export const Route = createFileRoute('/hub')({ + validateSearch: validateHubSearch, + component: HubLayout, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/other.tsx b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/other.tsx new file mode 100644 index 0000000000..08dec586fa --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/other.tsx @@ -0,0 +1,17 @@ +import * as Vue from 'vue' +import { createFileRoute } from '@tanstack/vue-router' +import { otherMarker } from '../../../shared' + +const OtherPage = Vue.defineComponent({ + setup() { + return () => ( +
+

{otherMarker}

+
+ ) + }, +}) + +export const Route = createFileRoute('/other')({ + component: OtherPage, +}) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/tsconfig.json b/benchmarks/client-nav/scenarios/link-churn/vue/tsconfig.json new file mode 100644 index 0000000000..7786fc3da9 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/tsconfig.json @@ -0,0 +1,21 @@ +{ + "extends": "../../../../../tsconfig.json", + "compilerOptions": { + "jsx": "preserve", + "jsxImportSource": "vue", + "allowImportingTsExtensions": true, + "types": ["node", "vite/client", "vitest/globals"] + }, + "include": [ + "speed.bench.ts", + "speed.flame.ts", + "setup.ts", + "vite.config.ts", + "../shared.ts", + "../../harness.ts", + "../../../setup-helpers.ts", + "../../../jsdom.ts", + "../../../vitest.setup.ts", + "./src/**/*" + ] +} diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/vite.config.ts b/benchmarks/client-nav/scenarios/link-churn/vue/vite.config.ts new file mode 100644 index 0000000000..8f56734e04 --- /dev/null +++ b/benchmarks/client-nav/scenarios/link-churn/vue/vite.config.ts @@ -0,0 +1,44 @@ +import { fileURLToPath } from 'node:url' +import { defineConfig } from 'vitest/config' +import vue from '@vitejs/plugin-vue' +import vueJsx from '@vitejs/plugin-vue-jsx' +import codspeedPlugin from '@codspeed/vitest-plugin' +import { tanstackRouter } from '@tanstack/router-plugin/vite' +import { cpuSimulationExecArgv } from '../../../../cpu-simulation' + +const rootDir = fileURLToPath(new URL('.', import.meta.url)) + +export default defineConfig({ + root: rootDir, + define: { + 'process.env.NODE_ENV': JSON.stringify('production'), + }, + plugins: [ + !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) && + codspeedPlugin(), + tanstackRouter({ + target: 'vue', + routesDirectory: `${rootDir}src/routes`, + generatedRouteTree: `${rootDir}src/routeTree.gen.ts`, + }), + vue(), + vueJsx(), + ], + build: { + outDir: './dist', + emptyOutDir: true, + minify: false, + lib: { + entry: './src/main.tsx', + formats: ['es'], + fileName: 'app', + }, + }, + test: { + execArgv: cpuSimulationExecArgv(), + name: '@benchmarks/client-nav link-churn (vue)', + watch: false, + environment: 'jsdom', + setupFiles: ['../../../vitest.setup.ts'], + }, +}) From c4cb0e4cae8e3b11cfbaea813a46b76be8f26b34 Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 4 Oct 2026 22:46:37 +0200 Subject: [PATCH 084/175] test(router): Link tests that hold on main, ahead of the departing-Link work (#8611) Tests written for #8602 that already pass on main: rewrites of Link tests that asserted on a detached anchor after its route unmounted, and Link destination tests for Solid, Vue and React (in-place store/reactive inputs, inherited params, masks, frozen options, state-only navigations). Co-authored-by: Claude Opus 5.5 --- .../tests/link-destination.test.tsx | 50 ++++ packages/react-router/tests/link.test.tsx | 37 ++- .../tests/link-destination.test.tsx | 257 ++++++++++++++++++ packages/solid-router/tests/link.test.tsx | 37 ++- .../tests/link-destination.test.tsx | 168 ++++++++++++ packages/vue-router/tests/link.test.tsx | 37 ++- 6 files changed, 547 insertions(+), 39 deletions(-) create mode 100644 packages/solid-router/tests/link-destination.test.tsx create mode 100644 packages/vue-router/tests/link-destination.test.tsx diff --git a/packages/react-router/tests/link-destination.test.tsx b/packages/react-router/tests/link-destination.test.tsx index f33fe65803..8d27615ff9 100644 --- a/packages/react-router/tests/link-destination.test.tsx +++ b/packages/react-router/tests/link-destination.test.tsx @@ -305,4 +305,54 @@ describe('Link destination updates', () => { expect(link).toHaveAttribute('data-status', 'active') expect(link).toHaveTextContent('Current item') }) + + test('masked destinations follow their inputs', async () => { + // A stable mask object that inherits params, and a mask prop that changes. + const inheritedMask = { to: '/visible/$id', params: true } as const + const rootRoute = createRootRoute({ + component: function Root() { + const [id, setId] = React.useState('one') + return ( + <> + + + + + + ) + }, + }) + const routes = ['/source/$id', '/target/$id', '/visible/$id'].map((path) => + createRoute({ getParentRoute: () => rootRoute, path }), + ) + const router = createRouter({ + routeTree: rootRoute.addChildren(routes), + history: createMemoryHistory({ initialEntries: ['/source/one'] }), + }) + render() + + const propMask = await screen.findByTestId('prop-mask') + const inherited = screen.getByTestId('inherited-mask') + expect(propMask).toHaveAttribute('href', '/visible/one') + expect(inherited).toHaveAttribute('href', '/visible/one') + + await act(() => + router.navigate({ to: '/source/$id', params: { id: 'two' } } as any), + ) + expect(inherited).toHaveAttribute('href', '/visible/two') + expect(propMask).toHaveAttribute('href', '/visible/one') + + fireEvent.click(screen.getByRole('button', { name: 'Change mask' })) + expect(propMask).toHaveAttribute('href', '/visible/two') + }) }) diff --git a/packages/react-router/tests/link.test.tsx b/packages/react-router/tests/link.test.tsx index 46e6cb8685..56c4ece9db 100644 --- a/packages/react-router/tests/link.test.tsx +++ b/packages/react-router/tests/link.test.tsx @@ -1151,10 +1151,13 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/') - expect(postsLink).toHaveAttribute('data-status', 'active') - expect(postsLink).toHaveAttribute('aria-current', 'page') - expect(postsLink).toHaveClass('active') - expect(postsLink).toHaveAttribute('href', '/posts') + // The clicked link left with the index page; check the posts page's own. + const activePostsLink = await screen.findByRole('link', { name: 'Posts' }) + expect(activePostsLink).not.toBe(postsLink) + expect(activePostsLink).toHaveAttribute('data-status', 'active') + expect(activePostsLink).toHaveAttribute('aria-current', 'page') + expect(activePostsLink).toHaveClass('active') + expect(activePostsLink).toHaveAttribute('href', '/posts') }) test('when navigating to /posts with a base url', async () => { @@ -1211,10 +1214,13 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/app/') - expect(postsLink).toHaveAttribute('data-status', 'active') - expect(postsLink).toHaveAttribute('aria-current', 'page') - expect(postsLink).toHaveClass('active') - expect(postsLink).toHaveAttribute('href', '/app/posts') + // The clicked link left with the index page; check the posts page's own. + const activePostsLink = await screen.findByRole('link', { name: 'Posts' }) + expect(activePostsLink).not.toBe(postsLink) + expect(activePostsLink).toHaveAttribute('data-status', 'active') + expect(activePostsLink).toHaveAttribute('aria-current', 'page') + expect(activePostsLink).toHaveClass('active') + expect(activePostsLink).toHaveAttribute('href', '/app/posts') }) test('when navigating to /posts with search', async () => { @@ -6803,14 +6809,12 @@ describe('splat routes with empty splat', () => { async (trailingSlash) => { const tail = trailingSlash === 'always' ? '/' : '' - const rootRoute = createRootRoute() - const indexRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/', + // The links stay mounted across the navigation so they can turn active. + const rootRoute = createRootRoute({ component: () => { return ( <> -

Index Route

+ { ) }, }) + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => { + return

Index Route

+ }, + }) const splatRoute = createRoute({ getParentRoute: () => rootRoute, diff --git a/packages/solid-router/tests/link-destination.test.tsx b/packages/solid-router/tests/link-destination.test.tsx new file mode 100644 index 0000000000..93c20d2386 --- /dev/null +++ b/packages/solid-router/tests/link-destination.test.tsx @@ -0,0 +1,257 @@ +import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library' +import { afterEach, expect, test, vi } from 'vitest' +import { createSignal } from 'solid-js' +import { createStore } from 'solid-js/store' +import { + Link, + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, + defaultStringifySearch, + useLinkProps, +} from '../src' +import type { JSX } from 'solid-js' + +afterEach(cleanup) + +/** + * Renders `links` in the root route next to `/source/$id`, `/target/$id` and + * `/visible/$id`. `builds()` counts the destination builds that stringify a + * search carrying a `build` key, so a reused location does not count. + */ +function setup(links: () => JSX.Element, initial = '/source/one') { + const counted = vi.fn(defaultStringifySearch) + const root = createRootRoute({ + component: () => ( + <> + {links()} + + + ), + }) + const routes = ['/source/$id', '/target/$id', '/visible/$id'].map((path) => + createRoute({ getParentRoute: () => root, path }), + ) + const router = createRouter({ + routeTree: root.addChildren(routes), + history: createMemoryHistory({ initialEntries: [initial] }), + stringifySearch: (search) => + 'build' in search ? counted(search) : defaultStringifySearch(search), + }) + render(() => ) + const go = (id: string, extra?: object) => + router.navigate({ to: '/source/$id', params: { id }, ...extra } as any) + return { router, go, builds: () => counted.mock.calls.length } +} + +test('store-backed params and search follow in-place mutations at the next navigation', async () => { + const [params, setParams] = createStore({ id: 'one' }) + const [search, setSearch] = createStore({ build: 1 }) + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/one?build=1') + + setParams('id', 'two') + setSearch('build', 2) + // As before: a store read during a build is not tracked. + expect(link).toHaveAttribute('href', '/target/one?build=1') + await go('two') + expect(link).toHaveAttribute('href', '/target/two?build=2') + + setParams('id', 'three') + await go('three') + expect(link).toHaveAttribute('href', '/target/three?build=2') + + // Clicks and preloads read the store as it is now. + setParams('id', 'four') + fireEvent.click(link) + await vi.waitFor(() => + expect(screen.getByTestId('link')).toHaveAttribute('data-status', 'active'), + ) + expect(link).toHaveAttribute('href', '/target/four?build=2') +}) + +test('state store values are not reused either', async () => { + const [state, setState] = createStore({ label: 'one' }) + const seen: Array = [] + const { router } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + router.subscribe('onResolved', ({ toLocation }) => { + seen.push((toLocation.state as any).label) + }) + setState('label', 'two') + fireEvent.click(link) + await vi.waitFor(() => expect(seen).toEqual(['two'])) +}) + +test('inherited params and search rebuild on every navigation', async () => { + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/one') + await go('two', { search: { page: 2 } }) + expect(link).toHaveAttribute('href', '/target/two?page=2') + await go('three', { search: { page: 3 } }) + expect(link).toHaveAttribute('href', '/target/three?page=3') +}) + +test('masked destinations follow their inputs', async () => { + const [params, setParams] = createStore({ id: 'one' }) + const [hash, setHash] = createSignal('a') + const { go } = setup(() => ( + <> + + + + )) + const storeMask = await screen.findByTestId('store-mask') + const inheritedMask = screen.getByTestId('inherited-mask') + expect(storeMask).toHaveAttribute('href', '/visible/one') + expect(inheritedMask).toHaveAttribute('href', '/visible/one#a') + setParams('id', 'two') + await go('two') + expect(storeMask).toHaveAttribute('href', '/visible/two') + expect(inheritedMask).toHaveAttribute('href', '/visible/two#a') + setHash('b') + expect(inheritedMask).toHaveAttribute('href', '/visible/two#b') +}) + +test('never mutates frozen caller options', async () => { + const params = Object.freeze({ id: 'fixed' }) + const options = Object.freeze({ + to: '/target/$id', + params, + search: Object.freeze({ build: 1 }), + 'data-testid': 'frozen', + }) + const Links = () => { + const frozen = useLinkProps(options as any) + return + } + const result = setup(() => ) + const frozen = await screen.findByTestId('frozen') + expect(frozen).toHaveAttribute('href', '/target/fixed?build=1') + await result.go('two') + expect(frozen).toHaveAttribute('href', '/target/fixed?build=1') + expect(Object.keys(options)).toEqual([ + 'to', + 'params', + 'search', + 'data-testid', + ]) + expect(Object.keys(params)).toEqual(['id']) + + fireEvent.click(frozen) + await vi.waitFor(() => + expect(result.router.state.location.pathname).toBe('/target/fixed'), + ) +}) + +test.each([ + ['inherited state', true], + ['a state updater', (prev: any) => ({ label: `${prev.label}!` })], +])( + 'a click after a same-href, state-only navigation uses the new state (%s)', + async (_, state) => { + const { router, go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + await go('one', { state: { label: 'next' } }) + expect(router.state.location.state).toMatchObject({ label: 'next' }) + fireEvent.click(link) + await vi.waitFor(() => + expect(router.state.location.pathname).toBe('/target/fixed'), + ) + expect(router.state.location.state).toMatchObject({ + label: state === true ? 'next' : 'next!', + }) + }, +) + +test('function children render once per active state change', async () => { + const calls: Array = [] + const { go } = setup(() => ( + + {({ isActive }) => { + calls.push(isActive) + return isActive ? 'active' : 'inactive' + }} + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveTextContent('inactive') + await go('two') + await go('three') + expect(calls).toEqual([false]) + fireEvent.click(link) + await vi.waitFor(() => expect(link).toHaveTextContent(/^active$/)) + expect(calls).toEqual([false, true]) +}) + +test('refreshes history formatting even when the destination is reused', async () => { + let suffix = 'old' + const root = createRootRoute({ + component: () => ( + <> + + + + ), + }) + const source = createRoute({ + getParentRoute: () => root, + path: '/source/$id', + }) + const target = createRoute({ getParentRoute: () => root, path: '/target' }) + const history = createMemoryHistory({ initialEntries: ['/source/one'] }) + const router = createRouter({ + routeTree: root.addChildren([source, target]), + history: { + ...history, + get location() { + return history.location + }, + createHref: (href) => `${href}#${suffix}`, + }, + }) + render(() => ) + const link = await screen.findByTestId('formatted') + expect(link).toHaveAttribute('href', '/target#old') + suffix = 'new' + await router.navigate({ to: '/source/$id', params: { id: 'two' } }) + expect(link).toHaveAttribute('href', '/target#new') +}) diff --git a/packages/solid-router/tests/link.test.tsx b/packages/solid-router/tests/link.test.tsx index 78c4b02347..caae3f55e1 100644 --- a/packages/solid-router/tests/link.test.tsx +++ b/packages/solid-router/tests/link.test.tsx @@ -1406,10 +1406,13 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/') - expect(postsLink).toHaveAttribute('data-status', 'active') - expect(postsLink).toHaveAttribute('aria-current', 'page') - expect(postsLink).toHaveClass('active') - expect(postsLink).toHaveAttribute('href', '/posts') + // The clicked link left with the index page; check the posts page's own. + const activePostsLink = await screen.findByRole('link', { name: 'Posts' }) + expect(activePostsLink).not.toBe(postsLink) + expect(activePostsLink).toHaveAttribute('data-status', 'active') + expect(activePostsLink).toHaveAttribute('aria-current', 'page') + expect(activePostsLink).toHaveClass('active') + expect(activePostsLink).toHaveAttribute('href', '/posts') }) test('when navigating to /posts with a base url', async () => { @@ -1465,10 +1468,13 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/app/') - expect(postsLink).toHaveAttribute('data-status', 'active') - expect(postsLink).toHaveAttribute('aria-current', 'page') - expect(postsLink).toHaveClass('active') - expect(postsLink).toHaveAttribute('href', '/app/posts') + // The clicked link left with the index page; check the posts page's own. + const activePostsLink = await screen.findByRole('link', { name: 'Posts' }) + expect(activePostsLink).not.toBe(postsLink) + expect(activePostsLink).toHaveAttribute('data-status', 'active') + expect(activePostsLink).toHaveAttribute('aria-current', 'page') + expect(activePostsLink).toHaveClass('active') + expect(activePostsLink).toHaveAttribute('href', '/app/posts') }) test('when navigating to /posts with search', async () => { @@ -6852,14 +6858,12 @@ describe('splat routes with empty splat', () => { async (trailingSlash) => { const tail = trailingSlash === 'always' ? '/' : '' - const rootRoute = createRootRoute() - const indexRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/', + // The links stay mounted across the navigation so they can turn active. + const rootRoute = createRootRoute({ component: () => { return ( <> -

Index Route

+ { ) }, }) + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => { + return

Index Route

+ }, + }) const splatRoute = createRoute({ getParentRoute: () => rootRoute, diff --git a/packages/vue-router/tests/link-destination.test.tsx b/packages/vue-router/tests/link-destination.test.tsx new file mode 100644 index 0000000000..e7fd8e6962 --- /dev/null +++ b/packages/vue-router/tests/link-destination.test.tsx @@ -0,0 +1,168 @@ +import * as Vue from 'vue' +import { cleanup, fireEvent, render, screen } from '@testing-library/vue' +import { afterEach, expect, test, vi } from 'vitest' +import { + Link, + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, + defaultStringifySearch, +} from '../src' + +afterEach(() => { + cleanup() + vi.restoreAllMocks() +}) + +/** + * Renders `links` in the root route next to `/source/$id`, `/target/$id` and + * `/visible/$id`. `builds()` counts the destination builds that stringify a + * search carrying a `build` key, so a reused location does not count. + */ +function setup(links: () => any, initial = '/source/one') { + const counted = vi.fn(defaultStringifySearch) + const root = createRootRoute({ + component: () => ( + <> + {links()} + + + ), + }) + const routes = ['/source/$id', '/target/$id', '/visible/$id'].map((path) => + createRoute({ getParentRoute: () => root, path }), + ) + const router = createRouter({ + routeTree: root.addChildren(routes), + history: createMemoryHistory({ initialEntries: [initial] }), + stringifySearch: (search) => + 'build' in search ? counted(search) : defaultStringifySearch(search), + }) + render() + const go = (id: string, extra?: object) => + router.navigate({ to: '/source/$id', params: { id }, ...extra } as any) + return { router, go, builds: () => counted.mock.calls.length } +} + +test('reactive params and search follow in-place mutations at the next navigation', async () => { + const params = Vue.reactive({ id: 'one' }) + const search = Vue.reactive({ build: 1 }) + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/one?build=1') + params.id = 'two' + search.build = 2 + await go('two') + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/two?build=2') + params.id = 'three' + await go('three') + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/three?build=2') +}) + +test('inherited params and search rebuild on every navigation', async () => { + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/one') + await go('two', { search: { page: 2 } }) + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/two?page=2') +}) + +test('masked destinations follow their inputs', async () => { + const params = Vue.reactive({ id: 'one' }) + const fixed = { id: 'fixed' } + const mask = { to: '/visible/$id', params } + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/visible/one') + params.id = 'two' + await go('two') + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/visible/two') +}) + +test('switches a mounted Link between plain and reactive inputs', async () => { + const live = Vue.ref(false) + const params = Vue.reactive({ id: 'one' }) + const plain = { id: 'fixed' } + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/fixed') + live.value = true + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/one') + params.id = 'two' + await go('two') + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/two') + live.value = false + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/fixed') +}) + +test('never mutates frozen caller options', async () => { + const params = Object.freeze({ id: 'fixed' }) + const search = Object.freeze({ build: 1 }) + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + await go('two') + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/fixed?build=1') + expect(Object.keys(params)).toEqual(['id']) +}) + +test.each([ + ['inherited state', true], + ['a state updater', (prev: any) => ({ label: `${prev.label}!` })], +])( + 'a click after a same-href, state-only navigation uses the new state (%s)', + async (_, state) => { + const fixed = { id: 'fixed' } + const { router, go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + await go('one', { state: { label: 'next' } }) + await fireEvent.click(link) + await vi.waitFor(() => + expect(router.state.location.pathname).toBe('/target/fixed'), + ) + expect(router.state.location.state).toMatchObject({ + label: state === true ? 'next' : 'next!', + }) + }, +) diff --git a/packages/vue-router/tests/link.test.tsx b/packages/vue-router/tests/link.test.tsx index 48fe82e2bb..bae8cf04f9 100644 --- a/packages/vue-router/tests/link.test.tsx +++ b/packages/vue-router/tests/link.test.tsx @@ -1547,10 +1547,13 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/') - expect(postsLink).toHaveAttribute('data-status', 'active') - expect(postsLink).toHaveAttribute('aria-current', 'page') - expect(postsLink).toHaveClass('active') - expect(postsLink).toHaveAttribute('href', '/posts') + // The clicked link left with the index page; check the posts page's own. + const activePostsLink = await screen.findByRole('link', { name: 'Posts' }) + expect(activePostsLink).not.toBe(postsLink) + expect(activePostsLink).toHaveAttribute('data-status', 'active') + expect(activePostsLink).toHaveAttribute('aria-current', 'page') + expect(activePostsLink).toHaveClass('active') + expect(activePostsLink).toHaveAttribute('href', '/posts') }) test('when navigating to /posts with a base url', async () => { @@ -1606,10 +1609,13 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/app/') - expect(postsLink).toHaveAttribute('data-status', 'active') - expect(postsLink).toHaveAttribute('aria-current', 'page') - expect(postsLink).toHaveClass('active') - expect(postsLink).toHaveAttribute('href', '/app/posts') + // The clicked link left with the index page; check the posts page's own. + const activePostsLink = await screen.findByRole('link', { name: 'Posts' }) + expect(activePostsLink).not.toBe(postsLink) + expect(activePostsLink).toHaveAttribute('data-status', 'active') + expect(activePostsLink).toHaveAttribute('aria-current', 'page') + expect(activePostsLink).toHaveClass('active') + expect(activePostsLink).toHaveAttribute('href', '/app/posts') }) test('when navigating to /posts with search', async () => { @@ -7311,14 +7317,12 @@ describe('splat routes with empty splat', () => { async (trailingSlash) => { const tail = trailingSlash === 'always' ? '/' : '' - const rootRoute = createRootRoute() - const indexRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/', + // The links stay mounted across the navigation so they can turn active. + const rootRoute = createRootRoute({ component: () => { return ( <> -

Index Route

+ { ) }, }) + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => { + return

Index Route

+ }, + }) const splatRoute = createRoute({ getParentRoute: () => rootRoute, From efc2042c2d02a9780c3e7efe81f123d066a869eb Mon Sep 17 00:00:00 2001 From: Flo Date: Mon, 5 Oct 2026 21:27:33 +0200 Subject: [PATCH 085/175] perf(router): skip Link work for routes a navigation leaves (#8602) * test(benchmarks): add departing and retained Link navigation cases Add lane-* cases to the React Link performance harness, with per-navigation sync, onLoad and total timings in the paired runner. Co-Authored-By: Claude Fable 5.1 * perf(react-router): share one location subscription per route's Links Links subscribe to a scope owned by their match context instead of each subscribing to the location store. A scope skips a location publication whose navigation leaves its route, so Links that are about to unmount do no work. Clicks and preloads resolve from the location a Link displays, and mask builds use the same source location as their destination. Co-Authored-By: Claude Fable 5.1 * test(benchmarks): add Solid departing and retained Link navigation harness Co-Authored-By: Claude Opus 5.5 * perf(solid-router): hold the location of Links in a departing match Each Match owns one memo that keeps its Links' source location when the publishing navigation leaves the route, so those Links do no work. Clicks and preloads resolve from that source. Co-Authored-By: Claude Opus 5.5 * perf(react-router): trim the Link scope's bundle cost Key each router's link scopes by route id instead of carrying them in a `[routeId, linkScope]` match context tuple. `matchContext` provides the route id again, so `Match`, `Outlet`, `useMatch` and `useParentMatches` / `useChildMatches` match main, and the outside-every-match holder becomes the `undefined` key of the same registry. A scope without links still releases its location, so keeping one per route id holds none. Co-Authored-By: Claude Opus 5.5 * test(benchmarks): add Vue departing and retained Link navigation harness Co-Authored-By: Claude Opus 5.5 * perf(vue-router): hold the location of Links in a departing match Co-Authored-By: Claude Opus 5.5 * test(benchmarks): add a real-browser Link INP harness Co-Authored-By: Claude Opus 5.5 * perf(solid-router): gate departing Links in their own location memo Drop the per-Match memo and the third match-context slot. Each Link reads its route id once at setup and, while the publishing navigation leaves that route, keeps its previous location in the memo it already owns. Links mounting in an already-departing route read the pending location. Co-Authored-By: Claude Opus 5.5 * test(benchmarks): add Vue to the real-browser Link INP harness Co-Authored-By: Claude Opus 5.5 * fix(solid-router): build Link navigations from the live location state The Link location memo deduplicated by href, so a same-href navigation that only changed history state left clicks and preloads building from the previous location's state. Compare by identity instead; downstream href and active memos still compare by value, so unchanged Links do not touch the DOM. Co-Authored-By: Claude Opus 5.5 * perf(react-router): drop the Link scope's reentrant publication re-check A listener that publishes a new location while a route's Links derive is not a supported use case, so the scope no longer re-reads the store after notifying. Co-Authored-By: Claude Opus 5.5 * perf(react-router, router-core): follow-up Link improvements (#8607) * perf(router-core): cache location-independent masked destinations A mask that reads the current location already marks the result as source-dependent through the shared usedCurrent flag, and route masks belong to the route tree and options whose updates replace the cache. Co-Authored-By: Claude Opus 5.5 * perf(react-router): hydrate hash-sensitive Links through the scope's server snapshot The Link's location subscription already has a server-snapshot slot. Reporting an active hash-sensitive Link as inactive there replaces the per-Link useHydrated subscription with identical hydration output. Co-Authored-By: Claude Opus 5.5 * fix(react-router): follow href and reloadDocument changes of a mounted Link The destination memo did not depend on href, so a Link whose href alone changed kept displaying, preloading and navigating to the old target. Clicks also navigated with the memo's copy of the options, so a changed reloadDocument only applied once another destination prop changed. Navigate with the current options and the displayed source location. Co-Authored-By: Claude Opus 5.5 * perf(react-router): hold a Link's intent preload timer on its own ref Co-Authored-By: Claude Opus 5.5 * perf(history): avoid copying navigation arguments when checking blockers Co-Authored-By: Claude Opus 5.5 * test(benchmarks): opt-in intent preloading for the Link lane cases Co-Authored-By: Claude Opus 5.5 * chore: changeset Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 * perf(solid-router, vue-router): follow-up Link improvements (#8609) * test(benchmarks): measure Solid and Vue Link lanes with intent preloading Co-Authored-By: Claude Opus 5.5 * perf(solid-router): reuse a Link-owned destination so fixed Links hit the location cache Co-Authored-By: Claude Opus 5.5 * perf(solid-router): pass navigation controls through the Link-owned options Co-Authored-By: Claude Opus 5.5 * test(solid-router): cover Link clicks after a state-only navigation Co-Authored-By: Claude Opus 5.5 * perf(solid-router): read Link options directly with a single splitProps Co-Authored-By: Claude Opus 5.5 * perf(solid-router): keep the Link preload timer in a closure Co-Authored-By: Claude Opus 5.5 * perf(solid-router): let the Link observer read the preload mode directly The internal useIntersectionObserver no longer returns an unused accessor and takes the preload mode instead of two predicates (its unit test is updated). Co-Authored-By: Claude Opus 5.5 * perf(solid-router): create the Link hydration signal only for SSR routers Co-Authored-By: Claude Opus 5.5 * perf(solid-router): let element insertion track Link children without a memo Co-Authored-By: Claude Opus 5.5 * fix(solid-router): call a Link's ref once per element The ref no longer comes from the props memo, so href/active changes do not re-run the element's ref effect. Drops the mergeRefs import. Co-Authored-By: Claude Opus 5.5 * perf(solid-router): derive a Link's href and active state in one computation The destination build, href, external/blocked classification and active state share one memo whose unchanged result keeps its identity, so a navigation that leaves a Link as it was notifies nothing downstream. Presentation props only rerun the props memo. The server derives the same values once, without memos. Co-Authored-By: Claude Opus 5.5 * test(benchmarks): use the t quantile for the lane comparison's round count Co-Authored-By: Claude Opus 5.5 * perf(solid-router): split a Link's props once Co-Authored-By: Claude Opus 5.5 * perf(vue-router): reuse a Link-owned destination so fixed Links hit the location cache Navigation controls travel on the same object, so clicks no longer re-list them. Co-Authored-By: Claude Opus 5.5 * perf(vue-router): pick a Link's element props with one shared key set Co-Authored-By: Claude Opus 5.5 * perf(vue-router): derive a Link's href and active state in one computed The preload effects read a location-independent mode, so a navigation no longer queues them for every Link. A Link whose destination updater navigates while it derives derives again for the newer location. Co-Authored-By: Claude Opus 5.5 * perf(vue-router): keep the Link preload timer in a closure Co-Authored-By: Claude Opus 5.5 * perf(vue-router): drop the unused IntersectionObserver ref per Link Co-Authored-By: Claude Opus 5.5 * perf(vue-router): return plain empty Link props without a router Co-Authored-By: Claude Opus 5.5 * perf(vue-router): render server Links without reactive wrappers The server returns shallow refs and reads Link props directly, without the attrs snapshot, its update hook, the props computed or a template ref. Co-Authored-By: Claude Opus 5.5 * perf(vue-router): drop the deferred re-derivation for updaters that navigate A search updater that navigates while a Link derives is not a supported use case; remove the retry that existed only for it, and its test. Co-Authored-By: Claude Opus 5.5 * chore: add changeset for the Solid and Vue Link follow-up Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 * chore(benchmarks): remove the real-browser Link INP harness Co-Authored-By: Claude Opus 5.5 * fix(solid-router, vue-router): rebuild masks whose options are stores Router core now reuses masked locations built from the same options object when the mask does not read the current location. Solid and Vue Links keep one destination object while their navigation options keep their identity, and only a store/reactive option value forced a fresh object per location. A plain mask object holding a store (e.g. `mask={{ to, params: store }}`) therefore kept the mask built from the store's first value. The mask's own values are destination options too, so check them for stores as well. React has no in-place reactive values: a changed mask prop changes identity and rebuilds. Add the equivalent React coverage for prop and inherited masks. Co-Authored-By: Claude Opus 5.5 * chore(benchmarks): remove the ad-hoc Link lane harnesses The link-churn scenario covers this work in CodSpeed. Removes the Solid and Vue lane harnesses and restores link-performance to its main content. Co-Authored-By: Claude Opus 5.5 * style: name tuple indexes in Link code Co-Authored-By: Claude Opus 5.5 * refactor(react-router): stop treating _fromLocation as a Link prop `_fromLocation` is an internal router option, not a Link prop: the Link always builds from its own scope's location. It stays among the stripped router option keys so code that still passes it does not leak an attribute to the element. Co-Authored-By: Claude Opus 5.5 * refactor(solid-router): stop treating _fromLocation as a Link prop `_fromLocation` is an internal router option, not a Link prop: the Link always builds from the location its match presents. Co-Authored-By: Claude Opus 5.5 * refactor(vue-router): stop treating _fromLocation as a Link prop `_fromLocation` is an internal router option, not a Link prop: the Link always builds from the location its match presents. Co-Authored-By: Claude Opus 5.5 * refactor(react-router): drop _fromLocation from the Link's option keys Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Fable 5.1 --- .changeset/link-departing-scope.md | 8 + .changeset/link-followup-react-core.md | 7 + .changeset/solid-vue-link-follow-up.md | 6 + packages/history/src/index.ts | 30 +- packages/react-router/src/link.tsx | 230 ++-- packages/react-router/src/matchContext.tsx | 64 + .../tests/link-departing-scope.test.tsx | 1122 +++++++++++++++ .../tests/link-destination.test.tsx | 140 ++ packages/router-core/src/index.ts | 6 +- packages/router-core/src/load-client.ts | 22 + packages/router-core/src/router.ts | 16 +- packages/router-core/tests/mask.test.ts | 198 +++ packages/solid-router/src/link.tsx | 585 ++++---- packages/solid-router/src/utils.ts | 87 +- .../tests/link-departing-scope.test.tsx | 1225 +++++++++++++++++ .../tests/link-destination.test.tsx | 139 ++ packages/solid-router/tests/link.test.tsx | 24 +- packages/vue-router/src/Match.tsx | 7 +- packages/vue-router/src/RouterProvider.tsx | 6 + packages/vue-router/src/link.tsx | 446 +++--- packages/vue-router/src/matchContext.tsx | 33 +- packages/vue-router/src/utils.ts | 8 +- .../tests/link-departing-scope.test.tsx | 1127 +++++++++++++++ .../tests/link-destination.test.tsx | 68 + 24 files changed, 4867 insertions(+), 737 deletions(-) create mode 100644 .changeset/link-departing-scope.md create mode 100644 .changeset/link-followup-react-core.md create mode 100644 .changeset/solid-vue-link-follow-up.md create mode 100644 packages/react-router/tests/link-departing-scope.test.tsx create mode 100644 packages/solid-router/tests/link-departing-scope.test.tsx create mode 100644 packages/vue-router/tests/link-departing-scope.test.tsx diff --git a/.changeset/link-departing-scope.md b/.changeset/link-departing-scope.md new file mode 100644 index 0000000000..a7d9119959 --- /dev/null +++ b/.changeset/link-departing-scope.md @@ -0,0 +1,8 @@ +--- +'@tanstack/react-router': patch +'@tanstack/router-core': patch +'@tanstack/solid-router': patch +'@tanstack/vue-router': patch +--- + +Links of a route that the pending navigation leaves skip deriving the destination location, and clicks and preloads follow the href a Link displays. `buildLocation` now builds `mask` and `routeMasks` locations from the same `_fromLocation` as the destination. diff --git a/.changeset/link-followup-react-core.md b/.changeset/link-followup-react-core.md new file mode 100644 index 0000000000..defe64eb4a --- /dev/null +++ b/.changeset/link-followup-react-core.md @@ -0,0 +1,7 @@ +--- +'@tanstack/react-router': patch +'@tanstack/router-core': patch +'@tanstack/history': patch +--- + +Fixed Link destinations that resolve to a route mask are now reused across navigations instead of being rebuilt every time. A mounted Link now follows changes to its `href` and `reloadDocument` props, and React Links no longer each subscribe to a hydration flag. diff --git a/.changeset/solid-vue-link-follow-up.md b/.changeset/solid-vue-link-follow-up.md new file mode 100644 index 0000000000..fee693f84f --- /dev/null +++ b/.changeset/solid-vue-link-follow-up.md @@ -0,0 +1,6 @@ +--- +'@tanstack/solid-router': patch +'@tanstack/vue-router': patch +--- + +Solid and Vue Links reuse the router's built destination across navigations and derive their state through fewer reactive nodes. Solid Links call a user `ref` once per element and create no reactive nodes on the server. diff --git a/packages/history/src/index.ts b/packages/history/src/index.ts index 9924779d8f..d2f80581b9 100644 --- a/packages/history/src/index.ts +++ b/packages/history/src/index.ts @@ -156,27 +156,21 @@ export function createHistory(opts: { else location = opts.getLocation() } - const tryNavigation = async ({ - task, - navigateOpts, - ...actionInfo - }: TryNavigateArgs) => { - const ignoreBlocker = navigateOpts?.ignoreBlocker ?? false - if (ignoreBlocker) { - task() - return - } - - const blockers = opts.getBlockers?.() ?? [] - const isPushOrReplace = - actionInfo.type === 'PUSH' || actionInfo.type === 'REPLACE' - if (typeof document !== 'undefined' && blockers.length && isPushOrReplace) { + const tryNavigation = async (args: TryNavigateArgs) => { + const blockers = args.navigateOpts?.ignoreBlocker + ? undefined + : opts.getBlockers?.() + if ( + typeof document !== 'undefined' && + blockers?.length && + (args.type === 'PUSH' || args.type === 'REPLACE') + ) { for (const blocker of blockers) { - const nextLocation = parseHref(actionInfo.path, actionInfo.state) + const nextLocation = parseHref(args.path, args.state) const isBlocked = await blocker.blockerFn({ currentLocation: location, nextLocation, - action: actionInfo.type, + action: args.type, }) if (isBlocked) { opts.onBlocked?.() @@ -185,7 +179,7 @@ export function createHistory(opts: { } } - task() + args.task() } return { diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index b99ad65662..ce6a7ed9d1 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -1,7 +1,6 @@ 'use client' import * as React from 'react' -import { useSelector } from '@tanstack/react-store' import { deepEqual, functionalUpdate, @@ -12,8 +11,8 @@ import { } from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' import { useRouter } from './useRouter' +import { createLinkScope, matchContext } from './matchContext' -import { useHydrated } from './ClientOnly' import type { ActiveOptions, AnyRouter, @@ -35,8 +34,8 @@ type LinkState = [href: string | undefined, isActive?: boolean] // Keep referentially stable values while their contents are equal. Links // routinely pass inline `params` / `search` object literals, which would -// otherwise change `_options` identity on every parent render, rebuild the -// store selector, and discard its memoized selection. One ref holds all of +// otherwise change `dest` identity on every parent render, rebuild the +// link state snapshot, and discard its memoized state. One ref holds all of // them; each entry is replaced only when its own contents change. // // The router reuses a built location for as long as it sees the same options @@ -66,10 +65,6 @@ function preloadLink(router: AnyRouter, options: unknown) { }) } -const LINK_SELECTOR_OPTIONS = { - compare: (a: LinkState, b: LinkState) => a[0] === b[0] && a[1] === b[1], -} - function resolveExternalLink( to: string | undefined, protocolAllowlist: AnyRouter['protocolAllowlist'], @@ -92,7 +87,6 @@ function resolveIsActive( next: ParsedLocation, activeOptions: ActiveOptions | undefined, basepath: string, - isHydrated: boolean, ): boolean { const currentPath = removeTrailingSlash(location.pathname, basepath) const nextPath = removeTrailingSlash(next.pathname, basepath) @@ -122,10 +116,7 @@ function resolveIsActive( } } - if (activeOptions?.includeHash) { - return isHydrated && location.hash === next.hash - } - return true + return !activeOptions?.includeHash || location.hash === next.hash } /** @@ -213,13 +204,13 @@ export function useLinkProps< // 3. In client bundles, `isServer` is `false`, so the early return never executes // ========================================================================== - // The link's own ref: the element for the viewport observer and the key + // The link's own ref: the element for the viewport observer and the holder // of a pending intent timer. A forwarded ref is filled alongside it by one // callback, memoized on the forwarded ref so React re-attaches it (and // notifies the consumer) only when their ref changes, not on every render. // A cleanup returned by a consumer callback is passed through to React. // eslint-disable-next-line react-hooks/rules-of-hooks - const innerRef = React.useRef(null) + const innerRef: LinkRef = React.useRef(null) // eslint-disable-next-line react-hooks/rules-of-hooks const mergedRef = React.useCallback( (element: Element | null) => { @@ -240,12 +231,6 @@ export function useLinkProps< to, preload: userPreload, preloadDelay: userPreloadDelay, - hashScrollIntoView, - replace, - startTransition, - resetScroll, - viewTransition, - ignoreBlocker, disabled, target, onClick, @@ -256,86 +241,109 @@ export function useLinkProps< onTouchStart, } = options as typeof options & { to?: string } - // eslint-disable-next-line react-hooks/rules-of-hooks - const isHydrated = useHydrated(!!activeOptions?.includeHash) - // eslint-disable-next-line react-hooks/rules-of-hooks const [stableSearch, stableParams, stableActiveOptions] = useStableValues( options.search, options.params, activeOptions, ) - // `_options` is the options object from the render that last changed the - // destination. `dest` is its copy that the link owns: one stable object per - // link lets the router reuse location-independent results. + // The links of a route share its location source. Links outside every + // match share one that never departs. // eslint-disable-next-line react-hooks/rules-of-hooks - const [_options, dest] = React.useMemo( - () => [options, { ...options } as any] as const, - // eslint-disable-next-line react-hooks/exhaustive-deps - [ - router, - options.from, - options._fromLocation, - options.hash, - options.to, - stableSearch, - stableParams, - options.state, - options.mask, - options.unsafeRelative, - ], - ) + const routeId = React.useContext(matchContext) + const scope = ((router.stores._linkScopes ??= {})[routeId!] ??= + createLinkScope(router, routeId)) - // Derive inside the selector so `compareLinkState` can bail out. Deriving after - // the subscription instead re-renders every link on every navigation, because - // the comparator only sees the location, not whether this link's output moved. + // `dest` is the link's own copy of the options from the render that last + // changed the link: one stable object per link lets the router reuse + // location-independent results. It also carries the location the link + // displays, so clicks and preloads go where its href points. + // The snapshot depends only on the scope's location: it derives once per + // location so React can bail out on an unchanged state, and derives eagerly + // inside the scope's notification. // eslint-disable-next-line react-hooks/rules-of-hooks - const selectLinkState = React.useMemo(() => { - // Direct destinations and the router's allowlist are stable for this selector. + const [dest, getLinkState, getHydrationState] = React.useMemo(() => { + // Direct destinations and the router's allowlist are stable for this snapshot. const directExternalLink = resolveExternalLink(to, router.protocolAllowlist) if (directExternalLink !== undefined) { const state: LinkState = [directExternalLink ?? undefined] - return () => state + return [options, () => state] as const } - let inactive: LinkState | undefined - let active: LinkState + const dest = { ...options } as any + let source: ParsedLocation | undefined + let state: LinkState + let hydrationState: LinkState | undefined - return (location: ParsedLocation): LinkState => { - if (!_options._fromLocation) { + const getLinkState = (): LinkState => { + // Read the location once and record it only after deriving: a + // derivation that throws is retried instead of caching its state. + const location = scope[0 /* getSource */]() + if (location !== source) { dest._fromLocation = location - } - const next = router.buildLocation(dest) + const next = router.buildLocation(dest) - // History formatters can depend on the current browser URL (hash history). - // Reuse classification and immutable results until the formatted href changes. - const href = getHrefOption(next, router, disabled) - if (!inactive || inactive[0] !== href) { - inactive = [ - href, - // Internal/disabled links use false; external/blocked links use undefined. - !(disabled || (href && !getUrlScheme(href))) && undefined, - ] - active = [href, true] + // History formatters can depend on the current browser URL (hash history). + const href = getHrefOption(next, router, disabled) + // Internal and disabled links can be active; external and blocked + // links have no active state. + const isActive = + disabled || (href && !getUrlScheme(href)) + ? resolveIsActive( + location, + next, + stableActiveOptions, + router.basepath, + ) + : undefined + // Keep the state while it is equal so React can bail out. + if ( + !state || + state[0 /* href */] !== href || + state[1 /* isActive */] !== isActive + ) { + state = [href, isActive] + } + source = location } - return inactive[1] !== undefined && - resolveIsActive( - location, - next, - stableActiveOptions, - router.basepath, - isHydrated, - ) - ? active - : inactive + return state } - }, [stableActiveOptions, disabled, isHydrated, _options, dest, router, to]) + + return [ + dest, + getLinkState, + // Hydration renders the server's markup, which has no hash, so an active + // hash-sensitive link hydrates inactive and React rerenders it after. + stableActiveOptions?.includeHash && + ((): LinkState => { + const state = getLinkState() + return state[1 /* isActive */] + ? (hydrationState ??= [state[0 /* href */], false]) + : state + }), + ] as const + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [ + router, + scope, + options.from, + options.hash, + options.href, + to, + stableSearch, + stableParams, + options.state, + options.mask, + options.unsafeRelative, + stableActiveOptions, + disabled, + ]) // eslint-disable-next-line react-hooks/rules-of-hooks - const [href, isActive] = useSelector( - router.stores.location, - selectLinkState, - LINK_SELECTOR_OPTIONS, + const [href, isActive] = React.useSyncExternalStore( + scope[1 /* subscribe */], + getLinkState, + getHydrationState || getLinkState, ) const externalLink = isActive === undefined && href const linkDisabled = disabled || href === undefined @@ -351,7 +359,7 @@ export function useLinkProps< userPreloadDelay ?? router.options.defaultPreloadDelay ?? 0 // `preloadRoute` builds the location itself and only reads the options, so - // `_options` goes through as-is. + // `dest` goes through as-is. // eslint-disable-next-line react-hooks/rules-of-hooks const enqueuePreload = React.useCallback( (e?: React.MouseEvent | React.FocusEvent | IntersectionObserverEntry) => { @@ -365,23 +373,16 @@ export function useLinkProps< } if (!preloadDelay) { - preloadLink(router, _options) + preloadLink(router, dest) return } - if (timeoutMap.has(innerRef)) { - return - } - - timeoutMap.set( - innerRef, - setTimeout(() => { - timeoutMap.delete(innerRef) - preloadLink(router, _options) - }, preloadDelay), - ) + innerRef.t ??= setTimeout(() => { + innerRef.t = undefined + preloadLink(router, dest) + }, preloadDelay) }, - [router, _options, innerRef, preload, preloadDelay], + [router, dest, innerRef, preload, preloadDelay], ) // Preload side effects: `render` preloads once per link, `viewport` watches @@ -394,7 +395,7 @@ export function useLinkProps< } if (preload === 'render' && !hasRenderFetched.current) { hasRenderFetched.current = true - preloadLink(router, _options) + preloadLink(router, dest) } let active = true let observer: IntersectionObserver | undefined @@ -419,7 +420,7 @@ export function useLinkProps< observer?.disconnect() cancelPreload(innerRef) } - }, [router, _options, preload, enqueuePreload, innerRef]) + }, [router, dest, preload, enqueuePreload, innerRef]) const props = collectElementProps(options, host) props.ref = forwardedRef ? mergedRef : innerRef @@ -448,23 +449,16 @@ export function useLinkProps< e.preventDefault() cancelPreload(innerRef) - // All is well? Navigate! - // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing - router.navigate({ - ..._options, - replace, - resetScroll, - hashScrollIntoView, - startTransition, - viewTransition, - ignoreBlocker, - }) + // The current options carry the navigation controls; `dest` only + // contributes the location the link displays. Navigation builds again + // to run `validateSearch` before committing. + router.navigate({ ...options, _fromLocation: dest._fromLocation }) } } const handleTouchStart = () => { if (preload === 'intent') { - preloadLink(router, _options) + preloadLink(router, dest) } } @@ -496,7 +490,6 @@ const ROUTER_OPTION_KEYS = /* @__PURE__ */ new Set([ 'mask', 'from', 'unsafeRelative', - '_fromLocation', 'reloadDocument', 'preload', 'preloadDelay', @@ -626,16 +619,16 @@ function getServerLinkProps( } const blockedLink = !disabled && !hrefOption - // Hash is not available on the server, so it never counts as hydrated. + // Hash is not available on the server: hash-sensitive links are inactive. const isActive = !!next && !blockedLink && + !activeOptions?.includeHash && resolveIsActive( router.stores.location.get(), next, activeOptions, router.basepath, - false, ) return applyLinkState( props, @@ -647,10 +640,13 @@ function getServerLinkProps( ) } -const timeoutMap = new WeakMap>() -const cancelPreload = (eventTarget: object) => { - clearTimeout(timeoutMap.get(eventTarget)) - timeoutMap.delete(eventTarget) +// A Link's own ref also holds its pending intent preload timer. +type LinkRef = React.RefObject & { + t?: ReturnType +} +const cancelPreload = (ref: LinkRef) => { + clearTimeout(ref.t) + ref.t = undefined } export const composeHandlers = ( @@ -865,8 +861,8 @@ export const Link: LinkComponent<'a'> = React.memo( areLinkPropsEqual, ) as any -// A Link's output depends only on its props, the router context and the -// location store, which React tracks for memoized components, so a parent +// A Link's output depends only on its props, the router context and its +// route's location source, which React tracks for memoized components, so a parent // re-render with equal props can skip it. Router options are compared by // value: destinations are usually inline object literals. Element props // (`children`, handlers, `style`, ...) are compared by reference only, since diff --git a/packages/react-router/src/matchContext.tsx b/packages/react-router/src/matchContext.tsx index a7030847e1..12db4dbada 100644 --- a/packages/react-router/src/matchContext.tsx +++ b/packages/react-router/src/matchContext.tsx @@ -1,6 +1,70 @@ 'use client' import * as React from 'react' +import { _isRouteDeparting } from '@tanstack/router-core' +import type { AnyRoute, AnyRouter, ParsedLocation } from '@tanstack/router-core' + +declare module '@tanstack/router-core' { + // Declaration merging requires the original type parameters. + // eslint-disable-next-line unused-imports/no-unused-vars + interface RouterStores { + /** + * The link scope of each route id that rendered links, keyed `undefined` + * for links outside every match (route ids start with `/` or are the + * root id). A scope without links holds no location. + */ + _linkScopes?: Record + } +} + +/** + * The location source shared by the links of one route. It holds one location + * subscription for all of them while any is subscribed, and skips a + * publication whose navigation removes the route: those links keep the + * location their route still presents until it unmounts or a newer + * publication keeps it. Without subscribers it holds nothing and reads the + * live location. + */ +export type LinkScope = [ + getSource: () => ParsedLocation, + subscribe: (listener: () => void) => () => void, +] + +export function createLinkScope( + router: AnyRouter, + routeId?: string, +): LinkScope { + // Stores are created once per router. + const store = router.stores.location + const listeners = new Set<() => void>() + let source: ParsedLocation | undefined + let unsubscribe: () => void + // Defined outside `subscribe` so the store's subscription does not share a + // closure with, and retain, the first listener after it unsubscribes. + const update = (location: ParsedLocation) => { + if (!_isRouteDeparting(router, routeId, location)) { + source = location + listeners.forEach((listener) => listener()) + } + } + return [ + () => source ?? store.get(), + (listener) => { + if (!listeners.size) { + source = store.get() + unsubscribe = store.subscribe(update).unsubscribe + } + listeners.add(listener) + return () => { + listeners.delete(listener) + if (!listeners.size) { + unsubscribe() + source = undefined + } + } + }, + ] +} export const matchContext = React.createContext(undefined) diff --git a/packages/react-router/tests/link-departing-scope.test.tsx b/packages/react-router/tests/link-departing-scope.test.tsx new file mode 100644 index 0000000000..04d0c3f32d --- /dev/null +++ b/packages/react-router/tests/link-departing-scope.test.tsx @@ -0,0 +1,1122 @@ +import { setFlagsFromString } from 'node:v8' +import { runInNewContext } from 'node:vm' +import React from 'react' +import { + act, + cleanup, + fireEvent, + render, + screen, + waitFor, +} from '@testing-library/react' +import { afterEach, describe, expect, test, vi } from 'vitest' +import { + Link, + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouteMask, + createRouter, + redirect, +} from '../src' + +afterEach(() => { + cleanup() + vi.restoreAllMocks() +}) + +type Deferred = { + promise: Promise + resolve: () => void +} + +function deferred(): Deferred { + let resolve!: () => void + const promise = new Promise((r) => (resolve = r)) + return { promise, resolve } +} + +type Gates = Partial> + +function setup({ + initial = '/a', + strict = false, + bAfterGate, + beforeRender, +}: { + initial?: string + strict?: boolean + bAfterGate?: () => void + beforeRender?: (router: any) => void +} = {}) { + const gates: Gates = {} + const counts = { + aUpdater: 0, + aRenders: 0, + goneUpdater: 0, + suspendedUpdater: 0, + } + // The `x` dependency of every `/a` load, preloads included. + const aLoads: Array = [] + // The `x` of every location the `a-next` link derives from. + const nextFrom: Array = [] + const controls: { + setHash?: (hash: string | undefined) => void + setExtra?: (extra: boolean) => void + setGone?: (gone: boolean) => void + setRenderPreload?: (renderPreload: boolean) => void + } = {} + let suspendGate: Deferred | undefined + + function Suspender() { + if (suspendGate) { + throw suspendGate.promise + } + return null + } + + const root = createRootRoute({ + component: () => ( + <> + + root b + + + + ), + }) + const layout = createRoute({ + getParentRoute: () => root, + id: '_layout', + component: () => ( + <> + + layout b + + + + ), + }) + function AComponent() { + const [hash, setHash] = React.useState(undefined) + const [extra, setExtra] = React.useState(false) + const [gone, setGone] = React.useState(false) + const [renderPreload, setRenderPreload] = React.useState(false) + controls.setHash = setHash + controls.setExtra = setExtra + controls.setGone = setGone + controls.setRenderPreload = setRenderPreload + return ( + <> +

A page

+ { + counts.aUpdater++ + return prev + }} + > + {() => { + counts.aRenders++ + return 'a self' + }} + + + a dot + + { + nextFrom.push(prev.x) + return { x: `${prev.x}-next` } + }} + preload="intent" + preloadDelay={0} + data-testid="a-next" + > + a next + + {renderPreload ? ( + ({ x: `${prev.x}-render` })} + preload="render" + data-testid="a-render" + > + a render + + ) : null} + {extra ? ( + prev} data-testid="a-extra"> + a extra + + ) : null} + {gone ? null : ( + { + counts.goneUpdater++ + return prev + }} + > + a gone + + )} + suspended}> + { + counts.suspendedUpdater++ + return prev + }} + > + a suspended + + + + + ) + } + const a = createRoute({ + getParentRoute: () => layout, + path: '/a', + loaderDeps: ({ search }: { search: any }) => ({ x: search.x }), + loader: ({ deps }: { deps: { x: unknown } }) => { + aLoads.push(deps.x) + return gates.a?.promise + }, + component: AComponent, + }) + const b = createRoute({ + getParentRoute: () => layout, + path: '/b', + loader: async () => { + await gates.b?.promise + bAfterGate?.() + }, + component: () =>

B page

, + }) + const c = createRoute({ + getParentRoute: () => root, + path: '/c', + component: () =>

C page

, + }) + const items = createRoute({ + getParentRoute: () => root, + path: '/items/$id', + loader: () => gates.items?.promise, + component: () => ( + <> +

Items page

+ + item 1 + + + item 2 + + + ), + }) + + const router = createRouter({ + routeTree: root.addChildren([layout.addChildren([a, b]), c, items]), + history: createMemoryHistory({ initialEntries: [initial] }), + }) + + beforeRender?.(router) + const app = + render(strict ? {app} : app) + + const link = (id: string) => screen.getByTestId(id) + const isActive = (id: string) => + link(id).getAttribute('aria-current') === 'page' + const href = (id: string) => link(id).getAttribute('href') + + async function start(options: any) { + await act(async () => { + void router.navigate(options) + await Promise.resolve() + }) + } + + async function settle() { + await waitFor(() => expect(router.state.status).toBe('idle')) + } + + async function release(name: keyof Gates) { + const gate = gates[name]! + gates[name] = undefined + await act(async () => { + gate.resolve() + await gate.promise + }) + } + + return { + router, + gates, + counts, + aLoads, + nextFrom, + controls, + link, + isActive, + href, + start, + settle, + release, + setSuspendGate: (gate: Deferred | undefined) => (suspendGate = gate), + } +} + +describe('links in a departing match', () => { + test('skip work at navigation start while staying links update urgently', async () => { + const t = setup() + await screen.findByText('A page') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + expect(t.isActive('layout-b')).toBe(false) + + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + t.gates.b = deferred() + await t.start({ to: '/b' }) + + expect(t.router.state.status).toBe('pending') + expect(t.router.state.location.pathname).toBe('/b') + expect(screen.getByText('A page')).toBeInTheDocument() + // Staying root and layout links update while the loader is pending. + expect(t.isActive('root-b')).toBe(true) + expect(t.isActive('layout-b')).toBe(true) + // The departing route's links do no work. + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.isActive('a-self')).toBe(true) + + await t.release('b') + await screen.findByText('B page') + expect(t.isActive('root-b')).toBe(true) + expect(t.router.state.status).toBe('idle') + }) + + test('staying route with changed params updates its links while pending', async () => { + const t = setup({ initial: '/items/1' }) + await screen.findByText('Items page') + expect(t.isActive('item-1')).toBe(true) + expect(t.isActive('item-2')).toBe(false) + + t.gates.items = deferred() + await t.start({ to: '/items/$id', params: { id: '2' } }) + expect(t.router.state.status).toBe('pending') + expect(t.isActive('item-1')).toBe(false) + expect(t.isActive('item-2')).toBe(true) + + await t.release('items') + expect(t.router.state.status).toBe('idle') + expect(t.isActive('item-2')).toBe(true) + }) + + test('a pending departure redirected back to the owner ends consistent', async () => { + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/a', search: { x: 'back' } } as any) + }, + }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.isActive('a-self')).toBe(true) + expect(t.href('a-self')).toBe('/a') + + await t.release('b') + expect(t.router.state.status).toBe('idle') + expect(t.router.state.location.href).toBe('/a?x=back') + expect(screen.getByText('A page')).toBeInTheDocument() + expect(t.href('a-self')).toBe('/a?x=back') + expect(t.isActive('a-self')).toBe(true) + expect(t.href('a-dot')).toBe('/a') + expect(t.isActive('root-b')).toBe(false) + }) + + test('a pending departure superseded by a location that keeps the owner ends consistent', async () => { + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + const updater = t.counts.aUpdater + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.counts.aUpdater).toBeGreaterThan(updater) + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + t.gates.b.resolve() + await t.settle() + expect(t.router.state.status).toBe('idle') + expect(t.router.state.location.href).toBe('/a?x=two') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + }) + + test('links mounting or changing in a departing match build from its held location', async () => { + const t = setup() + await screen.findByText('A page') + expect(t.href('a-dot')).toBe('/a') + t.gates.b = deferred() + await t.start({ to: '/b' }) + + act(() => { + t.controls.setHash!('h') + t.controls.setExtra!(true) + }) + // Both build from the location the rest of the match still presents. + expect(t.href('a-dot')).toBe('/a#h') + expect(t.href('a-extra')).toBe('/a') + expect(t.isActive('a-self')).toBe(true) + + await t.start({ to: '/a', search: { x: 'one' } }) + expect(t.href('a-dot')).toBe('/a#h') + expect(t.href('a-extra')).toBe('/a?x=one') + expect(t.href('a-self')).toBe('/a?x=one') + t.gates.b.resolve() + await t.settle() + expect(t.href('a-extra')).toBe('/a?x=one') + expect(t.isActive('a-extra')).toBe(true) + }) + + test('a pending navigation within the owner, then a departure, then back', async () => { + const t = setup() + await screen.findByText('A page') + + t.gates.a = deferred() + const firstA = t.gates.a + await t.start({ to: '/a', search: { x: 'one' } }) + expect(t.router.state.status).toBe('pending') + // Staying: updates while the owner's own loader is pending. + expect(t.href('a-self')).toBe('/a?x=one') + + t.gates.b = deferred() + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + await t.start({ to: '/b' }) + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.href('a-self')).toBe('/a?x=one') + expect(t.isActive('root-b')).toBe(true) + + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('root-b')).toBe(false) + + firstA.resolve() + t.gates.b.resolve() + await t.settle() + expect(t.router.state.status).toBe('idle') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + }) + + test('a departing link unmounted while pending does no further work', async () => { + const error = vi.spyOn(console, 'error') + const warn = vi.spyOn(console, 'warn') + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + const gone = t.counts.goneUpdater + await t.start({ to: '/b' }) + act(() => { + t.controls.setGone!(true) + }) + expect(screen.queryByTestId('a-gone')).toBeNull() + await t.release('b') + await screen.findByText('B page') + expect(t.counts.goneUpdater).toBe(gone) + expect(error).not.toHaveBeenCalled() + expect(warn).not.toHaveBeenCalled() + }) + + test('an abandoned suspended link render keeps links consistent', async () => { + const t = setup() + await screen.findByText('A page') + const gate = deferred() + t.setSuspendGate(gate) + // Re-render A so the boundary suspends with its link rendered but not committed. + act(() => { + t.controls.setHash!('s') + }) + t.setSuspendGate(undefined) + await act(async () => { + gate.resolve() + await gate.promise + }) + expect(t.href('a-suspended')).toBe('/a') + + await t.start({ to: '/a', search: { x: 'one' } }) + await t.settle() + expect(t.href('a-suspended')).toBe('/a?x=one') + + t.gates.b = deferred() + const suspended = t.counts.suspendedUpdater + await t.start({ to: '/b' }) + expect(t.counts.suspendedUpdater).toBe(suspended) + await t.release('b') + await screen.findByText('B page') + }) + + test('StrictMode double mounting keeps holding and updating', async () => { + const t = setup({ strict: true }) + await screen.findByText('A page') + t.gates.b = deferred() + const updater = t.counts.aUpdater + await t.start({ to: '/b' }) + expect(t.counts.aUpdater).toBe(updater) + expect(t.isActive('root-b')).toBe(true) + await t.start({ to: '/a', search: { x: 's' } }) + expect(t.href('a-self')).toBe('/a?x=s') + t.gates.b.resolve() + await t.settle() + expect(t.href('a-self')).toBe('/a?x=s') + expect(t.isActive('root-b')).toBe(false) + }) + + test.each([ + ['a-dot', '/a'], + ['a-next', '/a?x=one-next'], + ])( + 'clicking held link %s navigates to the href it displays', + async (id, displayed) => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.router.state.status).toBe('pending') + expect(t.href(id)).toBe(displayed) + + await act(async () => { + fireEvent.click(t.link(id)) + await Promise.resolve() + }) + expect(t.router.latestLocation.href).toBe(displayed) + t.gates.b.resolve() + await t.settle() + expect(t.router.state.location.href).toBe(displayed) + expect(screen.getByText('A page')).toBeInTheDocument() + }, + ) + + test.each(['mouseEnter', 'focus', 'touchStart'] as const)( + 'a %s preload of a held link loads the location it displays', + async (event) => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.href('a-next')).toBe('/a?x=one-next') + t.aLoads.length = 0 + + await act(async () => { + fireEvent[event](t.link('a-next')) + await Promise.resolve() + }) + expect(t.aLoads).toEqual(['one-next']) + await t.release('b') + await screen.findByText('B page') + }, + ) + + test('a render preload of a link mounting in a departing match loads the location it displays', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + t.aLoads.length = 0 + + await act(async () => { + t.controls.setRenderPreload!(true) + await Promise.resolve() + }) + expect(t.href('a-render')).toBe('/a?x=one-render') + expect(t.aLoads).toEqual(['one-render']) + await t.release('b') + await screen.findByText('B page') + }) + + test('staying links click and preload from the live location', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.a = deferred() + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.router.state.status).toBe('pending') + expect(t.href('a-next')).toBe('/a?x=two-next') + t.aLoads.length = 0 + + await act(async () => { + fireEvent.mouseEnter(t.link('a-next')) + await Promise.resolve() + }) + expect(t.aLoads).toEqual(['two-next']) + await act(async () => { + fireEvent.click(t.link('a-next')) + await Promise.resolve() + }) + expect(t.router.latestLocation.href).toBe('/a?x=two-next') + await t.release('a') + await t.settle() + expect(t.router.state.location.href).toBe('/a?x=two-next') + expect(t.href('a-next')).toBe('/a?x=two-next-next') + }) + + test('a revisited route starts with fresh links, also ones mounting during its next departure', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.href('a-next')).toBe('/a?x=one-next') + await t.release('b') + await screen.findByText('B page') + await t.settle() + + t.nextFrom.length = 0 + await act(() => t.router.navigate({ to: '/a', search: { x: 'two' } })) + await screen.findByText('A page') + await t.settle() + // The remounted links never derive from the previous visit's location. + expect(t.nextFrom).not.toContain('one') + expect(t.href('a-next')).toBe('/a?x=two-next') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + + // B is cached now: depart to a route that has not loaded yet. + t.gates.items = deferred() + const updater = t.counts.aUpdater + await t.start({ to: '/items/$id', params: { id: '1' } }) + expect(t.router.state.status).toBe('pending') + expect(t.counts.aUpdater).toBe(updater) + act(() => { + t.controls.setExtra!(true) + }) + // The new link holds this visit's location, not the previous visit's. + expect(t.href('a-extra')).toBe('/a?x=two') + expect(t.href('a-next')).toBe('/a?x=two-next') + expect(t.isActive('root-b')).toBe(false) + + await act(async () => { + fireEvent.click(t.link('a-extra')) + await Promise.resolve() + }) + expect(t.router.latestLocation.href).toBe('/a?x=two') + t.gates.items.resolve() + await t.settle() + expect(t.router.state.location.href).toBe('/a?x=two') + expect(t.isActive('a-extra')).toBe(true) + expect(t.href('a-next')).toBe('/a?x=two-next') + }) + + test('a document redirect from the destination does not break later navigations', async () => { + // jsdom reports the attempted document navigation as not implemented. + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/c', reloadDocument: true }) + }, + }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + await t.release('b') + await act(async () => { + await new Promise((resolve) => setTimeout(resolve, 0)) + }) + + await act(() => t.router.navigate({ to: '/a', search: { x: 'two' } })) + await t.settle() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + }) + + test('a departure superseded by a history traversal back to the owner updates its links', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + await act(() => t.router.navigate({ to: '/a', search: { x: 'two' } })) + await t.settle() + expect(t.href('a-self')).toBe('/a?x=two') + + t.gates.b = deferred() + const updater = t.counts.aUpdater + await t.start({ to: '/b' }) + expect(t.counts.aUpdater).toBe(updater) + await act(async () => { + t.router.history.go(-2) + await Promise.resolve() + }) + await t.settle() + expect(t.router.state.location.href).toBe('/a?x=one') + expect(t.href('a-self')).toBe('/a?x=one') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + t.gates.b.resolve() + await act(async () => { + await t.gates.b?.promise + }) + expect(screen.getByText('A page')).toBeInTheDocument() + expect(t.href('a-self')).toBe('/a?x=one') + }) + + test('invalidating a pending departure keeps holding until it commits', async () => { + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + await t.start({ to: '/b' }) + await act(async () => { + void t.router.invalidate() + await Promise.resolve() + }) + expect(t.router.state.status).toBe('pending') + expect(t.router.state.location.pathname).toBe('/b') + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(true) + await t.release('b') + await screen.findByText('B page') + expect(t.counts.aUpdater).toBe(updater) + }) + + test('a departure redirected or superseded to another departing location does no work', async () => { + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/c' }) + }, + }) + await screen.findByText('A page') + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + t.gates.b = deferred() + await t.start({ to: '/b' }) + t.gates.items = deferred() + await t.start({ to: '/items/$id', params: { id: '1' } }) + // B redirects to C after being superseded; neither keeps A. + await t.release('b') + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + await t.release('items') + await screen.findByText('Items page') + expect(t.router.state.location.pathname).toBe('/items/1') + + await act(() => t.router.navigate({ to: '/a' })) + await screen.findByText('A page') + const again = t.counts.aUpdater + t.gates.b = deferred() + await t.start({ to: '/b' }) + await t.release('b') + await screen.findByText('C page') + expect(t.counts.aUpdater).toBe(again) + }) + + test('a view transition callback that throws does not break later navigations', async () => { + vi.stubGlobal('CSS', { supports: () => true }) + ;(document as any).startViewTransition = (update: () => unknown) => { + update() + return { + updateCallbackDone: Promise.resolve(), + finished: Promise.resolve(), + } + } + const failures: Array = [] + const t = setup({ + // The history listener's load rejects with the callback's error. Record + // it instead of leaving it unhandled. + beforeRender: (router) => { + const load = router.load + router.load = (opts: any) => + load(opts).catch((error: unknown) => failures.push(error)) + }, + }) + await screen.findByText('A page') + await t.start({ + to: '/b', + viewTransition: { + types: () => { + throw new Error('types failed') + }, + }, + }) + await act(async () => { + await new Promise((resolve) => setTimeout(resolve, 0)) + }) + // The failed transaction leaves the router pending on the destination + // with the previous page displayed, without a newer publication. + expect(failures).toHaveLength(1) + expect(t.router.state.status).toBe('pending') + expect(t.router.state.location.pathname).toBe('/b') + expect(screen.getByText('A page')).toBeInTheDocument() + delete (document as any).startViewTransition + vi.unstubAllGlobals() + + // A navigation that keeps the page updates its links. + await act(() => t.router.navigate({ to: '/a', search: { x: 'two' } })) + await t.settle() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + }) + + test('links outside every match follow a pending navigation', async () => { + const t = setup() + await screen.findByText('A page') + cleanup() + const router = t.router + const InnerWrap = ({ children }: { children: React.ReactNode }) => ( + <> + + wrap b + + {children} + + ) + router.update({ ...router.options, InnerWrap }) + render() + await screen.findByText('A page') + expect(t.isActive('wrap-b')).toBe(false) + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(router.state.status).toBe('pending') + expect(t.isActive('wrap-b')).toBe(true) + await t.release('b') + await screen.findByText('B page') + expect(t.isActive('wrap-b')).toBe(true) + }) +}) + +describe('masked links in a departing match', () => { + test.each(['mask', 'routeMasks'] as const)( + 'clicking a held link with a location-dependent %s pushes the masked href it displays', + async (kind) => { + const root = createRootRoute() + const gate: { b?: Deferred } = {} + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + ({ id: prev.x })} + hash + mask={ + kind === 'mask' + ? ({ to: '.', search: true, hash: true } as any) + : undefined + } + data-testid="masked" + > + masked + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + loader: () => gate.b?.promise, + component: () =>

B page

, + }) + const photo = createRoute({ + getParentRoute: () => root, + path: '/photo', + component: () =>

Photo page

, + }) + const routeTree = root.addChildren([a, b, photo]) + const router = createRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/a?x=one#h'] }), + routeMasks: + kind === 'routeMasks' + ? [ + createRouteMask({ + routeTree, + from: '/photo', + to: '/a', + search: true, + hash: true, + } as any), + ] + : undefined, + }) + render() + const link = await screen.findByTestId('masked') + expect(link).toHaveAttribute('href', '/a?x=one#h') + + gate.b = deferred() + await act(async () => { + void router.navigate({ to: '/b' }) + await Promise.resolve() + }) + expect(router.state.status).toBe('pending') + expect(link).toHaveAttribute('href', '/a?x=one#h') + + await act(async () => { + fireEvent.click(link) + await Promise.resolve() + }) + // The URL bar shows the masked href the link displayed. + expect(router.history.location.href).toBe('/a?x=one#h') + expect(router.latestLocation.pathname).toBe('/photo') + expect(router.latestLocation.search).toEqual({ id: 'one' }) + gate.b.resolve() + await screen.findByText('Photo page') + expect(router.history.location.href).toBe('/a?x=one#h') + }, + ) + + test.each(['mask', 'routeMasks'] as const)( + 'a link with a fixed %s builds its location once and does not rerender across navigations', + async (kind) => { + // Every location the router builds for the masked link passes through + // the output rewrite. + let maskedBuilds = 0 + let renders = 0 + const root = createRootRoute({ + component: () => ( + <> + + {() => { + renders++ + return 'masked' + }} + + + + ), + }) + const routes = ['a', 'b', 'photo', 'posts'].map((path) => + createRoute({ + getParentRoute: () => root, + path: `/${path}`, + component: () =>

{path} page

, + }), + ) + const routeTree = root.addChildren(routes) + const router = createRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/a'] }), + rewrite: { + output: ({ url }) => { + if (url.pathname === '/photo' || url.pathname === '/posts') { + maskedBuilds++ + } + return url + }, + }, + routeMasks: + kind === 'routeMasks' + ? [ + createRouteMask({ + routeTree, + from: '/photo', + to: '/posts', + search: { from: 'photo' }, + } as any), + ] + : undefined, + }) + render() + const link = await screen.findByTestId('masked') + expect(link).toHaveAttribute('href', '/posts?from=photo') + const buildsAfterMount = maskedBuilds + const rendersAfterMount = renders + + for (const to of ['/b', '/a', '/b']) { + await act(() => router.navigate({ to })) + await screen.findByText(`${to.slice(1)} page`) + } + expect(link).toHaveAttribute('href', '/posts?from=photo') + expect(maskedBuilds).toBe(buildsAfterMount) + expect(renders).toBe(rendersAfterMount) + }, + ) +}) + +describe('link scope retention', () => { + setFlagsFromString('--expose-gc') + const gc: () => void = runInNewContext('gc') + async function collect() { + for (let round = 0; round < 3; round++) { + await new Promise((resolve) => setTimeout(resolve, 0)) + gc() + } + } + const alive = (refs: Array>) => + refs.flatMap((ref, index) => (ref.deref() ? [index] : [])) + + // Builds and renders a router whose route `/a` and root render Links, and + // returns a function that visits a location with a large history state. + function renderApp() { + const root = createRootRoute({ + component: () => ( + <> + + root b + + + + ), + }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ prev} data-testid="a-self"> + a self + + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + component: () =>

B page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, b]), + history: createMemoryHistory({ initialEntries: ['/a'] }), + }) + render() + return async (to: string, index: number) => { + await act(() => + router.navigate({ + to, + search: { i: index }, + state: { payload: new Array(100_000).fill(index) } as any, + replace: true, + } as any), + ) + await waitFor(() => expect(router.state.status).toBe('idle')) + const location: any = router.state.location + return [new WeakRef(location), new WeakRef(location.state.payload)] + } + } + + test( + 'locations with large history state are collectable after their route is left', + { timeout: 20_000 }, + async () => { + const visit = renderApp() + await screen.findByText('A page') + // The router may keep its first navigation's state (also on main). + await visit('/a', 0) + const left: Array> = [] + for (let index = 1; index < 5; index++) { + left.push(...(await visit('/a', index))) + } + for (let index = 5; index < 9; index++) { + left.push(...(await visit('/b', index))) + } + await visit('/b', 9) + await screen.findByText('B page') + await collect() + // Only the current location (and its payload) stays reachable. + expect(alive(left)).toEqual([]) + }, + ) +}) + +describe('links after a same-href navigation that changes history state', () => { + function renderStateApp() { + // The `tag` state of every `/b` load, preloads included. + const bLoads: Array = [] + const root = createRootRoute({ component: () => }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ + inherit + + ({ tag: `${prev.tag}-updated` }) as any} + data-testid="updater" + > + updater + + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + loader: ({ location }) => { + bLoads.push((location.state as any).tag) + }, + component: () =>

B page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, b]), + history: createMemoryHistory({ initialEntries: ['/a'] }), + }) + render() + return { router, bLoads } + } + + async function changeState(router: any) { + await screen.findByText('A page') + await act(() => + router.navigate({ + to: '/a', + state: { tag: 'latest' } as any, + replace: true, + }), + ) + expect(router.state.location.href).toBe('/a') + expect(router.state.location.state.tag).toBe('latest') + } + + test.each([ + ['inherit', 'latest'], + ['updater', 'latest-updated'], + ])( + 'clicking link %s derives its state from the latest location', + async (id, tag) => { + const { router } = renderStateApp() + await changeState(router) + + fireEvent.click(screen.getByTestId(id)) + await screen.findByText('B page') + expect(router.state.location.pathname).toBe('/b') + expect((router.state.location.state as any).tag).toBe(tag) + }, + ) + + test('preloading derives its state from the latest location', async () => { + const { router, bLoads } = renderStateApp() + await changeState(router) + + fireEvent.mouseEnter(screen.getByTestId('inherit')) + await waitFor(() => expect(bLoads).toEqual(['latest'])) + }) +}) diff --git a/packages/react-router/tests/link-destination.test.tsx b/packages/react-router/tests/link-destination.test.tsx index 8d27615ff9..31daa6d551 100644 --- a/packages/react-router/tests/link-destination.test.tsx +++ b/packages/react-router/tests/link-destination.test.tsx @@ -4,6 +4,7 @@ import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' import { Link, Outlet, + RouterContextProvider, RouterProvider, createMemoryHistory, createRootRoute, @@ -356,3 +357,142 @@ describe('Link destination updates', () => { expect(propMask).toHaveAttribute('href', '/visible/two') }) }) + +describe('Link props that change without a destination prop', () => { + afterEach(() => { + cleanup() + vi.useRealTimers() + }) + + async function setup(targetLoader?: () => void, nextLoader?: () => void) { + const root = createRootRoute() + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/a' }), + createRoute({ + getParentRoute: () => root, + path: '/b', + loader: targetLoader, + }), + createRoute({ + getParentRoute: () => root, + path: '/c', + loader: nextLoader, + }), + ]), + history: createMemoryHistory({ initialEntries: ['/a'] }), + }) + await router.load() + return router + } + + test('changing reloadDocument affects the next click', async () => { + const router = await setup() + const blockedTargets: Array = [] + const unblock = router.history.block({ + blockerFn: ({ nextLocation }) => { + blockedTargets.push(nextLocation.pathname) + return true + }, + }) + function Example() { + const [reload, setReload] = React.useState(false) + return ( + <> + + + Target + + + ) + } + render( + + + , + ) + try { + fireEvent.click(screen.getByRole('button', { name: 'Enable reload' })) + await act(() => { + fireEvent.click(screen.getByRole('link', { name: 'Target' })) + }) + // A document navigation shows blockers the current history location; + // a client navigation would show the pending /b location. + expect(blockedTargets).toEqual(['/a']) + expect(router.history.location.pathname).toBe('/a') + } finally { + unblock() + } + }) + + test('changing href updates the displayed target and active state', async () => { + const router = await setup() + function Example() { + const [changed, setChanged] = React.useState(false) + return ( + <> + + + Target + + + ) + } + render( + + + , + ) + const link = screen.getByRole('link', { name: 'Target' }) + expect(link).toHaveAttribute('href', '/a') + expect(link).toHaveAttribute('aria-current', 'page') + fireEvent.click(screen.getByRole('button', { name: 'Change href' })) + expect(link).toHaveAttribute('href', '/b') + expect(link).not.toHaveAttribute('aria-current') + }) + + test('changing href cancels intent work for the old target and preloads and navigates to the new one', async () => { + const oldLoader = vi.fn() + const nextLoader = vi.fn() + const router = await setup(oldLoader, nextLoader) + vi.useFakeTimers() + function Example() { + const [href, setHref] = React.useState('/b') + return ( + <> + + + Target + + + ) + } + render( + + + , + ) + const link = screen.getByRole('link', { name: 'Target' }) + expect(link).toHaveAttribute('href', '/b') + fireEvent.mouseOver(link) + await act(() => vi.advanceTimersByTimeAsync(20)) + fireEvent.click(screen.getByRole('button', { name: 'Retarget' })) + expect(link).toHaveAttribute('href', '/c') + await act(() => vi.advanceTimersByTimeAsync(100)) + expect(oldLoader).not.toHaveBeenCalled() + expect(nextLoader).not.toHaveBeenCalled() + + fireEvent.mouseLeave(link) + fireEvent.mouseOver(link) + await act(() => vi.advanceTimersByTimeAsync(50)) + expect(nextLoader).toHaveBeenCalledTimes(1) + expect(router.state.location.pathname).toBe('/a') + + await act(() => { + fireEvent.click(link) + }) + expect(router.state.location.pathname).toBe('/c') + expect(link).toHaveAttribute('aria-current', 'page') + expect(oldLoader).not.toHaveBeenCalled() + }) +}) diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 9d0e0e8b07..9206ef60dd 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -103,7 +103,11 @@ export { resolveManifestCssLink, } from './manifest' export { isMatch } from './Matches' -export { _getAssetMatches, _getRenderedMatches } from './load-client' +export { + _getAssetMatches, + _getRenderedMatches, + _isRouteDeparting, +} from './load-client' export { composeSsrBodyScripts, getSsrBodyScriptParts } from './ssr/bodyScripts' export type { AnyMatchAndValue, diff --git a/packages/router-core/src/load-client.ts b/packages/router-core/src/load-client.ts index ea4f270447..9e3391215e 100644 --- a/packages/router-core/src/load-client.ts +++ b/packages/router-core/src/load-client.ts @@ -116,6 +116,28 @@ export function _getRenderedMatches( return end && end < matches.length ? matches.slice(0, end) : matches } +/** + * Truthy when the transaction publishing `location` leaves `routeId` out of its + * matches, so subscribers scoped to that route can skip the publication: the + * route unmounts when the transaction commits, and a transaction that ends + * otherwise is superseded or redirected by a newer publication. Only valid + * synchronously inside the publication: the transaction's matches are emptied + * at commit and before following a redirect. Publications without a matching + * transaction (hydration) and scopes without a route never depart. + */ +export function _isRouteDeparting( + router: AnyRouter, + routeId: string | undefined, + location: ParsedLocation, +): unknown { + const tx = router._tx + return ( + routeId && + tx?.[2 /* location */] === location && + !tx[3 /* matches */].some((match) => match.routeId === routeId) + ) +} + /** Return the lane whose document assets belong to the current presentation. */ export function _getAssetMatches( matches: Array, diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index d3379a85f2..ab3fe23194 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -1914,9 +1914,10 @@ export class RouterCore< } } - // We allow the caller to override the current location + // We allow the caller to override the current location. Masks build + // from the same location as the destination they mask. const currentLocation = - dest._fromLocation || this._pendingLocation || this.latestLocation + opts._fromLocation || this._pendingLocation || this.latestLocation // Value-affecting reads of the current location go through these two. // The lightweight match (fullPath, search, params without full match @@ -2204,13 +2205,10 @@ export class RouterCore< } } - // Masked locations stay out: `opts.mask` is rebuilt from the current location. - if ( - !(isServer ?? this.isServer) && - !usedCurrent && - opts._fromLocation && - !next.maskedLocation - ) { + // A mask that reads the current location marks the whole result through + // `usedCurrent`. Route masks belong to the route tree and options, whose + // updates replace the cache. + if (!(isServer ?? this.isServer) && !usedCurrent && opts._fromLocation) { this.staticLocations!.set(opts, next) } diff --git a/packages/router-core/tests/mask.test.ts b/packages/router-core/tests/mask.test.ts index 3791206dd7..3722aa6a1b 100644 --- a/packages/router-core/tests/mask.test.ts +++ b/packages/router-core/tests/mask.test.ts @@ -645,3 +645,201 @@ describe('buildLocation - route masks', () => { ) }) }) + +describe('buildLocation - masks and _fromLocation', () => { + test.each(['mask', 'routeMasks'] as const)( + 'the %s location builds from _fromLocation like the destination', + async (kind) => { + const rootRoute = new BaseRootRoute({}) + const postsRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/posts', + }) + const photoRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/photo', + }) + const routeTree = rootRoute.addChildren([postsRoute, photoRoute]) + const router = createTestRouter({ + routeTree, + history: createMemoryHistory({ + initialEntries: ['/posts?page=1#live'], + }), + routeMasks: + kind === 'routeMasks' + ? [ + { + routeTree: null as any, + from: '/photo', + to: '.', + search: true, + hash: true, + }, + ] + : undefined, + }) + await router.load() + const held = router.buildLocation({ + to: '/posts', + search: { page: 5 }, + hash: 'held', + }) + + const location = router.buildLocation({ + to: '/photo', + search: true, + mask: + kind === 'mask' ? { to: '.', search: true, hash: true } : undefined, + _fromLocation: held, + } as any) + + expect(location.href).toBe('/photo?page=5') + expect(location.maskedLocation?.href).toBe('/posts?page=5#held') + }, + ) +}) + +describe('buildLocation - masked locations and the static location cache', () => { + const setup = (routeMasks?: Array>) => { + const rootRoute = new BaseRootRoute({}) + const postsRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/posts', + }) + const photoRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/photo', + }) + const photosRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/photos/$photoId', + }) + const routeTree = rootRoute.addChildren([ + postsRoute, + photoRoute, + photosRoute, + ]) + const router = createTestRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/posts'] }), + routeMasks, + }) + // Two sources a Link can display, as the router builds them. + const sources = [1, 2].map((n) => + router.buildLocation({ + to: '/photos/$photoId', + params: { photoId: `${n}` }, + search: { page: n }, + hash: n === 1 ? 'one' : 'two', + state: { n } as any, + }), + ) + // Builds one options object from each source in turn, the way a Link + // rebuilds its destination when its displayed location changes. + const buildFromEachSource = (opts: Record) => + sources.map((source) => + router.buildLocation( + Object.assign(opts, { _fromLocation: source }) as any, + ), + ) + return { router, routeTree, buildFromEachSource } + } + + test('reuses the location of a fixed mask across sources', () => { + const { buildFromEachSource } = setup() + const [first, second] = buildFromEachSource({ + to: '/photo', + search: { id: 1 }, + mask: { to: '/posts', search: { from: 'photo' } }, + }) + expect(first!.maskedLocation!.href).toBe('/posts?from=photo') + expect(second).toBe(first) + }) + + test('reuses the location of a fixed route mask across sources', () => { + const { buildFromEachSource } = setup([ + { routeTree: null as any, from: '/photo', to: '/posts' }, + ]) + const [first, second] = buildFromEachSource({ to: '/photo' }) + expect(first!.maskedLocation!.href).toBe('/posts') + expect(second).toBe(first) + }) + + test.each([ + ['a relative target', { to: '.' }, ['/photos/1', '/photos/2']], + [ + 'inherited params', + { to: '/photos/$photoId' }, + ['/photos/1', '/photos/2'], + ], + [ + 'the current search', + { to: '/posts', search: true }, + ['/posts?page=1', '/posts?page=2'], + ], + [ + 'a search updater', + { to: '/posts', search: (prev: any) => ({ p: prev.page }) }, + ['/posts?p=1', '/posts?p=2'], + ], + [ + 'the current hash', + { to: '/posts', hash: true }, + ['/posts#one', '/posts#two'], + ], + ] as const)( + 'rebuilds a mask that reads %s for each source', + (_, mask, expected) => { + const { buildFromEachSource } = setup() + const locations = buildFromEachSource({ to: '/photo', mask }) + expect(locations[1]).not.toBe(locations[0]) + expect( + locations.map((location) => location.maskedLocation!.href), + ).toEqual(expected) + }, + ) + + test('rebuilds a mask that reads the current state for each source', () => { + const { buildFromEachSource } = setup() + const locations = buildFromEachSource({ + to: '/photo', + mask: { to: '/posts', state: true }, + }) + expect(locations[1]).not.toBe(locations[0]) + expect( + locations.map((location) => (location.maskedLocation!.state as any).n), + ).toEqual([1, 2]) + }) + + test('rebuilds a route mask that reads the current location for each source', () => { + const { buildFromEachSource } = setup([ + { + routeTree: null as any, + from: '/photo', + to: '/posts', + search: true, + hash: true, + }, + ]) + const locations = buildFromEachSource({ to: '/photo' }) + expect(locations[1]).not.toBe(locations[0]) + expect(locations.map((location) => location.maskedLocation!.href)).toEqual([ + '/posts?page=1#one', + '/posts?page=2#two', + ]) + }) + + test('drops a cached route mask when the router is updated', () => { + const { router, buildFromEachSource } = setup([ + { routeTree: null as any, from: '/photo', to: '/posts' }, + ]) + const opts = { to: '/photo' } + const [first] = buildFromEachSource(opts) + expect(first!.maskedLocation!.href).toBe('/posts') + + router.update({ ...router.options, routeMasks: undefined }) + const [afterUpdate] = buildFromEachSource(opts) + expect(afterUpdate).not.toBe(first) + expect(afterUpdate!.maskedLocation).toBeUndefined() + }) +}) diff --git a/packages/solid-router/src/link.tsx b/packages/solid-router/src/link.tsx index 94f453bb2c..a3c183fc91 100644 --- a/packages/solid-router/src/link.tsx +++ b/packages/solid-router/src/link.tsx @@ -1,8 +1,7 @@ import * as Solid from 'solid-js' -import { mergeRefs } from '@solid-primitives/refs' - import { + _isRouteDeparting, deepEqual, functionalUpdate, getUrlScheme, @@ -15,6 +14,7 @@ import { import { isServer } from '@tanstack/router-core/isServer' import { Dynamic } from 'solid-js/web' import { useRouter } from './useRouter' +import { nearestMatchContext } from './matchContext' import { useIntersectionObserver } from './utils' @@ -23,6 +23,7 @@ import type { AnyRouter, Constrain, LinkOptions, + ParsedLocation, RegisteredRouter, RoutePaths, } from '@tanstack/router-core' @@ -31,12 +32,6 @@ import type { ValidateLinkOptionsArray, } from './typePrimitives' -const timeoutMap = new WeakMap>() -const cancelPreload = (eventTarget: object) => { - clearTimeout(timeoutMap.get(eventTarget)) - timeoutMap.delete(eventTarget) -} - export function useLinkProps< TRouter extends AnyRouter = RegisteredRouter, TFrom extends RoutePaths | string = string, @@ -45,225 +40,199 @@ export function useLinkProps< TMaskTo extends string = '', >( options: UseLinkPropsOptions, +): Solid.ComponentProps<'a'> { + return createLinkProps(options as any, LINK_OPTION_KEYS) +} + +// `ownKeys` are the options that never reach the element. +function createLinkProps( + options: UseLinkPropsOptions, + ownKeys: ReadonlyArray, ): Solid.ComponentProps<'a'> { const router = useRouter() - const [local, rest] = Solid.splitProps( - Solid.mergeProps( - { - activeProps: STATIC_ACTIVE_PROPS_GET, - inactiveProps: STATIC_INACTIVE_PROPS_GET, - }, - options, - ), - [ - 'activeProps', - 'inactiveProps', - 'activeOptions', - 'to', - 'preload', - 'preloadDelay', - 'preloadIntentProximity', - 'hashScrollIntoView', - 'replace', - 'startTransition', - 'resetScroll', - 'viewTransition', - 'target', - 'disabled', - 'style', - 'class', - 'onClick', - 'onBlur', - 'onFocus', - 'onMouseEnter', - 'onMouseLeave', - 'onMouseOver', - 'onMouseOut', - 'onTouchStart', - 'ignoreBlocker', - ], + // Options are read directly: one props proxy, no merged-default getters. + const [, propsSafeToSpread] = Solid.splitProps( + options, + ownKeys as Array, ) - // const { - // // custom props - // activeProps = () => ({ class: 'active' }), - // inactiveProps = () => ({}), - // activeOptions, - // to, - // preload: userPreload, - // preloadDelay: userPreloadDelay, - // hashScrollIntoView, - // replace, - // startTransition, - // resetScroll, - // viewTransition, - // // element props - // children, - // target, - // disabled, - // style, - // class, - // onClick, - // onFocus, - // onMouseEnter, - // onMouseLeave, - // onTouchStart, - // ignoreBlocker, - // ...rest - // } = options + // A live match never changes route, so read it once without tracking. + const routeId = Solid.useContext(nearestMatchContext)[0 /* routeId */]() - const [_, propsSafeToSpread] = Solid.splitProps(rest, [ - 'params', - 'search', - 'hash', - 'state', - 'mask', - 'reloadDocument', - 'unsafeRelative', - 'from', - 'href', - ]) + // While a publishing navigation leaves the Link's route, keep the location + // the route still presents so the Link does no work. The route unmounts + // when that navigation commits, and any other outcome publishes a newer + // location. Compare by identity: a same-href navigation can change state. + // The server renders one location: no reactivity there. + const currentLocation = + (isServer ?? router.isServer) + ? () => router.stores.location.get() + : Solid.createMemo((prev?: ParsedLocation) => { + const location = router.stores.location.get() + return prev && _isRouteDeparting(router, routeId, location) + ? prev + : location + }) - const currentLocation = Solid.createMemo( - () => router.stores.location.get(), - undefined, - { equals: (prev, next) => prev.href === next.href }, - ) - - const next = Solid.createMemo(() => { - // Rebuild when inherited search/hash or the current route context changes. - const _fromLocation = currentLocation() - const nextOptions = { _fromLocation, ...options } as any - // untrack because router-core will also access stores, which are signals in solid - return Solid.untrack(() => router.buildLocation(nextOptions)) - }) - - const hrefOption = Solid.createMemo(() => { - if (options.disabled) return undefined - // Use publicHref - it contains the correct href for display - // When a rewrite changes the origin, publicHref is the full URL - // Otherwise it's the origin-stripped path - // This avoids constructing URL objects in the hot path - const location = next().maskedLocation ?? next() - const publicHref = location.publicHref - const external = location.external - - const href = external - ? publicHref - : router.history.createHref(publicHref) || '/' - if ( - (external || href !== publicHref) && - isDangerousProtocol(href, router.protocolAllowlist) - ) { - if (process.env.NODE_ENV !== 'production') { - console.warn(`Blocked Link with dangerous protocol: ${href}`) + // The Link's own destination options, replaced only when a destination prop + // changes: the router reuses a location built from the same object without + // reading the current location. A Solid store changes in place, so a store + // prop value (checked one level deep, not nested) gets a fresh object per + // location instead, re-reading the store at each navigation as before. A + // mask holds destination options of its own, so its values are checked too. + const getDest = () => { + const dest: any = {} + for (const key of NAVIGATION_KEYS) { + const value = (dest[key] = (options as any)[key]) + if ( + isStore(value) || + (key === 'mask' && value && Object.values(value).some(isStore)) + ) { + currentLocation() } - return undefined } + return dest + } + const dest = + (isServer ?? router.isServer) ? getDest : Solid.createMemo(getDest) - return href - }) + // Only a hydrating client renders the server's hash-less active state first. + const hasHydrated = + !(isServer ?? router.isServer) && router.options.ssr + ? useHydrated() + : undefined - const externalLink = Solid.createMemo(() => { + // Everything the Link derives from its destination and the location, in + // one computation: [element href, external href (null when blocked), + // active]. An unchanged result keeps its identity, so a navigation that + // leaves the Link as it was notifies nothing downstream. + const getLinkState = (prev?: LinkState): LinkState => { + const location = currentLocation() const to = options.to + const disabled = options.disabled const scheme = typeof to === 'string' && getUrlScheme(to) + let href: string | undefined + let external: string | null | undefined + let active = false if (scheme) { - if (!router.protocolAllowlist.has(scheme)) { + if (router.protocolAllowlist.has(scheme)) { + external = to + } else { if (process.env.NODE_ENV !== 'production') { console.warn(`Blocked Link with dangerous protocol: ${to}`) } - return null + external = null } - return to - } - - const _href = hrefOption() - if (!_href && !options.disabled) { - return null - } - return _href && getUrlScheme(_href) ? _href : undefined - }) - - const shouldHydrateHash = !isServer && !!router.options.ssr - const hasHydrated = (isServer ?? router.isServer) ? undefined : useHydrated() - - const isActive = Solid.createMemo(() => { - if (externalLink() !== undefined) { - return false - } - const activeOptions = local.activeOptions - const current = currentLocation() - const nextLocation = next() - - const currentPath = removeTrailingSlash(current.pathname, router.basepath) - const nextPath = removeTrailingSlash(nextLocation.pathname, router.basepath) - - // Both modes compare normalized paths; fuzzy matches need a segment boundary. - if ( - activeOptions?.exact - ? currentPath !== nextPath - : !( - currentPath.startsWith(nextPath) && - (currentPath.length === nextPath.length || - currentPath[nextPath.length] === '/') - ) - ) { - return false - } - - if (activeOptions?.includeSearch ?? true) { - const searchTest = deepEqual( - current.search, - nextLocation.search, - !activeOptions?.exact, - activeOptions?.explicitUndefined, - ) - if (!searchTest) { - return false + } else { + const options_ = dest() + // Clicks and preloads go where the href points. + options_._fromLocation = location + // untrack because router-core will also access stores, which are signals in solid + const next = Solid.untrack(() => router.buildLocation(options_)) + if (!disabled) { + // Use publicHref - it contains the correct href for display + // When a rewrite changes the origin, publicHref is the full URL + // Otherwise it's the origin-stripped path + // This avoids constructing URL objects in the hot path + const shown = next.maskedLocation ?? next + const publicHref = shown.publicHref + const shownHref = shown.external + ? publicHref + : router.history.createHref(publicHref) || '/' + if ( + (shown.external || shownHref !== publicHref) && + isDangerousProtocol(shownHref, router.protocolAllowlist) + ) { + if (process.env.NODE_ENV !== 'production') { + console.warn(`Blocked Link with dangerous protocol: ${shownHref}`) + } + } else { + href = shownHref + } + } + external = + !href && !disabled + ? null + : href && getUrlScheme(href) + ? href + : undefined + if (external === undefined) { + const activeOptions = options.activeOptions + const currentPath = removeTrailingSlash( + location.pathname, + router.basepath, + ) + const nextPath = removeTrailingSlash(next.pathname, router.basepath) + // Both modes compare normalized paths; fuzzy matches need a segment boundary. + active = + (activeOptions?.exact + ? currentPath === nextPath + : currentPath.startsWith(nextPath) && + (currentPath.length === nextPath.length || + currentPath[nextPath.length] === '/')) && + (!(activeOptions?.includeSearch ?? true) || + deepEqual( + location.search, + next.search, + !activeOptions?.exact, + activeOptions?.explicitUndefined, + )) && + (!activeOptions?.includeHash || + (hasHydrated && !hasHydrated() ? '' : location.hash) === next.hash) } } - - if (activeOptions?.includeHash) { - const currentHash = - shouldHydrateHash && !hasHydrated?.() ? '' : current.hash - return currentHash === nextLocation.hash - } - return true - }) - - const simpleStyling = Solid.createMemo( - () => - local.activeProps === STATIC_ACTIVE_PROPS_GET && - local.inactiveProps === STATIC_INACTIVE_PROPS_GET && - local.class === undefined && - local.style === undefined, - ) + href = external === null ? undefined : external || href + return prev && + prev[0 /* href */] === href && + prev[1 /* external */] === external && + prev[2 /* active */] === active + ? prev + : [href, external, active] + } + const linkState = + (isServer ?? router.isServer) + ? getLinkState + : Solid.createMemo(getLinkState) type ResolvedLinkStateProps = Omit, 'style'> & { style?: Solid.JSX.CSSProperties } const resolveLinkStateProps = ( + [href, external, active]: LinkState, base: Solid.ComponentProps<'a'> & { disabled?: boolean }, ) => { - const active = isActive() + const disabled = options.disabled || external === null + base.href = href + base.disabled = disabled + base.target = options.target + if (disabled) { + Object.assign(base, STATIC_DISABLED_PROPS) + } - if (simpleStyling()) { - return { - ...base, - ...(active && STATIC_DEFAULT_ACTIVE_ATTRIBUTES), - } + if ( + options.activeProps === undefined && + options.inactiveProps === undefined && + options.class === undefined && + options.style === undefined + ) { + return active + ? Object.assign(base, STATIC_DEFAULT_ACTIVE_ATTRIBUTES) + : base } const stateProps: ResolvedLinkStateProps = - functionalUpdate(active ? local.activeProps : local.inactiveProps, {}) ?? - EMPTY_OBJECT - const baseStyle = local.style + functionalUpdate( + (active ? options.activeProps : options.inactiveProps) ?? + (active ? STATIC_ACTIVE_PROPS : EMPTY_OBJECT), + {}, + ) ?? EMPTY_OBJECT + const baseStyle = options.style const stateStyle = stateProps.style // Snapshot reactive style properties so in-place updates remain observable. const style = baseStyle || stateStyle ? { ...baseStyle, ...stateStyle } : undefined - const baseClass = local.class + const baseClass = options.class const stateClass = stateProps.class const className = baseClass ? stateClass @@ -275,8 +244,8 @@ export function useLinkProps< ...base, ...stateProps, // State props can override element props, but not routing options. - href: base.href, - disabled: base.disabled, + href, + disabled, target: base.target, ...(style && hasKeys(style) && { style }), ...(className && { class: className }), @@ -286,22 +255,16 @@ export function useLinkProps< // Keep the guard inline so browser builds can drop the server return. if (isServer ?? router.isServer) { - const external = externalLink() - const disabled = local.disabled || external === null - const props = resolveLinkStateProps({ - onClick: local.onClick, - onBlur: local.onBlur, - onFocus: local.onFocus, - onMouseEnter: local.onMouseEnter, - onMouseLeave: local.onMouseLeave, - onMouseOut: local.onMouseOut, - onMouseOver: local.onMouseOver, - onTouchStart: local.onTouchStart, - href: external === null ? undefined : external || hrefOption(), + const props = resolveLinkStateProps(linkState(), { + onClick: options.onClick, + onBlur: options.onBlur, + onFocus: options.onFocus, + onMouseEnter: options.onMouseEnter, + onMouseLeave: options.onMouseLeave, + onMouseOut: options.onMouseOut, + onMouseOver: options.onMouseOver, + onTouchStart: options.onTouchStart, ref: options.ref, - disabled, - target: local.target, - ...(disabled && STATIC_DISABLED_PROPS), }) // Avoid creating merged-prop getters for absent server event handlers. for (const key of STATIC_EVENT_PROPS) { @@ -314,34 +277,33 @@ export function useLinkProps< let hasRenderFetched = false - const preload = Solid.createMemo(() => { - if ( - options.reloadDocument || - externalLink() !== undefined || - local.disabled - ) { - return false - } - return local.preload ?? router.options.defaultPreload - }) + const preload = () => + !options.reloadDocument && + linkState()[1 /* external */] === undefined && + !options.disabled && + (options.preload ?? router.options.defaultPreload) const preloadDelay = () => - local.preloadDelay ?? router.options.defaultPreloadDelay ?? 0 + options.preloadDelay ?? router.options.defaultPreloadDelay ?? 0 const doPreload = () => - router - .preloadRoute(options as Parameters[0]) - .catch((err: any) => { - console.warn(err) - console.warn(preloadWarning) - }) + router.preloadRoute(dest()).catch((err: any) => { + console.warn(err) + console.warn(preloadWarning) + }) const [ref, setRef] = Solid.createSignal(null) + let preloadTimeout: ReturnType | undefined + const cancelPreload = () => { + clearTimeout(preloadTimeout) + preloadTimeout = undefined + } + const enqueuePreload = ( e?: MouseEvent | FocusEvent | IntersectionObserverEntry, ) => { if (!e) { - cancelPreload(ref) + cancelPreload() return } @@ -352,7 +314,7 @@ export function useLinkProps< ) ) { if ((e as IntersectionObserverEntry).isIntersecting === false) { - cancelPreload(ref) + cancelPreload() } return } @@ -362,24 +324,13 @@ export function useLinkProps< return } - if (!timeoutMap.has(ref)) { - timeoutMap.set( - ref, - setTimeout(() => { - timeoutMap.delete(ref) - doPreload() - }, preloadDelay()), - ) - } + preloadTimeout ??= setTimeout(() => { + preloadTimeout = undefined + doPreload() + }, preloadDelay()) } - useIntersectionObserver( - ref, - enqueuePreload, - () => preload() !== 'viewport', - // Intent preloading still needs timer cleanup without an observer. - () => !!preload(), - ) + useIntersectionObserver(ref, enqueuePreload, preload) Solid.createEffect(() => { if (hasRenderFetched) { @@ -398,30 +349,22 @@ export function useLinkProps< e.currentTarget as HTMLAnchorElement | SVGAElement ).getAttribute('target') const effectiveTarget = - local.target !== undefined ? local.target : elementTarget + options.target !== undefined ? options.target : elementTarget if ( - !local.disabled && - externalLink() === undefined && + !options.disabled && + linkState()[1 /* external */] === undefined && !(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) && !e.defaultPrevented && (!effectiveTarget || effectiveTarget === '_self') && e.button === 0 ) { e.preventDefault() - cancelPreload(ref) + cancelPreload() // All is well? Navigate! // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing - router.navigate({ - ...options, - replace: local.replace, - resetScroll: local.resetScroll, - hashScrollIntoView: local.hashScrollIntoView, - startTransition: local.startTransition, - viewTransition: local.viewTransition, - ignoreBlocker: local.ignoreBlocker, - }) + router.navigate(dest()) } } @@ -432,38 +375,46 @@ export function useLinkProps< const handleLeave = () => { if (preload() === 'intent') { - cancelPreload(ref) + cancelPreload() } } - const onClick = createComposedHandler(() => local.onClick, handleClick) - const onBlur = createComposedHandler(() => local.onBlur, handleLeave) - const onFocus = createComposedHandler(() => local.onFocus, enqueuePreload) + const onClick = createComposedHandler(() => options.onClick, handleClick) + const onBlur = createComposedHandler(() => options.onBlur, handleLeave) + const onFocus = createComposedHandler(() => options.onFocus, enqueuePreload) const onMouseEnter = createComposedHandler( - () => local.onMouseEnter, + () => options.onMouseEnter, enqueuePreload, ) const onMouseOver = createComposedHandler( - () => local.onMouseOver, + () => options.onMouseOver, enqueuePreload, ) const onMouseLeave = createComposedHandler( - () => local.onMouseLeave, + () => options.onMouseLeave, + handleLeave, + ) + const onMouseOut = createComposedHandler( + () => options.onMouseOut, handleLeave, ) - const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave) const onTouchStart = createComposedHandler( - () => local.onTouchStart, + () => options.onTouchStart, handleTouchStart, ) - const resolvedProps = Solid.createMemo(() => { - const external = externalLink() - const disabled = local.disabled || external === null + // One ref callback per element. The selected state props' ref, else the + // Link's own, receives the element once; a state change does not re-call it. + const linkRef = (el: Element) => { + setRef(el) + const ref = Solid.untrack(resolvedProps).ref ?? options.ref + if (typeof ref === 'function') { + ref(el as HTMLAnchorElement) + } + } - const base = { - href: external === null ? undefined : external || hrefOption(), - ref: mergeRefs(setRef, options.ref), + const resolvedProps = Solid.createMemo(() => + resolveLinkStateProps(linkState(), { onClick, onBlur, onFocus, @@ -472,17 +423,68 @@ export function useLinkProps< onMouseLeave, onMouseOut, onTouchStart, - disabled, - target: local.target, - ...(disabled && STATIC_DISABLED_PROPS), - } + }), + ) - return resolveLinkStateProps(base) - }) - - return Solid.mergeProps(propsSafeToSpread, resolvedProps) as any + // The ref sits after the memo so reading it does not track the memo: the + // element's ref effect then runs once. + return Solid.mergeProps(propsSafeToSpread, resolvedProps, { + ref: linkRef, + }) as any } +// [element href, external href (null when blocked), active] +type LinkState = [ + href: string | undefined, + external: string | null | undefined, + active: boolean, +] + +const isStore = (value: any): boolean => !!value?.[Solid.$PROXY] + +// Props that decide where and how a Link navigates. +const NAVIGATION_KEYS = [ + 'to', + 'reloadDocument', + 'replace', + 'resetScroll', + 'hashScrollIntoView', + 'startTransition', + 'viewTransition', + 'ignoreBlocker', + 'params', + 'search', + 'hash', + 'state', + 'mask', + 'unsafeRelative', + 'from', + 'href', +] as const +// Options the Link consumes; every other option is an element prop. +const LINK_OPTION_KEYS = [ + ...NAVIGATION_KEYS, + 'activeProps', + 'inactiveProps', + 'activeOptions', + 'preload', + 'preloadDelay', + 'preloadIntentProximity', + 'target', + 'disabled', + 'style', + 'class', + 'onClick', + 'onBlur', + 'onFocus', + 'onMouseEnter', + 'onMouseLeave', + 'onMouseOver', + 'onMouseOut', + 'onTouchStart', +] +// A Link also consumes its children and component, and drops `type`. +const LINK_ELEMENT_KEYS = [...LINK_OPTION_KEYS, '_asChild', 'children', 'type'] const STATIC_EVENT_PROPS = [ 'onClick', 'onBlur', @@ -494,9 +496,7 @@ const STATIC_EVENT_PROPS = [ 'onTouchStart', ] as const const STATIC_ACTIVE_PROPS = { class: 'active' } -const STATIC_ACTIVE_PROPS_GET = () => STATIC_ACTIVE_PROPS const EMPTY_OBJECT = {} -const STATIC_INACTIVE_PROPS_GET = () => EMPTY_OBJECT const STATIC_DEFAULT_ACTIVE_ATTRIBUTES = { class: 'active', 'data-status': 'active', @@ -652,17 +652,13 @@ export function createLink( } export const Link: LinkComponent<'a'> = (props) => { - const [local, rest] = Solid.splitProps( - props as typeof props & { _asChild: any }, - ['_asChild', 'children'], - ) + const local = props as typeof props & { _asChild: any } + // One props proxy between the element and the Link's props. + const linkProps = createLinkProps(props as any, LINK_ELEMENT_KEYS) - const [_, linkProps] = Solid.splitProps( - useLinkProps(rest as unknown as any), - ['type'], - ) - - const children = Solid.createMemo(() => { + // Element insertion tracks this itself; only a custom component, which may + // read its children more than once, gets a memo. + const children = () => { const ch = local.children if (typeof ch === 'function') { return ch({ @@ -673,7 +669,7 @@ export const Link: LinkComponent<'a'> = (props) => { } return ch satisfies Solid.JSX.Element - }) + } if (local._asChild === 'svg') { const [_, svgLinkProps] = Solid.splitProps(linkProps, ['class']) @@ -688,9 +684,10 @@ export const Link: LinkComponent<'a'> = (props) => { return
{children()} } + const memo = Solid.createMemo(children) return ( - {children()} + {memo()} ) } diff --git a/packages/solid-router/src/utils.ts b/packages/solid-router/src/utils.ts index f4a2067a6b..04ac989e7b 100644 --- a/packages/solid-router/src/utils.ts +++ b/packages/solid-router/src/utils.ts @@ -1,68 +1,43 @@ import * as Solid from 'solid-js' /** - * React hook to wrap `IntersectionObserver`. - * - * This hook will create an `IntersectionObserver` and observe the ref passed to it. - * - * When the intersection changes, the callback will be called with the `IntersectionObserverEntry`. - * - * @param ref - The ref to observe - * @param callback - The callback to call when the intersection changes - * @param disabled - Whether observation is disabled - * @param cleanupWhenDisabled - Whether cleanup is needed without an observer (defaults to true) - * @returns The IntersectionObserver instance - * @example - * ```tsx - * const MyComponent = () => { - * const ref = React.useRef(null) - * useIntersectionObserver( - * ref, - * (entry) => { doSomething(entry) }, - * false - * ) - * return
- * ``` + * Observe a Link's element while it preloads on `'viewport'`: `callback` + * receives each intersection entry. Whenever the element or preload mode + * changes, and on cleanup, a preloading Link gets `callback()` so it can + * cancel a pending preload. */ export function useIntersectionObserver( ref: Solid.Accessor, callback: (entry?: IntersectionObserverEntry) => void, - disabled: Solid.Accessor, - cleanupWhenDisabled?: Solid.Accessor, -): Solid.Accessor { - const isIntersectionObserverAvailable = - typeof IntersectionObserver === 'function' - let observerRef: IntersectionObserver | null = null - + preload: Solid.Accessor, +): void { Solid.createEffect(() => { const r = ref() - if (disabled() || !r || !isIntersectionObserverAvailable) { - if (cleanupWhenDisabled?.() ?? true) { - Solid.onCleanup(() => callback()) - } - return + const mode = preload() + if ( + mode === 'viewport' && + r && + typeof IntersectionObserver === 'function' + ) { + let active = true + const observer = new IntersectionObserver( + (entries) => { + // Queued notifications can arrive after this effect has cleaned up. + if (active) { + callback(entries.pop()) + } + }, + { rootMargin: '100px' }, + ) + observer.observe(r) + Solid.onCleanup(() => { + active = false + observer.disconnect() + callback() + }) + } else if (mode) { + // Intent preloading still needs timer cleanup without an observer. + Solid.onCleanup(() => callback()) } - - let active = true - const observer = new IntersectionObserver( - (entries) => { - // Queued notifications can arrive after this effect has cleaned up. - if (active) { - callback(entries.pop()) - } - }, - { rootMargin: '100px' }, - ) - - observerRef = observer - observer.observe(r) - - Solid.onCleanup(() => { - active = false - observer.disconnect() - callback() - }) }) - - return () => observerRef } diff --git a/packages/solid-router/tests/link-departing-scope.test.tsx b/packages/solid-router/tests/link-departing-scope.test.tsx new file mode 100644 index 0000000000..6e130f361b --- /dev/null +++ b/packages/solid-router/tests/link-departing-scope.test.tsx @@ -0,0 +1,1225 @@ +import { setFlagsFromString } from 'node:v8' +import { runInNewContext } from 'node:vm' +import * as Solid from 'solid-js' +import { + cleanup, + fireEvent, + render, + screen, + waitFor, +} from '@solidjs/testing-library' +import { afterEach, describe, expect, test, vi } from 'vitest' +import { + Link, + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouteMask, + createRouter, + redirect, + useMatch, +} from '../src' + +afterEach(() => { + cleanup() + vi.restoreAllMocks() +}) + +type Deferred = { + promise: Promise + resolve: () => void +} + +function deferred(): Deferred { + let resolve!: () => void + const promise = new Promise((r) => (resolve = r)) + return { promise, resolve } +} + +// Lets the router run its microtask-driven load steps. +const tick = () => new Promise((resolve) => setTimeout(resolve, 0)) + +type Gates = Partial> + +function setup({ + initial = '/a', + bAfterGate, + beforeRender, +}: { + initial?: string + bAfterGate?: () => void + beforeRender?: (router: any) => void +} = {}) { + const gates: Gates = {} + const counts = { + aUpdater: 0, + aRenders: 0, + goneUpdater: 0, + listUpdater: 0, + } + // The `x` dependency of every `/a` load, preloads included. + const aLoads: Array = [] + // The `x` of every location the `a-next` link derives from. + const nextFrom: Array = [] + const controls: { + setHash?: (hash: string | undefined) => void + setExtra?: (extra: boolean) => void + setGone?: (gone: boolean) => void + setRenderPreload?: (renderPreload: boolean) => void + setList?: (list: Array) => void + } = {} + + const root = createRootRoute({ + component: () => ( + <> + + root b + + + + ), + }) + const layout = createRoute({ + getParentRoute: () => root, + id: '_layout', + component: () => ( + <> + + layout b + + + + ), + }) + function AComponent() { + const [hash, setHash] = Solid.createSignal(undefined) + const [extra, setExtra] = Solid.createSignal(false) + const [gone, setGone] = Solid.createSignal(false) + const [renderPreload, setRenderPreload] = Solid.createSignal(false) + const [list, setList] = Solid.createSignal(['one', 'two']) + controls.setHash = setHash + controls.setExtra = setExtra + controls.setGone = setGone + controls.setRenderPreload = setRenderPreload + controls.setList = setList + return ( + <> +

A page

+ { + counts.aUpdater++ + return prev + }} + > + {(state: { isActive: boolean }) => { + counts.aRenders++ + return state.isActive ? 'a self' : 'a self (inactive)' + }} + + + a dot + + { + nextFrom.push(prev.x) + return { x: `${prev.x}-next` } + }} + preload="intent" + preloadDelay={0} + data-testid="a-next" + > + a next + + + ({ x: `${prev.x}-render` })} + preload="render" + data-testid="a-render" + > + a render + + + + prev} data-testid="a-extra"> + a extra + + + + { + counts.goneUpdater++ + return prev + }} + > + a gone + + + + {(item) => ( + { + counts.listUpdater++ + return { ...prev, item } + }} + > + {item} + + )} + + + ) + } + const a = createRoute({ + getParentRoute: () => layout, + path: '/a', + loaderDeps: ({ search }: { search: any }) => ({ x: search.x }), + loader: ({ deps }: { deps: { x: unknown } }) => { + aLoads.push(deps.x) + return gates.a?.promise + }, + component: AComponent, + }) + const b = createRoute({ + getParentRoute: () => layout, + path: '/b', + loader: async () => { + await gates.b?.promise + bAfterGate?.() + }, + component: () =>

B page

, + }) + const c = createRoute({ + getParentRoute: () => root, + path: '/c', + component: () =>

C page

, + }) + const items = createRoute({ + getParentRoute: () => root, + path: '/items/$id', + loader: () => gates.items?.promise, + component: () => ( + <> +

Items page

+ + item 1 + + + item 2 + + + ), + }) + + const router = createRouter({ + routeTree: root.addChildren([layout.addChildren([a, b]), c, items]), + history: createMemoryHistory({ initialEntries: [initial] }), + }) + + beforeRender?.(router) + render(() => ) + + const link = (id: string) => screen.getByTestId(id) + const isActive = (id: string) => + link(id).getAttribute('aria-current') === 'page' + const href = (id: string) => link(id).getAttribute('href') + + async function start(options: any) { + void router.navigate(options) + await tick() + } + + async function settle() { + await waitFor(() => expect(router.state.status).toBe('idle')) + } + + async function release(name: keyof Gates) { + const gate = gates[name]! + gates[name] = undefined + gate.resolve() + await gate.promise + await tick() + } + + return { + router, + gates, + counts, + aLoads, + nextFrom, + controls, + link, + isActive, + href, + start, + settle, + release, + } +} + +describe('links in a departing match', () => { + test('skip work at navigation start while staying links update urgently', async () => { + const t = setup() + await screen.findByText('A page') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + expect(t.isActive('layout-b')).toBe(false) + + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + const list = t.counts.listUpdater + t.gates.b = deferred() + await t.start({ to: '/b' }) + + expect(t.router.state.status).toBe('pending') + expect(t.router.state.location.pathname).toBe('/b') + expect(screen.getByText('A page')).toBeInTheDocument() + // Staying root and layout links update while the loader is pending. + expect(t.isActive('root-b')).toBe(true) + expect(t.isActive('layout-b')).toBe(true) + // The departing route's links do no work. + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.counts.listUpdater).toBe(list) + expect(t.isActive('a-self')).toBe(true) + + await t.release('b') + await screen.findByText('B page') + expect(t.isActive('root-b')).toBe(true) + expect(t.router.state.status).toBe('idle') + }) + + test('staying route with changed params updates its links while pending', async () => { + const t = setup({ initial: '/items/1' }) + await screen.findByText('Items page') + expect(t.isActive('item-1')).toBe(true) + expect(t.isActive('item-2')).toBe(false) + + t.gates.items = deferred() + await t.start({ to: '/items/$id', params: { id: '2' } }) + expect(t.router.state.status).toBe('pending') + expect(t.isActive('item-1')).toBe(false) + expect(t.isActive('item-2')).toBe(true) + + await t.release('items') + await t.settle() + expect(t.isActive('item-2')).toBe(true) + }) + + test('a pending departure redirected back to the owner ends consistent', async () => { + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/a', search: { x: 'back' } } as any) + }, + }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.isActive('a-self')).toBe(true) + expect(t.href('a-self')).toBe('/a') + + await t.release('b') + await t.settle() + expect(t.router.state.location.href).toBe('/a?x=back') + expect(screen.getByText('A page')).toBeInTheDocument() + expect(t.href('a-self')).toBe('/a?x=back') + expect(t.isActive('a-self')).toBe(true) + expect(t.href('a-dot')).toBe('/a') + expect(t.isActive('root-b')).toBe(false) + }) + + test('a pending departure superseded by a location that keeps the owner ends consistent', async () => { + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + const updater = t.counts.aUpdater + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.counts.aUpdater).toBeGreaterThan(updater) + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + t.gates.b.resolve() + await t.settle() + expect(t.router.state.location.href).toBe('/a?x=two') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + }) + + test('links changing in a departing match keep its held location, links mounting in it read the pending one', async () => { + const t = setup() + await screen.findByText('A page') + expect(t.href('a-dot')).toBe('/a') + t.gates.b = deferred() + await t.start({ to: '/b' }) + + t.controls.setHash!('h') + t.controls.setExtra!(true) + // A changing link builds from the location it held; a link mounting in a + // departing match has nothing to hold and reads the pending location. + expect(t.href('a-dot')).toBe('/a#h') + expect(t.href('a-extra')).toBe('/b') + expect(t.isActive('a-self')).toBe(true) + + await t.start({ to: '/a', search: { x: 'one' } }) + expect(t.href('a-dot')).toBe('/a#h') + expect(t.href('a-extra')).toBe('/a?x=one') + expect(t.href('a-self')).toBe('/a?x=one') + t.gates.b.resolve() + await t.settle() + expect(t.href('a-extra')).toBe('/a?x=one') + expect(t.isActive('a-extra')).toBe(true) + }) + + test('For churn in a departing match derives only the new link, from the pending location', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + expect(t.href('a-list-one')).toBe('/a?x=one&item=one') + t.gates.b = deferred() + await t.start({ to: '/b' }) + + const list = t.counts.listUpdater + t.controls.setList!(['two', 'three']) + expect(screen.queryByTestId('a-list-one')).toBeNull() + // Only the new link derives; it mounts without a held location. + expect(t.counts.listUpdater).toBe(list + 1) + expect(t.href('a-list-two')).toBe('/a?x=one&item=two') + expect(t.href('a-list-three')).toBe('/a?item=three') + + await t.release('b') + await screen.findByText('B page') + expect(t.counts.listUpdater).toBe(list + 1) + }) + + test('a pending navigation within the owner, then a departure, then back', async () => { + const t = setup() + await screen.findByText('A page') + + t.gates.a = deferred() + const firstA = t.gates.a + await t.start({ to: '/a', search: { x: 'one' } }) + expect(t.router.state.status).toBe('pending') + // Staying: updates while the owner's own loader is pending. + expect(t.href('a-self')).toBe('/a?x=one') + + t.gates.b = deferred() + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + await t.start({ to: '/b' }) + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.href('a-self')).toBe('/a?x=one') + expect(t.isActive('root-b')).toBe(true) + + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('root-b')).toBe(false) + + firstA.resolve() + t.gates.b.resolve() + await t.settle() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + }) + + test('a departing link unmounted while pending does no further work', async () => { + const error = vi.spyOn(console, 'error') + const warn = vi.spyOn(console, 'warn') + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + const gone = t.counts.goneUpdater + await t.start({ to: '/b' }) + t.controls.setGone!(true) + expect(screen.queryByTestId('a-gone')).toBeNull() + await t.release('b') + await screen.findByText('B page') + expect(t.counts.goneUpdater).toBe(gone) + expect(error).not.toHaveBeenCalled() + expect(warn).not.toHaveBeenCalled() + }) + + test.each([ + ['a-dot', '/a'], + ['a-next', '/a?x=one-next'], + ])( + 'clicking held link %s navigates to the href it displays', + async (id, displayed) => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.router.state.status).toBe('pending') + expect(t.href(id)).toBe(displayed) + + fireEvent.click(t.link(id)) + await tick() + expect(t.router.latestLocation.href).toBe(displayed) + t.gates.b.resolve() + await t.settle() + expect(t.router.state.location.href).toBe(displayed) + expect(screen.getByText('A page')).toBeInTheDocument() + }, + ) + + test.each(['mouseEnter', 'focus', 'touchStart'] as const)( + 'a %s preload of a held link loads the location it displays', + async (event) => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.href('a-next')).toBe('/a?x=one-next') + t.aLoads.length = 0 + + fireEvent[event](t.link('a-next')) + await tick() + expect(t.aLoads).toEqual(['one-next']) + await t.release('b') + await screen.findByText('B page') + }, + ) + + test('a render preload of a link mounting in a departing match loads the location it displays', async () => { + // A link mounting in a departing match displays the pending location. + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + t.aLoads.length = 0 + + t.controls.setRenderPreload!(true) + await tick() + expect(t.href('a-render')).toBe('/a?x=undefined-render') + expect(t.aLoads).toEqual(['undefined-render']) + await t.release('b') + await screen.findByText('B page') + }) + + test('staying links click and preload from the live location', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.a = deferred() + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.router.state.status).toBe('pending') + expect(t.href('a-next')).toBe('/a?x=two-next') + t.aLoads.length = 0 + + fireEvent.mouseEnter(t.link('a-next')) + await tick() + expect(t.aLoads).toEqual(['two-next']) + fireEvent.click(t.link('a-next')) + await tick() + expect(t.router.latestLocation.href).toBe('/a?x=two-next') + await t.release('a') + await t.settle() + expect(t.router.state.location.href).toBe('/a?x=two-next') + expect(t.href('a-next')).toBe('/a?x=two-next-next') + }) + + test('a revisited route starts with fresh links, also ones mounting during its next departure', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.href('a-next')).toBe('/a?x=one-next') + await t.release('b') + await screen.findByText('B page') + await t.settle() + + t.nextFrom.length = 0 + await t.router.navigate({ to: '/a', search: { x: 'two' } }) + await screen.findByText('A page') + await t.settle() + // The remounted links never derive from the previous visit's location. + expect(t.nextFrom).not.toContain('one') + expect(t.href('a-next')).toBe('/a?x=two-next') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + + // B is cached now: depart to a route that has not loaded yet. + t.gates.items = deferred() + const updater = t.counts.aUpdater + await t.start({ to: '/items/$id', params: { id: '1' } }) + expect(t.router.state.status).toBe('pending') + expect(t.counts.aUpdater).toBe(updater) + t.controls.setExtra!(true) + // The new link reads the pending location, never the previous visit's, + // while the mounted links keep this visit's. + expect(t.href('a-extra')).toBe('/items/1') + expect(t.href('a-next')).toBe('/a?x=two-next') + expect(t.isActive('root-b')).toBe(false) + + fireEvent.click(t.link('a-next')) + await tick() + expect(t.router.latestLocation.href).toBe('/a?x=two-next') + t.gates.items.resolve() + await t.settle() + expect(t.router.state.location.href).toBe('/a?x=two-next') + expect(t.href('a-next')).toBe('/a?x=two-next-next') + }) + + test('a document redirect from the destination does not break later navigations', async () => { + // jsdom reports the attempted document navigation as not implemented. + vi.spyOn(console, 'error').mockImplementation(() => {}) + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/c', reloadDocument: true }) + }, + }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + await t.release('b') + await tick() + + await t.router.navigate({ to: '/a', search: { x: 'two' } }) + await t.settle() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + }) + + test('a departure superseded by a history traversal back to the owner updates its links', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + await t.router.navigate({ to: '/a', search: { x: 'two' } }) + await t.settle() + expect(t.href('a-self')).toBe('/a?x=two') + + t.gates.b = deferred() + const updater = t.counts.aUpdater + await t.start({ to: '/b' }) + expect(t.counts.aUpdater).toBe(updater) + t.router.history.go(-2) + await tick() + await t.settle() + expect(t.router.state.location.href).toBe('/a?x=one') + expect(t.href('a-self')).toBe('/a?x=one') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + t.gates.b.resolve() + await tick() + expect(screen.getByText('A page')).toBeInTheDocument() + expect(t.href('a-self')).toBe('/a?x=one') + }) + + test('invalidating a pending departure keeps holding until it commits', async () => { + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + await t.start({ to: '/b' }) + void t.router.invalidate() + await tick() + expect(t.router.state.status).toBe('pending') + expect(t.router.state.location.pathname).toBe('/b') + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(true) + await t.release('b') + await screen.findByText('B page') + expect(t.counts.aUpdater).toBe(updater) + }) + + test('a departure redirected or superseded to another departing location does no work', async () => { + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/c' }) + }, + }) + await screen.findByText('A page') + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + t.gates.b = deferred() + await t.start({ to: '/b' }) + t.gates.items = deferred() + await t.start({ to: '/items/$id', params: { id: '1' } }) + // B redirects to C after being superseded; neither keeps A. + await t.release('b') + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + await t.release('items') + await screen.findByText('Items page') + expect(t.router.state.location.pathname).toBe('/items/1') + + await t.router.navigate({ to: '/a' }) + await screen.findByText('A page') + const again = t.counts.aUpdater + t.gates.b = deferred() + await t.start({ to: '/b' }) + await t.release('b') + await screen.findByText('C page') + expect(t.counts.aUpdater).toBe(again) + }) + + test('a view transition callback that throws does not break later navigations', async () => { + vi.stubGlobal('CSS', { supports: () => true }) + ;(document as any).startViewTransition = (update: () => unknown) => { + update() + return { + updateCallbackDone: Promise.resolve(), + finished: Promise.resolve(), + } + } + const failures: Array = [] + const t = setup({ + // The history listener's load rejects with the callback's error. Record + // it instead of leaving it unhandled. + beforeRender: (router) => { + const load = router.load + router.load = (opts: any) => + load(opts).catch((error: unknown) => failures.push(error)) + }, + }) + await screen.findByText('A page') + await t.start({ + to: '/b', + viewTransition: { + types: () => { + throw new Error('types failed') + }, + }, + }) + await tick() + expect(failures.length).toBeGreaterThan(0) + delete (document as any).startViewTransition + vi.unstubAllGlobals() + + // A navigation that keeps the page updates its links. + await t.router.navigate({ to: '/a', search: { x: 'two' } }) + await t.settle() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + }) + + test('navigations published inside a Solid batch leave staying links on the latest location', async () => { + const t = setup({ initial: '/items/1' }) + await screen.findByText('Items page') + t.gates.items = deferred() + Solid.batch(() => { + void t.router.navigate({ to: '/items/$id', params: { id: '2' } }) + void t.router.navigate({ to: '/a', search: { x: 'one' } }) + }) + await t.settle() + await screen.findByText('A page') + expect(t.router.state.location.href).toBe('/a?x=one') + expect(t.href('a-self')).toBe('/a?x=one') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + + t.gates.b = deferred() + Solid.batch(() => { + void t.router.navigate({ to: '/b' }) + void t.router.navigate({ to: '/a', search: { x: 'two' } }) + }) + await tick() + t.gates.b.resolve() + await t.settle() + expect(t.router.state.location.href).toBe('/a?x=two') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('layout-b')).toBe(false) + }) + + test('links outside every match follow a pending navigation', async () => { + const t = setup() + await screen.findByText('A page') + cleanup() + const router = t.router + const InnerWrap = (props: { children: Solid.JSX.Element }) => ( + <> + + wrap b + + {props.children} + + ) + router.update({ ...router.options, InnerWrap }) + render(() => ) + await screen.findByText('A page') + expect(t.isActive('wrap-b')).toBe(false) + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(router.state.status).toBe('pending') + expect(t.isActive('wrap-b')).toBe(true) + await t.release('b') + await screen.findByText('B page') + expect(t.isActive('wrap-b')).toBe(true) + }) +}) + +describe('pending and failing destinations', () => { + function setupPending(options: { throwFromP?: boolean } = {}) { + const gate: { p?: Deferred } = {} + const counts = { aUpdater: 0 } + const root = createRootRoute({ + component: () => ( + <> + + root p + + + + ), + errorComponent: () => ( + + error a + + ), + }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ { + counts.aUpdater++ + return { x: `${prev.x}-next` } + }} + data-testid="a-next" + > + a next + + + ), + }) + const pRoute = createRoute({ + getParentRoute: () => root, + path: '/p', + validateSearch: (search: Record) => + search as { y?: string }, + loader: async () => { + await gate.p?.promise + if (options.throwFromP) { + throw new Error('p failed') + } + }, + pendingComponent: () => ( + ({ y: `${prev.y}-pending` })} + data-testid="p-pending" + > + p pending + + ), + component: () =>

P page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, pRoute]), + history: createMemoryHistory({ initialEntries: ['/a?x=one'] }), + defaultPendingMs: 0, + defaultPendingMinMs: 0, + }) + render(() => ) + return { router, gate, counts } + } + + test('links in a pending component build from the destination and a return remounts fresh links', async () => { + const t = setupPending() + await screen.findByText('A page') + const updater = t.counts.aUpdater + t.gate.p = deferred() + void t.router.navigate({ to: '/p', search: { y: 'one' } }) + const pending = await screen.findByTestId('p-pending') + expect(t.counts.aUpdater).toBe(updater) + expect(pending).toHaveAttribute('href', '/p?y=one-pending') + expect(screen.getByTestId('root-p')).toHaveAttribute('aria-current', 'page') + + void t.router.navigate({ to: '/a', search: { x: 'two' } }) + await screen.findByText('A page') + await waitFor(() => expect(t.router.state.status).toBe('idle')) + expect(screen.getByTestId('a-next')).toHaveAttribute( + 'href', + '/a?x=two-next', + ) + expect(screen.getByTestId('root-p')).not.toHaveAttribute('aria-current') + t.gate.p.resolve() + await tick() + expect(screen.getByText('A page')).toBeInTheDocument() + }) + + test('a departure that ends in an error leaves live links', async () => { + vi.spyOn(console, 'error').mockImplementation(() => {}) + vi.spyOn(console, 'warn').mockImplementation(() => {}) + const t = setupPending({ throwFromP: true }) + await screen.findByText('A page') + const updater = t.counts.aUpdater + t.gate.p = deferred() + void t.router.navigate({ to: '/p' }) + await tick() + expect(t.counts.aUpdater).toBe(updater) + t.gate.p.resolve() + const errorLink = await screen.findByTestId('error-a') + await waitFor(() => expect(t.router.state.status).toBe('idle')) + expect(t.router.state.location.pathname).toBe('/p') + expect(errorLink).toHaveAttribute('href', '/a') + expect(errorLink).not.toHaveAttribute('aria-current') + }) +}) + +describe('links in a page kept on screen by a suspended transition', () => { + // The root suspends on the destination's match inside the commit's Solid + // transition, which keeps the departing page on screen until it resolves. + function setupTransition() { + const gate = deferred() + const counts = { updater: 0 } + const root = createRootRoute({ + component: () => { + const viewing = useMatch({ + from: '/view', + shouldThrow: false, + select: (match) => !!match, + }) + const [label] = Solid.createResource( + () => (viewing() ? 'viewing' : 'other'), + (key) => (key === 'viewing' ? gate.promise.then(() => key) : key), + ) + return ( + <> + root {label()} + + root view + + + + ) + }, + }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ { + counts.updater++ + return { x: `${prev.x}-next` } + }} + data-testid="a-next" + > + a next + + + ), + }) + const view = createRoute({ + getParentRoute: () => root, + path: '/view', + component: () =>

View page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, view]), + history: createMemoryHistory({ initialEntries: ['/a?x=one'] }), + }) + render(() => ) + const link = (id: string) => screen.getByTestId(id) + return { router, gate, counts, link } + } + + async function departToView(t: ReturnType) { + await screen.findByText('A page') + expect(t.link('a-next')).toHaveAttribute('href', '/a?x=one-next') + const updater = t.counts.updater + void t.router.navigate({ to: '/view' }) + await tick() + await tick() + expect(t.router.state.location.pathname).toBe('/view') + expect(screen.getByText('A page')).toBeInTheDocument() + expect(screen.queryByText('View page')).toBeNull() + expect(t.counts.updater).toBe(updater) + expect(t.link('a-next')).toHaveAttribute('href', '/a?x=one-next') + } + + test('held links update when the navigation returns to their page', async () => { + const t = setupTransition() + await departToView(t) + + void t.router.navigate({ to: '/a', search: { x: 'two' } }) + await waitFor(() => expect(t.router.state.status).toBe('idle')) + await waitFor(() => + expect(t.link('a-next')).toHaveAttribute('href', '/a?x=two-next'), + ) + expect(t.link('root-view')).not.toHaveAttribute('aria-current') + t.gate.resolve() + await tick() + expect(screen.getByText('A page')).toBeInTheDocument() + expect(t.link('a-next')).toHaveAttribute('href', '/a?x=two-next') + }) + + test('a held link navigates to the href it displays', async () => { + const t = setupTransition() + await departToView(t) + + fireEvent.click(t.link('a-next')) + await waitFor(() => expect(t.router.state.status).toBe('idle')) + expect(t.router.state.location.href).toBe('/a?x=one-next') + await waitFor(() => + expect(t.link('a-next')).toHaveAttribute('href', '/a?x=one-next-next'), + ) + t.gate.resolve() + await tick() + expect(screen.getByText('A page')).toBeInTheDocument() + }) +}) + +describe('masked links in a departing match', () => { + test.each(['mask', 'routeMasks'] as const)( + 'clicking a held link with a location-dependent %s pushes the masked href it displays', + async (kind) => { + const root = createRootRoute() + const gate: { b?: Deferred } = {} + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + ({ id: prev.x })} + hash + mask={ + kind === 'mask' + ? ({ to: '.', search: true, hash: true } as any) + : undefined + } + data-testid="masked" + > + masked + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + loader: () => gate.b?.promise, + component: () =>

B page

, + }) + const photo = createRoute({ + getParentRoute: () => root, + path: '/photo', + component: () =>

Photo page

, + }) + const routeTree = root.addChildren([a, b, photo]) + const router = createRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/a?x=one#h'] }), + routeMasks: + kind === 'routeMasks' + ? [ + createRouteMask({ + routeTree, + from: '/photo', + to: '/a', + search: true, + hash: true, + } as any), + ] + : undefined, + }) + render(() => ) + const link = await screen.findByTestId('masked') + expect(link).toHaveAttribute('href', '/a?x=one#h') + + gate.b = deferred() + void router.navigate({ to: '/b' }) + await tick() + expect(router.state.status).toBe('pending') + expect(link).toHaveAttribute('href', '/a?x=one#h') + + fireEvent.click(link) + await tick() + // The URL bar shows the masked href the link displayed. + expect(router.history.location.href).toBe('/a?x=one#h') + expect(router.latestLocation.pathname).toBe('/photo') + expect(router.latestLocation.search).toEqual({ id: 'one' }) + gate.b.resolve() + await screen.findByText('Photo page') + expect(router.history.location.href).toBe('/a?x=one#h') + }, + ) +}) + +describe('link location retention', () => { + setFlagsFromString('--expose-gc') + const gc: () => void = runInNewContext('gc') + async function collect() { + for (let round = 0; round < 3; round++) { + await tick() + gc() + } + } + const alive = (refs: Array>) => + refs.flatMap((ref, index) => (ref.deref() ? [index] : [])) + + // Builds and renders a router whose route `/a` and root render Links, and + // returns a function that visits a location with a large history state. + function renderApp() { + const root = createRootRoute({ + component: () => ( + <> + + root b + + + + ), + }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ prev} data-testid="a-self"> + a self + + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + component: () =>

B page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, b]), + history: createMemoryHistory({ initialEntries: ['/a'] }), + }) + render(() => ) + return async (to: string, index: number) => { + await router.navigate({ + to, + search: { i: index }, + state: { payload: new Array(100_000).fill(index) } as any, + replace: true, + } as any) + await waitFor(() => expect(router.state.status).toBe('idle')) + const location: any = router.state.location + return [new WeakRef(location), new WeakRef(location.state.payload)] + } + } + + test( + 'locations with large history state are collectable after their route is left', + { timeout: 20_000 }, + async () => { + const visit = renderApp() + await screen.findByText('A page') + // The router may keep its first navigation's state (also on main). + await visit('/a', 0) + const left: Array> = [] + for (let index = 1; index < 5; index++) { + left.push(...(await visit('/a', index))) + } + for (let index = 5; index < 9; index++) { + left.push(...(await visit('/b', index))) + } + await visit('/b', 9) + await screen.findByText('B page') + await collect() + // Only the current location (and its payload) stays reachable. + expect(alive(left)).toEqual([]) + }, + ) +}) + +describe('links after a same-href navigation that changes history state', () => { + function renderStateApp() { + // The `tag` state of every `/b` load, preloads included. + const bLoads: Array = [] + const root = createRootRoute({ component: () => }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ + inherit + + ({ tag: `${prev.tag}-updated` }) as any} + data-testid="updater" + > + updater + + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + loader: ({ location }) => { + bLoads.push((location.state as any).tag) + }, + component: () =>

B page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, b]), + history: createMemoryHistory({ initialEntries: ['/a'] }), + }) + render(() => ) + return { router, bLoads } + } + + async function changeState(router: any) { + await screen.findByText('A page') + await router.navigate({ + to: '/a', + state: { tag: 'latest' } as any, + replace: true, + }) + expect(router.state.location.href).toBe('/a') + expect(router.state.location.state.tag).toBe('latest') + } + + test.each([ + ['inherit', 'latest'], + ['updater', 'latest-updated'], + ])( + 'clicking link %s derives its state from the latest location', + async (id, tag) => { + const { router } = renderStateApp() + await changeState(router) + + fireEvent.click(screen.getByTestId(id)) + await screen.findByText('B page') + expect(router.state.location.pathname).toBe('/b') + expect((router.state.location.state as any).tag).toBe(tag) + }, + ) + + test('preloading derives its state from the latest location', async () => { + const { router, bLoads } = renderStateApp() + await changeState(router) + + fireEvent.mouseEnter(screen.getByTestId('inherit')) + await waitFor(() => expect(bLoads).toEqual(['latest'])) + }) +}) diff --git a/packages/solid-router/tests/link-destination.test.tsx b/packages/solid-router/tests/link-destination.test.tsx index 93c20d2386..bfddf1da25 100644 --- a/packages/solid-router/tests/link-destination.test.tsx +++ b/packages/solid-router/tests/link-destination.test.tsx @@ -47,6 +47,69 @@ function setup(links: () => JSX.Element, initial = '/source/one') { return { router, go, builds: () => counted.mock.calls.length } } +test('reuses a fixed destination across navigations', async () => { + const { go, builds } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/fixed?build=1#details') + const initial = builds() + + await go('two') + await go('three', { hash: 'x' }) + expect(link).toHaveAttribute('href', '/target/fixed?build=1#details') + expect(builds()).toBe(initial) + + fireEvent.click(link) + await screen.findByTestId('link') + await vi.waitFor(() => expect(link).toHaveAttribute('data-status', 'active')) + expect(link).toHaveAttribute('href', '/target/fixed?build=1#details') +}) + +test('rebuilds on a destination prop change, not a presentation prop change', async () => { + const [id, setId] = createSignal('one') + const [search, setSearch] = createSignal>({ + build: 1, + }) + const [hash, setHash] = createSignal('first') + const [to, setTo] = createSignal('/target/$id') + const [cls, setCls] = createSignal('a') + const { go, builds } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/one?build=1#first') + + setId('two') + expect(link).toHaveAttribute('href', '/target/two?build=1#first') + setSearch({ build: 2 }) + expect(link).toHaveAttribute('href', '/target/two?build=2#first') + setHash('second') + expect(link).toHaveAttribute('href', '/target/two?build=2#second') + setTo('/visible/$id') + expect(link).toHaveAttribute('href', '/visible/two?build=2#second') + + const settled = builds() + setCls('b') + expect(link).toHaveClass('b') + await go('three') + expect(builds()).toBe(settled) + expect(link).toHaveAttribute('href', '/visible/two?build=2#second') +}) + test('store-backed params and search follow in-place mutations at the next navigation', async () => { const [params, setParams] = createStore({ id: 'one' }) const [search, setSearch] = createStore({ build: 1 }) @@ -76,6 +139,26 @@ test('store-backed params and search follow in-place mutations at the next navig expect(link).toHaveAttribute('href', '/target/four?build=2') }) +test('does not re-read a store nested inside a plain object', async () => { + // Only the prop value itself is checked for a store (one level). A store + // nested inside a plain object is like any other object mutated in place: + // pass a new object, or the store itself, to change the destination. + const [filters, setFilters] = createStore({ page: 1 }) + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + const href = link.getAttribute('href') + setFilters('page', 2) + await go('two') + expect(link).toHaveAttribute('href', href!) +}) + test('state store values are not reused either', async () => { const [state, setState] = createStore({ label: 'one' }) const seen: Array = [] @@ -144,6 +227,42 @@ test('masked destinations follow their inputs', async () => { expect(inheritedMask).toHaveAttribute('href', '/visible/two#b') }) +test('switches a mounted Link between plain and store-backed inputs', async () => { + const [live, setLive] = createSignal(false) + const [params, setParams] = createStore({ id: 'one' }) + const [search, setSearch] = createStore({ build: 1 }) + const plainParams = { id: 'fixed' } + const plainSearch = { build: 0 } + const { go, builds } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/fixed?build=0') + + setLive(true) + expect(link).toHaveAttribute('href', '/target/one?build=1') + setParams('id', 'two') + setSearch('build', 2) + await go('two') + expect(link).toHaveAttribute('href', '/target/two?build=2') + + setLive(false) + expect(link).toHaveAttribute('href', '/target/fixed?build=0') + const plain = builds() + await go('three') + expect(builds()).toBe(plain) + + setLive(true) + setParams('id', 'three') + await go('four') + expect(link).toHaveAttribute('href', '/target/three?build=2') +}) + test('never mutates frozen caller options', async () => { const params = Object.freeze({ id: 'fixed' }) const options = Object.freeze({ @@ -222,6 +341,26 @@ test('function children render once per active state change', async () => { expect(calls).toEqual([false, true]) }) +test('calls a user ref once per element across state changes', async () => { + const refs: Array = [] + const [id, setId] = createSignal('one') + const { go } = setup(() => ( + refs.push(el)} + data-testid="link" + /> + )) + const link = await screen.findByTestId('link') + setId('two') + expect(link).toHaveAttribute('href', '/target/two') + await go('two') + fireEvent.click(link) + await vi.waitFor(() => expect(link).toHaveAttribute('data-status', 'active')) + expect(refs).toEqual([link]) +}) + test('refreshes history formatting even when the destination is reused', async () => { let suffix = 'old' const root = createRootRoute({ diff --git a/packages/solid-router/tests/link.test.tsx b/packages/solid-router/tests/link.test.tsx index caae3f55e1..136e358b39 100644 --- a/packages/solid-router/tests/link.test.tsx +++ b/packages/solid-router/tests/link.test.tsx @@ -5298,28 +5298,24 @@ describe('Link', () => { expect(ioDisconnectMock).not.toHaveBeenCalled() // it should not disconnect again }) - test.each([undefined, false, true])( - 'disabled observers honor the cleanup condition (%s)', - (cleanupWhenDisabled) => { + test.each([ + ['intent', true], + [false, false], + ] as const)( + 'observers without viewport preloading clean up only while preloading (%s)', + (mode, cleansUp) => { const callback = vi.fn() const view = render(() => { const [element, setElement] = Solid.createSignal(null) - useIntersectionObserver( - element, - callback, - () => true, - cleanupWhenDisabled === undefined - ? undefined - : () => cleanupWhenDisabled, - ) + useIntersectionObserver(element, callback, () => mode) return
}) callback.mockClear() view.unmount() - if (cleanupWhenDisabled === false) { - expect(callback).not.toHaveBeenCalled() - } else { + if (cleansUp) { expect(callback).toHaveBeenCalledWith() + } else { + expect(callback).not.toHaveBeenCalled() } }, ) diff --git a/packages/vue-router/src/Match.tsx b/packages/vue-router/src/Match.tsx index de1bcfa67a..0c3ff40f1d 100644 --- a/packages/vue-router/src/Match.tsx +++ b/packages/vue-router/src/Match.tsx @@ -6,7 +6,7 @@ import { CatchBoundary } from './CatchBoundary' import { ClientOnly } from './ClientOnly' import { useRouter } from './useRouter' import { CatchNotFound } from './not-found' -import { routeIdContext } from './matchContext' +import { provideLinkLocation, routeIdContext } from './matchContext' import { renderRouteNotFound } from './renderRouteNotFound' import { ScrollRestoration } from './scroll-restoration' import { @@ -37,6 +37,11 @@ export const Match = Vue.defineComponent({ // Provide routeId context (stable string) for children. // MatchInner, Outlet, and useMatch all consume this. Vue.provide(routeIdContext, routeId) + // This match's links hold their location while a navigation leaves it. + // Server links read the live location. + if (!(isServer ?? router.isServer)) { + provideLinkLocation(router, routeId) + } return (): VNode => { const match = activeMatch.value diff --git a/packages/vue-router/src/RouterProvider.tsx b/packages/vue-router/src/RouterProvider.tsx index 769a19a4f2..874a24fef0 100644 --- a/packages/vue-router/src/RouterProvider.tsx +++ b/packages/vue-router/src/RouterProvider.tsx @@ -1,6 +1,8 @@ import * as Vue from 'vue' +import { isServer } from '@tanstack/router-core/isServer' import { Matches } from './Matches' import { provideRouter } from './routerContext' +import { provideLinkLocation } from './matchContext' import type { AnyRouter, RegisteredRouter, @@ -23,6 +25,10 @@ export const RouterContextProvider = Vue.defineComponent({ // Provide router to all child components provideRouter(router) + // Links outside every match follow the live location. + if (!(isServer ?? router.isServer)) { + provideLinkLocation(router) + } return () => { // Allow the router to update options on the router instance diff --git a/packages/vue-router/src/link.tsx b/packages/vue-router/src/link.tsx index 2c1ae102e9..34666743e3 100644 --- a/packages/vue-router/src/link.tsx +++ b/packages/vue-router/src/link.tsx @@ -9,8 +9,8 @@ import { } from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' -import { useSelector } from '@tanstack/vue-store' import { useRouter } from './useRouter' +import { linkLocationContext } from './matchContext' import { useIntersectionObserver } from './utils' import type { @@ -29,8 +29,6 @@ import type { type EventHandler = (e: TEvent) => void -const timeoutMap = new WeakMap>() - type DataAttributes = { [K in `data-${string}`]?: unknown } @@ -110,18 +108,16 @@ function useLinkPropsImpl( // Ensure router is defined before proceeding if (!router) { console.warn('useRouter must be used inside a component!') - return Vue.computed(() => ({})) as unknown as LinkHTMLAttributes + return {} } - const ref = Vue.ref(null) - // During SSR we render exactly once and do not need reactivity. // Avoid store subscriptions, effects and observers on the server. if (isServer ?? router.isServer) { const options = getOptions() if (getUrlScheme(`${options.to}`)) { - return Vue.ref( - getExternalLinkProps(options, router, ref), + return Vue.shallowRef( + getExternalLinkProps(options, router), ) as unknown as LinkHTMLAttributes } @@ -152,162 +148,166 @@ function useLinkPropsImpl( resolvedStyle, }) - return Vue.ref( + return Vue.shallowRef( result as LinkHTMLAttributes, ) as unknown as LinkHTMLAttributes } - // Determine if the link is external or internal. This is client-only so - // server renders do not allocate a computed wrapper for every link. - const isExternal = Vue.computed(() => !!getUrlScheme(`${getOptions().to}`)) + const ref = Vue.ref(null) - const currentLocation: Vue.Ref< - ReturnType - > = isExternal.value - ? Vue.shallowRef(router.stores.location.get()) - : (useSelector(router.stores.location, (l) => l, { - compare: (prev, next) => prev.href === next.href, - }) as Vue.Ref>) + const isExternal = () => !!getUrlScheme(`${getOptions().to}`) - // Links that start external skip useSelector above. Subscribe if they later - // become internal so active state follows subsequent location changes. - if (isExternal.value) { - Vue.watchEffect((onCleanup) => { - if (isExternal.value) { - return + // Links build from the location their match presents, or the router's live + // one outside every match. External links never read it. + const source = Vue.inject(linkLocationContext)! + + // Rebuild only when the href moves. + const currentLocation = Vue.computed((prev?: ParsedLocation) => + prev?.href === source.value.href ? prev : source.value, + ) + + // The Link's own destination options, replaced only when a navigation + // option changes identity: the router reuses a location built from the same + // object without reading the current location. A reactive value changes in + // place, so a reactive option value (checked one level deep, not nested) + // gets a fresh object per location instead, re-read at each navigation. A + // mask holds destination options of its own, so its values are checked too. + const dest = Vue.computed((prev?: Record) => { + const options = getOptions() as Record + const dest: Record = {} + let same = !!prev + for (const key of NAVIGATION_KEYS) { + const value = (dest[key] = options[key]) + if ( + Vue.isProxy(value) || + (key === 'mask' && value && Object.values(value).some(Vue.isProxy)) + ) { + // Track the location: a reactive value is re-read at each one. + same = !currentLocation.value } + same &&= prev![key] === value + } + return same ? prev! : dest + }) - const store = router.stores.location - // Catch up on navigations while this external link was unsubscribed. - currentLocation.value = store.get() - const subscription = store.subscribe((location) => { - if (currentLocation.value.href !== location.href) { - currentLocation.value = location - } - }) - onCleanup(() => subscription.unsubscribe()) + // Clicks and preloads build from the latest location the Link's match + // presents. + const navigateOptions = () => { + const options = dest.value + options._fromLocation = source.value + return options as any + } + + // [href, active] of an internal Link, derived in one computation. An + // unchanged result keeps its identity, so a navigation that leaves the Link + // as it was notifies nothing downstream. + const state = Vue.computed((prev?: LinkState): LinkState => { + const options = getOptions() + const destOptions = dest.value + // Rebuild when inherited search/hash or the current route context changes. + destOptions._fromLocation = currentLocation.value + const next = router.buildLocation(destOptions as any) + const href = getHref(options, router, next) + const isActive = + !options.disabled && (href === undefined || !!getUrlScheme(href)) + ? false + : getIsActive( + currentLocation.value, + next, + options.activeOptions, + router, + ) + return prev && + prev[0 /* href */] === href && + prev[1 /* isActive */] === isActive + ? prev + : [href, isActive] + }) + + // The requested mode does not depend on the location, so the preload + // effects do not run on navigations. + const preloadMode = Vue.computed(() => { + const options = getOptions() + return ( + !isExternal() && + !options.reloadDocument && + !options.disabled && + (options.preload ?? router.options.defaultPreload) + ) + }) + const preload = () => { + const href = !isExternal() && state.value[0 /* href */] + return !!href && !getUrlScheme(href) && preloadMode.value + } + + const preloadDelay = () => + getOptions().preloadDelay ?? router.options.defaultPreloadDelay ?? 0 + + const doPreload = () => { + return router.preloadRoute(navigateOptions()).catch((err: any) => { + console.warn(err) + console.warn(preloadWarning) }) } - const next = Vue.computed(() => { - // Rebuild when inherited search/hash or the current route context changes. - - const options = getOptions() - const opts = { _fromLocation: currentLocation.value, ...options } - return router.buildLocation(opts) - }) - - const href = Vue.computed(() => { - const options = getOptions() - return getHref(options, router, next.value) - }) - - const preload = Vue.computed(() => { - const options = getOptions() - if ( - isExternal.value || - (!options.disabled && - (href.value === undefined || !!getUrlScheme(href.value))) || - options.reloadDocument || - options.disabled - ) { - return false - } - return options.preload ?? router.options.defaultPreload - }) - - const preloadDelay = Vue.computed( - () => getOptions().preloadDelay ?? router.options.defaultPreloadDelay ?? 0, - ) - - const isActive = Vue.computed(() => { - const options = getOptions() - if ( - isExternal.value || - (!options.disabled && - (href.value === undefined || !!getUrlScheme(href.value))) - ) { - return false - } - return getIsActive( - currentLocation.value, - next.value, - options.activeOptions, - router, - ) - }) - - const doPreload = () => { - const options = getOptions() - return router - .preloadRoute(options as Parameters[0]) - .catch((err: any) => { - console.warn(err) - console.warn(preloadWarning) - }) - } - let pendingPreload: 'intent' | 'viewport' | undefined + let preloadTimeout: ReturnType | undefined + const cancelPreload = () => { + clearTimeout(preloadTimeout) + preloadTimeout = pendingPreload = undefined + } const enqueuePreload = ( e?: MouseEvent | FocusEvent | IntersectionObserverEntry, ) => { if (!e) { - clearTimeout(timeoutMap.get(ref)) - timeoutMap.delete(ref) - pendingPreload = undefined + cancelPreload() return } const isIntersecting = (e as IntersectionObserverEntry).isIntersecting const preloadMode = isIntersecting === undefined ? 'intent' : 'viewport' - if (preload.value !== preloadMode || isIntersecting === false) { + if (preload() !== preloadMode || isIntersecting === false) { if (isIntersecting === false && pendingPreload === 'viewport') { - clearTimeout(timeoutMap.get(ref)) - timeoutMap.delete(ref) - pendingPreload = undefined + cancelPreload() } return } - if (!preloadDelay.value) { + if (!preloadDelay()) { doPreload() return } - if (!timeoutMap.has(ref)) { - const scheduledHref = next.value.href + if (!preloadTimeout) { + const scheduledHref = state.value[0 /* href */] pendingPreload = preloadMode - timeoutMap.set( - ref, - setTimeout(() => { - timeoutMap.delete(ref) - pendingPreload = undefined - if ( - preload.value === preloadMode && - next.value.href === scheduledHref - ) { - doPreload() - } - }, preloadDelay.value), - ) + preloadTimeout = setTimeout(() => { + preloadTimeout = pendingPreload = undefined + if ( + preload() === preloadMode && + state.value[0 /* href */] === scheduledHref + ) { + doPreload() + } + }, preloadDelay()) } } useIntersectionObserver( ref, enqueuePreload, - () => preload.value !== 'viewport', + () => preloadMode.value !== 'viewport', // Intent preloading still needs timer cleanup without an observer. - () => !!preload.value, + () => !!preloadMode.value, ) Vue.watchEffect(() => { - if (preload.value !== 'render') { + if (preloadMode.value !== 'render' || !preload()) { return } - const nextHref = next.value.href + const nextHref = state.value[0 /* href */] if (nextHref && renderFetchedHref !== nextHref) { renderFetchedHref = nextHref doPreload() @@ -317,11 +317,8 @@ function useLinkPropsImpl( // The click handler const handleClick = (e: PointerEvent): void => { const options = getOptions() - if ( - isExternal.value || - (!options.disabled && - (href.value === undefined || !!getUrlScheme(href.value))) - ) { + const href = !isExternal() && state.value[0 /* href */] + if (!options.disabled && (!href || getUrlScheme(href))) { return } @@ -348,29 +345,19 @@ function useLinkPropsImpl( enqueuePreload() // All is well? Navigate! - router.navigate({ - ...options, - replace: options.replace, - resetScroll: options.resetScroll, - hashScrollIntoView: options.hashScrollIntoView, - startTransition: options.startTransition, - viewTransition: options.viewTransition, - ignoreBlocker: options.ignoreBlocker, - }) + router.navigate(navigateOptions()) } } const handleTouchStart = () => { - if (preload.value === 'intent') { + if (preload() === 'intent') { doPreload() } } const handleLeave = () => { if (pendingPreload === 'intent') { - clearTimeout(timeoutMap.get(ref)) - timeoutMap.delete(ref) - pendingPreload = undefined + cancelPreload() } } @@ -384,12 +371,6 @@ function useLinkPropsImpl( } } - // Get the active and inactive props - const resolvedStyleProps = Vue.computed(() => { - const options = getOptions() - return resolveStyleProps(options, isActive.value) - }) - // Create static event handlers that don't change between renders const staticEventHandlers: LinkEventHandlers = { onClick: composeEventHandlers(() => getOptions().onClick, handleClick), @@ -421,18 +402,21 @@ function useLinkPropsImpl( // Using Vue.computed ensures props are calculated at render time, not after const computedProps = Vue.computed(() => { const options = getOptions() - if (isExternal.value) { + if (isExternal()) { return getExternalLinkProps(options, router, ref, staticEventHandlers) } - const { resolvedProps, resolvedClass, resolvedStyle } = - resolvedStyleProps.value + const [href, isActive] = state.value + const { resolvedProps, resolvedClass, resolvedStyle } = resolveStyleProps( + options, + isActive, + ) return combineResultProps({ - href: href.value, + href, options, ref, staticEventHandlers, - isActive: isActive.value, + isActive, resolvedProps, resolvedClass, resolvedStyle, @@ -443,6 +427,28 @@ function useLinkPropsImpl( return computedProps as unknown as LinkHTMLAttributes } +// [href, active] of an internal Link. +type LinkState = [href: string | undefined, isActive: boolean] + +// Options that decide where and how a Link navigates. +const NAVIGATION_KEYS = [ + 'to', + 'replace', + 'resetScroll', + 'hashScrollIntoView', + 'startTransition', + 'viewTransition', + 'ignoreBlocker', + 'params', + 'search', + 'hash', + 'state', + 'mask', + 'unsafeRelative', + 'from', + 'href', +] as const + function resolveStyleProps(options: AnyLinkPropsOptions, isActive: boolean) { const props = (isActive ? options.activeProps : options.inactiveProps) || @@ -540,7 +546,7 @@ function combineResultProps({ function getExternalLinkProps( options: AnyLinkPropsOptions, router: AnyRouter, - ref: Vue.Ref, + ref?: Vue.Ref, staticEventHandlers?: LinkEventHandlers, ): LinkHTMLAttributes { const dangerous = isDangerousProtocol( @@ -600,56 +606,45 @@ function getLinkEventHandlers( } } -const getPropsSafeToSpread = (options: AnyLinkPropsOptions) => { - const { - activeProps: _activeProps, - inactiveProps: _inactiveProps, - activeOptions: _activeOptions, - to: _to, - preload: _preload, - preloadDelay: _preloadDelay, - preloadIntentProximity: _preloadIntentProximity, - hashScrollIntoView: _hashScrollIntoView, - replace: _replace, - startTransition: _startTransition, - resetScroll: _resetScroll, - viewTransition: _viewTransition, - children: _children, - target: _target, - disabled: _disabled, - style: _style, - class: _class, - onClick: _onClick, - onBlur: _onBlur, - onFocus: _onFocus, - onMouseEnter: _onMouseEnter, - onMouseenter: _onMouseenter, - onMouseLeave: _onMouseLeave, - onMouseleave: _onMouseleave, - onMouseOver: _onMouseOver, - onMouseover: _onMouseover, - onMouseOut: _onMouseOut, - onMouseout: _onMouseout, - onTouchStart: _onTouchStart, - onTouchstart: _onTouchstart, - ignoreBlocker: _ignoreBlocker, - params: _params, - search: _search, - hash: _hash, - state: _state, - mask: _mask, - reloadDocument: _reloadDocument, - unsafeRelative: _unsafeRelative, - _asChild: __asChild, - from: _from, - additionalProps: _additionalProps, - ...propsSafeToSpread - } = options as AnyLinkPropsOptions & { - additionalProps?: unknown - children?: unknown - _asChild?: unknown - } +// Options the Link consumes; every other option is an element prop. +const LINK_OPTION_KEYS = new Set([ + ...NAVIGATION_KEYS, + 'activeProps', + 'inactiveProps', + 'activeOptions', + 'preload', + 'preloadDelay', + 'preloadIntentProximity', + 'children', + 'target', + 'disabled', + 'style', + 'class', + 'onClick', + 'onBlur', + 'onFocus', + 'onMouseEnter', + 'onMouseenter', + 'onMouseLeave', + 'onMouseleave', + 'onMouseOver', + 'onMouseover', + 'onMouseOut', + 'onMouseout', + 'onTouchStart', + 'onTouchstart', + 'reloadDocument', + '_asChild', + 'additionalProps', +]) +const getPropsSafeToSpread = (options: AnyLinkPropsOptions) => { + const propsSafeToSpread: Record = {} + for (const key in options) { + if (!LINK_OPTION_KEYS.has(key)) { + propsSafeToSpread[key] = (options as Record)[key] + } + } return propsSafeToSpread } @@ -858,6 +853,34 @@ export function createLink( }) as any } +function useLinkPropsSnapshot( + props: Record, + attrs: Record, +) { + const attrsSnapshot = Vue.shallowRef({ ...attrs }) + Vue.onBeforeUpdate(() => { + const keys = Object.keys(attrs) + const previous = attrsSnapshot.value + if ( + keys.length !== Object.keys(previous).length || + keys.some((key) => !Object.is(attrs[key], previous[key])) + ) { + attrsSnapshot.value = { ...attrs } + } + }) + + // Keep a plain cached snapshot so location-only updates do not repeatedly + // cross Vue's props and attrs proxies for every link computation. + const allProps = Vue.computed( + () => + ({ + ...props, + ...attrsSnapshot.value, + }) as AnyLinkPropsOptions, + ) + return () => allProps.value +} + const LinkImpl = Vue.defineComponent({ name: 'Link', inheritAttrs: false, @@ -888,27 +911,12 @@ const LinkImpl = Vue.defineComponent({ 'target', ], setup(props, { attrs, slots }) { - const attrsSnapshot = Vue.shallowRef({ ...attrs }) - Vue.onBeforeUpdate(() => { - const keys = Object.keys(attrs) - const previous = attrsSnapshot.value - if ( - keys.length !== Object.keys(previous).length || - keys.some((key) => !Object.is(attrs[key], previous[key])) - ) { - attrsSnapshot.value = { ...attrs } - } - }) - - // Keep a plain cached snapshot so location-only updates do not repeatedly - // cross Vue's props and attrs proxies for every link computation. - const allProps = Vue.computed(() => ({ - ...props, - ...attrsSnapshot.value, - })) - const linkPropsSource = useLinkPropsImpl(() => allProps.value) as - | LinkHTMLAttributes - | Vue.ComputedRef + // The server renders once: read the props directly. + const linkPropsSource = useLinkPropsImpl( + (isServer ?? useRouter()?.isServer) + ? () => ({ ...props, ...attrs }) + : useLinkPropsSnapshot(props, attrs), + ) as LinkHTMLAttributes | Vue.ComputedRef return () => { const Component = props._asChild || 'a' diff --git a/packages/vue-router/src/matchContext.tsx b/packages/vue-router/src/matchContext.tsx index 01ed6d35de..d46757f443 100644 --- a/packages/vue-router/src/matchContext.tsx +++ b/packages/vue-router/src/matchContext.tsx @@ -1,4 +1,7 @@ -import type { InjectionKey } from 'vue' +import * as Vue from 'vue' +import { _isRouteDeparting } from '@tanstack/router-core' +import type { InjectionKey, Ref } from 'vue' +import type { AnyRouter, ParsedLocation } from '@tanstack/router-core' // Stable routeId context — a plain string (not reactive) that identifies // which route this component belongs to. Provided by Match, consumed by @@ -6,3 +9,31 @@ import type { InjectionKey } from 'vue' export const routeIdContext = Symbol( 'TanStackRouterRouteId', ) as InjectionKey + +// The location the links of the nearest match, or of the router outside every +// match, build from. Provided on the client only. +export const linkLocationContext = Symbol( + 'TanStackRouterLinkLocation', +) as InjectionKey>> + +/** + * Provides the location the links below build from. A location publication + * whose navigation leaves `routeId` keeps the location the route still + * presents, so its links do no work: the route unmounts when that navigation + * commits, and any other outcome publishes a newer location. The store calls + * this subscription synchronously inside the publication, the only time the + * predicate is valid. Without a route the location is the live one. Links + * hand it to the router, so it stays raw rather than a readonly proxy. + */ +export function provideLinkLocation(router: AnyRouter, routeId?: string) { + const store = router.stores.location + const linkLocation = Vue.shallowRef(store.get()) + Vue.onScopeDispose( + store.subscribe((location) => { + if (!_isRouteDeparting(router, routeId, location)) { + linkLocation.value = location + } + }).unsubscribe, + ) + Vue.provide(linkLocationContext, linkLocation) +} diff --git a/packages/vue-router/src/utils.ts b/packages/vue-router/src/utils.ts index c5e3796384..10b059c4a5 100644 --- a/packages/vue-router/src/utils.ts +++ b/packages/vue-router/src/utils.ts @@ -34,7 +34,6 @@ export const usePrevious = (fn: () => boolean) => { * @param callback - The callback to call when the intersection changes * @param disabled - Whether observation is disabled * @param cleanupWhenDisabled - Whether cleanup is needed without an observer (defaults to true) - * @returns The IntersectionObserver instance * @example * ```tsx * const MyComponent = () => { @@ -52,10 +51,9 @@ export function useIntersectionObserver( callback: (entry?: IntersectionObserverEntry) => void, disabled: () => boolean, cleanupWhenDisabled?: () => boolean, -): Vue.Ref { +): void { const isIntersectionObserverAvailable = typeof IntersectionObserver === 'function' - const observerRef = Vue.ref(null) // Use watchEffect with cleanup to properly manage the observer lifecycle Vue.watchEffect((onCleanup) => { @@ -78,18 +76,14 @@ export function useIntersectionObserver( { rootMargin: '100px' }, ) - observerRef.value = observer observer.observe(r) onCleanup(() => { active = false observer.disconnect() - observerRef.value = null callback() }) }) - - return observerRef } export function splitProps>( diff --git a/packages/vue-router/tests/link-departing-scope.test.tsx b/packages/vue-router/tests/link-departing-scope.test.tsx new file mode 100644 index 0000000000..71b917bebf --- /dev/null +++ b/packages/vue-router/tests/link-departing-scope.test.tsx @@ -0,0 +1,1127 @@ +import { setFlagsFromString } from 'node:v8' +import { runInNewContext } from 'node:vm' +import * as Vue from 'vue' +import { + cleanup, + fireEvent, + render, + screen, + waitFor, +} from '@testing-library/vue' +import { afterEach, describe, expect, test, vi } from 'vitest' +import { + Link, + Outlet, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRoute, + createRouteMask, + createRouter, + redirect, +} from '../src' + +afterEach(() => { + cleanup() + vi.restoreAllMocks() +}) + +type Deferred = { + promise: Promise + resolve: () => void +} + +function deferred(): Deferred { + let resolve!: () => void + const promise = new Promise((r) => (resolve = r)) + return { promise, resolve } +} + +// Lets the router run its microtask-driven load steps and Vue flush renders. +const tick = () => new Promise((resolve) => setTimeout(resolve, 0)) + +type Gates = Partial> + +function setup({ + initial = '/a', + bAfterGate, + beforeRender, +}: { + initial?: string + bAfterGate?: () => void + beforeRender?: (router: any) => void +} = {}) { + const gates: Gates = {} + const counts = { + aUpdater: 0, + aRenders: 0, + goneUpdater: 0, + listUpdater: 0, + } + // The `x` dependency of every `/a` load, preloads included. + const aLoads: Array = [] + // The `x` of every location the `a-next` link derives from. + const nextFrom: Array = [] + const hash = Vue.ref(undefined) + const extra = Vue.ref(false) + const gone = Vue.ref(false) + const renderPreload = Vue.ref(false) + const list = Vue.ref(['one', 'two']) + const controls: { + setHash: (value: string | undefined) => Promise + setExtra: (value: boolean) => Promise + setGone: (value: boolean) => Promise + setRenderPreload: (value: boolean) => Promise + setList: (value: Array) => Promise + } = { + setHash: (value) => ((hash.value = value), Vue.nextTick()), + setExtra: (value) => ((extra.value = value), Vue.nextTick()), + setGone: (value) => ((gone.value = value), Vue.nextTick()), + setRenderPreload: (value) => ( + (renderPreload.value = value), + Vue.nextTick() + ), + setList: (value) => ((list.value = value), Vue.nextTick()), + } + + // Stable updaters, and one component per changing part, so that changing + // one part does not re-render the other links. + const aSelfSearch = (prev: any) => { + counts.aUpdater++ + return prev + } + const aSelfSlot = ({ isActive }: { isActive: boolean }) => { + counts.aRenders++ + return isActive ? 'a self' : 'a self (inactive)' + } + const aNextSearch = (prev: any) => { + nextFrom.push(prev.x) + return { x: `${prev.x}-next` } + } + const aRenderSearch = (prev: any) => ({ x: `${prev.x}-render` }) + const sameSearch = (prev: any) => prev + const goneSearch = (prev: any) => { + counts.goneUpdater++ + return prev + } + const listSearches = new Map any>() + const listSearch = (item: string) => { + let search = listSearches.get(item) + if (!search) { + search = (prev: any) => { + counts.listUpdater++ + return { ...prev, item } + } + listSearches.set(item, search) + } + return search + } + + const ADot = Vue.defineComponent(() => () => ( + + a dot + + )) + const ARender = Vue.defineComponent( + () => () => + renderPreload.value ? ( + + a render + + ) : null, + ) + const AExtra = Vue.defineComponent( + () => () => + extra.value ? ( + + a extra + + ) : null, + ) + const AGone = Vue.defineComponent( + () => () => + gone.value ? null : ( + + a gone + + ), + ) + const AList = Vue.defineComponent(() => () => ( + <> + {list.value.map((item) => ( + + {item} + + ))} + + )) + + const root = createRootRoute({ + component: () => ( + <> + + root b + + + + ), + }) + const layout = createRoute({ + getParentRoute: () => root, + id: '_layout', + component: () => ( + <> + + layout b + + + + ), + }) + const a = createRoute({ + getParentRoute: () => layout, + path: '/a', + loaderDeps: ({ search }: { search: any }) => ({ x: search.x }), + loader: ({ deps }: { deps: { x: unknown } }) => { + aLoads.push(deps.x) + return gates.a?.promise + }, + component: () => ( + <> +

A page

+ + {aSelfSlot} + + + + a next + + + + + + + ), + }) + const b = createRoute({ + getParentRoute: () => layout, + path: '/b', + loader: async () => { + await gates.b?.promise + bAfterGate?.() + }, + component: () =>

B page

, + }) + const c = createRoute({ + getParentRoute: () => root, + path: '/c', + component: () =>

C page

, + }) + const items = createRoute({ + getParentRoute: () => root, + path: '/items/$id', + loader: () => gates.items?.promise, + component: () => ( + <> +

Items page

+ + item 1 + + + item 2 + + + ), + }) + + const router = createRouter({ + routeTree: root.addChildren([layout.addChildren([a, b]), c, items]), + history: createMemoryHistory({ initialEntries: [initial] }), + }) + + beforeRender?.(router) + render() + + const link = (id: string) => screen.getByTestId(id) + const isActive = (id: string) => + link(id).getAttribute('aria-current') === 'page' + const href = (id: string) => link(id).getAttribute('href') + + async function start(options: any) { + void router.navigate(options) + await tick() + } + + async function settle() { + await waitFor(() => expect(router.state.status).toBe('idle')) + } + + async function release(name: keyof Gates) { + const gate = gates[name]! + gates[name] = undefined + gate.resolve() + await gate.promise + await tick() + } + + return { + router, + gates, + counts, + aLoads, + nextFrom, + controls, + link, + isActive, + href, + start, + settle, + release, + } +} + +describe('links in a departing match', () => { + test('skip work at navigation start while staying links update urgently', async () => { + const t = setup() + await screen.findByText('A page') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + expect(t.isActive('layout-b')).toBe(false) + + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + const list = t.counts.listUpdater + t.gates.b = deferred() + await t.start({ to: '/b' }) + + expect(t.router.state.status).toBe('pending') + expect(t.router.state.location.pathname).toBe('/b') + expect(screen.getByText('A page')).toBeInTheDocument() + // Staying root and layout links update while the loader is pending. + expect(t.isActive('root-b')).toBe(true) + expect(t.isActive('layout-b')).toBe(true) + // The departing route's links do no work. + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.counts.listUpdater).toBe(list) + expect(t.isActive('a-self')).toBe(true) + + await t.release('b') + await screen.findByText('B page') + expect(t.isActive('root-b')).toBe(true) + expect(t.router.state.status).toBe('idle') + }) + + test('staying route with changed params updates its links while pending', async () => { + const t = setup({ initial: '/items/1' }) + await screen.findByText('Items page') + expect(t.isActive('item-1')).toBe(true) + expect(t.isActive('item-2')).toBe(false) + + t.gates.items = deferred() + await t.start({ to: '/items/$id', params: { id: '2' } }) + expect(t.router.state.status).toBe('pending') + expect(t.isActive('item-1')).toBe(false) + expect(t.isActive('item-2')).toBe(true) + + await t.release('items') + await t.settle() + expect(t.isActive('item-2')).toBe(true) + }) + + test('a pending departure redirected back to the owner ends consistent', async () => { + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/a', search: { x: 'back' } } as any) + }, + }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.isActive('a-self')).toBe(true) + expect(t.href('a-self')).toBe('/a') + + await t.release('b') + await t.settle() + await tick() + expect(t.router.state.location.href).toBe('/a?x=back') + expect(screen.getByText('A page')).toBeInTheDocument() + expect(t.href('a-self')).toBe('/a?x=back') + expect(t.isActive('a-self')).toBe(true) + expect(t.href('a-dot')).toBe('/a') + expect(t.isActive('root-b')).toBe(false) + }) + + test('a pending departure superseded by a location that keeps the owner ends consistent', async () => { + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + const updater = t.counts.aUpdater + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.counts.aUpdater).toBeGreaterThan(updater) + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + t.gates.b.resolve() + await t.settle() + await tick() + expect(t.router.state.location.href).toBe('/a?x=two') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + }) + + test('links mounting or changing in a departing match build from its held location', async () => { + const t = setup() + await screen.findByText('A page') + expect(t.href('a-dot')).toBe('/a') + t.gates.b = deferred() + await t.start({ to: '/b' }) + + await t.controls.setHash('h') + await t.controls.setExtra(true) + // Both build from the location the rest of the match still presents. + expect(t.href('a-dot')).toBe('/a#h') + expect(t.href('a-extra')).toBe('/a') + expect(t.isActive('a-self')).toBe(true) + + await t.start({ to: '/a', search: { x: 'one' } }) + expect(t.href('a-dot')).toBe('/a#h') + expect(t.href('a-extra')).toBe('/a?x=one') + expect(t.href('a-self')).toBe('/a?x=one') + t.gates.b.resolve() + await t.settle() + await tick() + expect(t.href('a-extra')).toBe('/a?x=one') + expect(t.isActive('a-extra')).toBe(true) + }) + + test('list churn in a departing match keeps building from its held location', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + expect(t.href('a-list-one')).toBe('/a?x=one&item=one') + t.gates.b = deferred() + await t.start({ to: '/b' }) + + const list = t.counts.listUpdater + await t.controls.setList(['two', 'three']) + expect(screen.queryByTestId('a-list-one')).toBeNull() + // Only the new link derives, from the held location. + expect(t.counts.listUpdater).toBe(list + 1) + expect(t.href('a-list-two')).toBe('/a?x=one&item=two') + expect(t.href('a-list-three')).toBe('/a?x=one&item=three') + + await t.release('b') + await screen.findByText('B page') + expect(t.counts.listUpdater).toBe(list + 1) + }) + + test('a pending navigation within the owner, then a departure, then back', async () => { + const t = setup() + await screen.findByText('A page') + + t.gates.a = deferred() + const firstA = t.gates.a + await t.start({ to: '/a', search: { x: 'one' } }) + expect(t.router.state.status).toBe('pending') + // Staying: updates while the owner's own loader is pending. + expect(t.href('a-self')).toBe('/a?x=one') + + t.gates.b = deferred() + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + await t.start({ to: '/b' }) + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.href('a-self')).toBe('/a?x=one') + expect(t.isActive('root-b')).toBe(true) + + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('root-b')).toBe(false) + + firstA.resolve() + t.gates.b.resolve() + await t.settle() + await tick() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + }) + + test('a departing link unmounted while pending does no further work', async () => { + const error = vi.spyOn(console, 'error') + const warn = vi.spyOn(console, 'warn') + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + const gone = t.counts.goneUpdater + await t.start({ to: '/b' }) + await t.controls.setGone(true) + expect(screen.queryByTestId('a-gone')).toBeNull() + await t.release('b') + await screen.findByText('B page') + expect(t.counts.goneUpdater).toBe(gone) + expect(error).not.toHaveBeenCalled() + expect(warn).not.toHaveBeenCalled() + }) + + test.each([ + ['a-dot', '/a'], + ['a-next', '/a?x=one-next'], + ])( + 'clicking held link %s navigates to the href it displays', + async (id, displayed) => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.router.state.status).toBe('pending') + expect(t.href(id)).toBe(displayed) + + await fireEvent.click(t.link(id)) + await tick() + expect(t.router.latestLocation.href).toBe(displayed) + t.gates.b.resolve() + await t.settle() + expect(t.router.state.location.href).toBe(displayed) + expect(screen.getByText('A page')).toBeInTheDocument() + }, + ) + + test.each(['mouseEnter', 'focus', 'touchStart'] as const)( + 'a %s preload of a held link loads the location it displays', + async (event) => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.href('a-next')).toBe('/a?x=one-next') + t.aLoads.length = 0 + + await fireEvent[event](t.link('a-next')) + await tick() + expect(t.aLoads).toEqual(['one-next']) + await t.release('b') + await screen.findByText('B page') + }, + ) + + test('a render preload of a link mounting in a departing match loads the location it displays', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + t.aLoads.length = 0 + + await t.controls.setRenderPreload(true) + await tick() + expect(t.href('a-render')).toBe('/a?x=one-render') + expect(t.aLoads).toEqual(['one-render']) + await t.release('b') + await screen.findByText('B page') + }) + + test('staying links click and preload from the live location', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.a = deferred() + await t.start({ to: '/a', search: { x: 'two' } }) + expect(t.router.state.status).toBe('pending') + expect(t.href('a-next')).toBe('/a?x=two-next') + t.aLoads.length = 0 + + await fireEvent.mouseEnter(t.link('a-next')) + await tick() + expect(t.aLoads).toEqual(['two-next']) + await fireEvent.click(t.link('a-next')) + await tick() + expect(t.router.latestLocation.href).toBe('/a?x=two-next') + await t.release('a') + await t.settle() + await tick() + expect(t.router.state.location.href).toBe('/a?x=two-next') + expect(t.href('a-next')).toBe('/a?x=two-next-next') + }) + + test('a revisited route starts with fresh links, also ones mounting during its next departure', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(t.href('a-next')).toBe('/a?x=one-next') + await t.release('b') + await screen.findByText('B page') + await t.settle() + + t.nextFrom.length = 0 + await t.router.navigate({ to: '/a', search: { x: 'two' } }) + await screen.findByText('A page') + await t.settle() + await tick() + // The remounted links never derive from the previous visit's location. + expect(t.nextFrom).not.toContain('one') + expect(t.href('a-next')).toBe('/a?x=two-next') + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + + // B is cached now: depart to a route that has not loaded yet. + t.gates.items = deferred() + const updater = t.counts.aUpdater + await t.start({ to: '/items/$id', params: { id: '1' } }) + expect(t.router.state.status).toBe('pending') + expect(t.counts.aUpdater).toBe(updater) + await t.controls.setExtra(true) + // The new link holds this visit's location, not the previous visit's. + expect(t.href('a-extra')).toBe('/a?x=two') + expect(t.href('a-next')).toBe('/a?x=two-next') + expect(t.isActive('root-b')).toBe(false) + + await fireEvent.click(t.link('a-extra')) + await tick() + expect(t.router.latestLocation.href).toBe('/a?x=two') + t.gates.items.resolve() + await t.settle() + await tick() + expect(t.router.state.location.href).toBe('/a?x=two') + expect(t.isActive('a-extra')).toBe(true) + expect(t.href('a-next')).toBe('/a?x=two-next') + }) + + test('a document redirect from the destination does not break later navigations', async () => { + // jsdom reports the attempted document navigation as not implemented. + vi.spyOn(console, 'error').mockImplementation(() => {}) + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/c', reloadDocument: true }) + }, + }) + await screen.findByText('A page') + t.gates.b = deferred() + await t.start({ to: '/b' }) + await t.release('b') + await tick() + + await t.router.navigate({ to: '/a', search: { x: 'two' } }) + await t.settle() + await tick() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + }) + + test('a departure superseded by a history traversal back to the owner updates its links', async () => { + const t = setup({ initial: '/a?x=one' }) + await screen.findByText('A page') + await t.router.navigate({ to: '/a', search: { x: 'two' } }) + await t.settle() + await tick() + expect(t.href('a-self')).toBe('/a?x=two') + + t.gates.b = deferred() + const updater = t.counts.aUpdater + await t.start({ to: '/b' }) + expect(t.counts.aUpdater).toBe(updater) + t.router.history.go(-2) + await tick() + await t.settle() + await tick() + expect(t.router.state.location.href).toBe('/a?x=one') + expect(t.href('a-self')).toBe('/a?x=one') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + t.gates.b.resolve() + await tick() + expect(screen.getByText('A page')).toBeInTheDocument() + expect(t.href('a-self')).toBe('/a?x=one') + }) + + test('invalidating a pending departure keeps holding until it commits', async () => { + const t = setup() + await screen.findByText('A page') + t.gates.b = deferred() + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + await t.start({ to: '/b' }) + void t.router.invalidate() + await tick() + expect(t.router.state.status).toBe('pending') + expect(t.router.state.location.pathname).toBe('/b') + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(true) + await t.release('b') + await screen.findByText('B page') + expect(t.counts.aUpdater).toBe(updater) + }) + + test('a departure redirected or superseded to another departing location does no work', async () => { + const t = setup({ + bAfterGate: () => { + throw redirect({ to: '/c' }) + }, + }) + await screen.findByText('A page') + const updater = t.counts.aUpdater + const renders = t.counts.aRenders + t.gates.b = deferred() + await t.start({ to: '/b' }) + t.gates.items = deferred() + await t.start({ to: '/items/$id', params: { id: '1' } }) + // B redirects to C after being superseded; neither keeps A. + await t.release('b') + expect(t.counts.aUpdater).toBe(updater) + expect(t.counts.aRenders).toBe(renders) + await t.release('items') + await screen.findByText('Items page') + expect(t.router.state.location.pathname).toBe('/items/1') + + await t.router.navigate({ to: '/a' }) + await screen.findByText('A page') + await tick() + const again = t.counts.aUpdater + t.gates.b = deferred() + await t.start({ to: '/b' }) + await t.release('b') + await screen.findByText('C page') + expect(t.counts.aUpdater).toBe(again) + }) + + test('a view transition callback that throws does not break later navigations', async () => { + vi.stubGlobal('CSS', { supports: () => true }) + ;(document as any).startViewTransition = (update: () => unknown) => { + update() + return { + updateCallbackDone: Promise.resolve(), + finished: Promise.resolve(), + } + } + const failures: Array = [] + const t = setup({ + // The history listener's load rejects with the callback's error. Record + // it instead of leaving it unhandled. + beforeRender: (router) => { + const load = router.load + router.load = (opts: any) => + load(opts).catch((error: unknown) => failures.push(error)) + }, + }) + await screen.findByText('A page') + await t.start({ + to: '/b', + viewTransition: { + types: () => { + throw new Error('types failed') + }, + }, + }) + await tick() + expect(failures.length).toBeGreaterThan(0) + delete (document as any).startViewTransition + vi.unstubAllGlobals() + + // A navigation that keeps the page updates its links. + await t.router.navigate({ to: '/a', search: { x: 'two' } }) + await t.settle() + await tick() + expect(t.href('a-self')).toBe('/a?x=two') + expect(t.isActive('a-self')).toBe(true) + expect(t.isActive('root-b')).toBe(false) + }) + + test('links outside every match follow a pending navigation', async () => { + const t = setup() + await screen.findByText('A page') + cleanup() + const router = t.router + const InnerWrap = (_props: unknown, { slots }: Vue.SetupContext) => ( + <> + + wrap b + + {slots.default?.()} + + ) + router.update({ ...router.options, InnerWrap: InnerWrap as any }) + render() + await screen.findByText('A page') + expect(t.isActive('wrap-b')).toBe(false) + t.gates.b = deferred() + await t.start({ to: '/b' }) + expect(router.state.status).toBe('pending') + expect(t.isActive('wrap-b')).toBe(true) + await t.release('b') + await screen.findByText('B page') + expect(t.isActive('wrap-b')).toBe(true) + }) +}) + +describe('pending and failing destinations', () => { + function setupPending(options: { throwFromP?: boolean } = {}) { + const gate: { p?: Deferred } = {} + const counts = { aUpdater: 0 } + const aNextSearch = (prev: any) => { + counts.aUpdater++ + return { x: `${prev.x}-next` } + } + const pendingSearch = (prev: any) => ({ y: `${prev.y}-pending` }) + const root = createRootRoute({ + component: () => ( + <> + + root p + + + + ), + errorComponent: () => ( + + error a + + ), + }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ + a next + + + ), + }) + const pRoute = createRoute({ + getParentRoute: () => root, + path: '/p', + validateSearch: (search: Record) => + search as { y?: string }, + loader: async () => { + await gate.p?.promise + if (options.throwFromP) { + throw new Error('p failed') + } + }, + pendingComponent: () => ( + + p pending + + ), + component: () =>

P page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, pRoute]), + history: createMemoryHistory({ initialEntries: ['/a?x=one'] }), + defaultPendingMs: 0, + defaultPendingMinMs: 0, + }) + render() + return { router, gate, counts } + } + + test('links in a pending component build from the destination and a return remounts fresh links', async () => { + const t = setupPending() + await screen.findByText('A page') + const updater = t.counts.aUpdater + t.gate.p = deferred() + void t.router.navigate({ to: '/p', search: { y: 'one' } }) + const pending = await screen.findByTestId('p-pending') + expect(t.counts.aUpdater).toBe(updater) + expect(pending).toHaveAttribute('href', '/p?y=one-pending') + expect(screen.getByTestId('root-p')).toHaveAttribute('aria-current', 'page') + + void t.router.navigate({ to: '/a', search: { x: 'two' } }) + await screen.findByText('A page') + await waitFor(() => expect(t.router.state.status).toBe('idle')) + await tick() + expect(screen.getByTestId('a-next')).toHaveAttribute( + 'href', + '/a?x=two-next', + ) + expect(screen.getByTestId('root-p')).not.toHaveAttribute('aria-current') + t.gate.p.resolve() + await tick() + expect(screen.getByText('A page')).toBeInTheDocument() + }) + + test('a departure that ends in an error leaves live links', async () => { + vi.spyOn(console, 'error').mockImplementation(() => {}) + vi.spyOn(console, 'warn').mockImplementation(() => {}) + const t = setupPending({ throwFromP: true }) + await screen.findByText('A page') + const updater = t.counts.aUpdater + t.gate.p = deferred() + void t.router.navigate({ to: '/p' }) + await tick() + expect(t.counts.aUpdater).toBe(updater) + t.gate.p.resolve() + const errorLink = await screen.findByTestId('error-a') + await waitFor(() => expect(t.router.state.status).toBe('idle')) + expect(t.router.state.location.pathname).toBe('/p') + expect(errorLink).toHaveAttribute('href', '/a') + expect(errorLink).not.toHaveAttribute('aria-current') + }) +}) + +describe('masked links in a departing match', () => { + test.each(['mask', 'routeMasks'] as const)( + 'clicking a held link with a location-dependent %s pushes the masked href it displays', + async (kind) => { + const root = createRootRoute() + const gate: { b?: Deferred } = {} + const photoSearch = (prev: any) => ({ id: prev.x }) + const mask = + kind === 'mask' + ? ({ to: '.', search: true, hash: true } as any) + : undefined + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + + masked + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + loader: () => gate.b?.promise, + component: () =>

B page

, + }) + const photo = createRoute({ + getParentRoute: () => root, + path: '/photo', + component: () =>

Photo page

, + }) + const routeTree = root.addChildren([a, b, photo]) + const router = createRouter({ + routeTree, + history: createMemoryHistory({ initialEntries: ['/a?x=one#h'] }), + routeMasks: + kind === 'routeMasks' + ? [ + createRouteMask({ + routeTree, + from: '/photo', + to: '/a', + search: true, + hash: true, + } as any), + ] + : undefined, + }) + render() + const link = await screen.findByTestId('masked') + expect(link).toHaveAttribute('href', '/a?x=one#h') + + gate.b = deferred() + void router.navigate({ to: '/b' }) + await tick() + expect(router.state.status).toBe('pending') + expect(link).toHaveAttribute('href', '/a?x=one#h') + + await fireEvent.click(link) + await tick() + // The URL bar shows the masked href the link displayed. + expect(router.history.location.href).toBe('/a?x=one#h') + expect(router.latestLocation.pathname).toBe('/photo') + expect(router.latestLocation.search).toEqual({ id: 'one' }) + gate.b.resolve() + await screen.findByText('Photo page') + expect(router.history.location.href).toBe('/a?x=one#h') + }, + ) +}) + +describe('link location retention', () => { + setFlagsFromString('--expose-gc') + const gc: () => void = runInNewContext('gc') + async function collect() { + for (let round = 0; round < 3; round++) { + await tick() + gc() + } + } + const alive = (refs: Array>) => + refs.flatMap((ref, index) => (ref.deref() ? [index] : [])) + + // Builds and renders a router whose route `/a` and root render Links, and + // returns a function that visits a location with a large history state. + function renderApp() { + const sameSearch = (prev: any) => prev + const root = createRootRoute({ + component: () => ( + <> + + root b + + + + ), + }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ + a self + + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + component: () =>

B page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, b]), + history: createMemoryHistory({ initialEntries: ['/a'] }), + }) + render() + return async (to: string, index: number) => { + await router.navigate({ + to, + search: { i: index }, + state: { payload: new Array(100_000).fill(index) } as any, + replace: true, + } as any) + await waitFor(() => expect(router.state.status).toBe('idle')) + await tick() + const location: any = router.state.location + return [new WeakRef(location), new WeakRef(location.state.payload)] + } + } + + test( + 'locations with large history state are collectable after their route is left', + { timeout: 20_000 }, + async () => { + const visit = renderApp() + await screen.findByText('A page') + // The router may keep its first navigation's state (also on main). + await visit('/a', 0) + const left: Array> = [] + for (let index = 1; index < 5; index++) { + left.push(...(await visit('/a', index))) + } + for (let index = 5; index < 9; index++) { + left.push(...(await visit('/b', index))) + } + await visit('/b', 9) + await screen.findByText('B page') + await collect() + // Only the current location (and its payload) stays reachable. + expect(alive(left)).toEqual([]) + }, + ) +}) + +describe('links after a same-href navigation that changes history state', () => { + function renderStateApp() { + // The `tag` state of every `/b` load, preloads included. + const bLoads: Array = [] + const root = createRootRoute({ component: () => }) + const a = createRoute({ + getParentRoute: () => root, + path: '/a', + component: () => ( + <> +

A page

+ + inherit + + ({ tag: `${prev.tag}-updated` }) as any} + data-testid="updater" + > + updater + + + ), + }) + const b = createRoute({ + getParentRoute: () => root, + path: '/b', + loader: ({ location }) => { + bLoads.push((location.state as any).tag) + }, + component: () =>

B page

, + }) + const router = createRouter({ + routeTree: root.addChildren([a, b]), + history: createMemoryHistory({ initialEntries: ['/a'] }), + }) + render() + return { router, bLoads } + } + + async function changeState(router: any) { + await screen.findByText('A page') + await router.navigate({ + to: '/a', + state: { tag: 'latest' } as any, + replace: true, + }) + expect(router.state.location.href).toBe('/a') + expect(router.state.location.state.tag).toBe('latest') + } + + test.each([ + ['inherit', 'latest'], + ['updater', 'latest-updated'], + ])( + 'clicking link %s derives its state from the latest location', + async (id, tag) => { + const { router } = renderStateApp() + await changeState(router) + + await fireEvent.click(screen.getByTestId(id)) + await screen.findByText('B page') + expect(router.state.location.pathname).toBe('/b') + expect((router.state.location.state as any).tag).toBe(tag) + }, + ) + + test('preloading derives its state from the latest location', async () => { + const { router, bLoads } = renderStateApp() + await changeState(router) + + await fireEvent.mouseEnter(screen.getByTestId('inherit')) + await waitFor(() => expect(bLoads).toEqual(['latest'])) + }) +}) diff --git a/packages/vue-router/tests/link-destination.test.tsx b/packages/vue-router/tests/link-destination.test.tsx index e7fd8e6962..2615f07c58 100644 --- a/packages/vue-router/tests/link-destination.test.tsx +++ b/packages/vue-router/tests/link-destination.test.tsx @@ -47,6 +47,58 @@ function setup(links: () => any, initial = '/source/one') { return { router, go, builds: () => counted.mock.calls.length } } +test('reuses a fixed destination across navigations', async () => { + const params = { id: 'fixed' } + const search = { build: 1 } + const { go, builds } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/fixed?build=1#details') + const initial = builds() + + await go('two') + await go('three', { hash: 'x' }) + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/fixed?build=1#details') + expect(builds()).toBe(initial) + + await fireEvent.click(link) + await vi.waitFor(() => expect(link).toHaveAttribute('data-status', 'active')) +}) + +test('rebuilds on a destination prop change, not a presentation prop change', async () => { + const id = Vue.ref('one') + const cls = Vue.ref('a') + const { go, builds } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + expect(link).toHaveAttribute('href', '/target/one?build=1') + id.value = 'two' + await Vue.nextTick() + expect(link).toHaveAttribute('href', '/target/two?build=1') + await go('two') + await Vue.nextTick() + const settled = builds() + await go('three') + await Vue.nextTick() + expect(builds()).toBe(settled) + expect(link).toHaveAttribute('href', '/target/two?build=1') +}) + test('reactive params and search follow in-place mutations at the next navigation', async () => { const params = Vue.reactive({ id: 'one' }) const search = Vue.reactive({ build: 1 }) @@ -66,6 +118,22 @@ test('reactive params and search follow in-place mutations at the next navigatio expect(link).toHaveAttribute('href', '/target/three?build=2') }) +test('does not re-read a reactive object nested inside a plain object', async () => { + // Only the prop value itself is checked for a reactive proxy (one level). + const filters = Vue.reactive({ page: 1 }) + const params = { id: 'fixed' } + const search = { build: 1, filters } + const { go } = setup(() => ( + + )) + const link = await screen.findByTestId('link') + const href = link.getAttribute('href') + filters.page = 2 + await go('two') + await Vue.nextTick() + expect(link).toHaveAttribute('href', href!) +}) + test('inherited params and search rebuild on every navigation', async () => { const { go } = setup(() => ( Date: Tue, 6 Oct 2026 10:36:08 +0200 Subject: [PATCH 086/175] perf(solid-router): let mergeProps memoize the Link's own props (#8619) * perf(solid-router): let mergeProps memoize the Link's own props Co-Authored-By: Claude Fable 5.1 * test(solid-router): pin how Link element props, state props and handlers reach the anchor Co-Authored-By: Claude Fable 5.1 * ci: retrigger benchmarks against refreshed main baselines Co-Authored-By: Claude Opus 5.5 (1M context) --------- Co-authored-by: Claude Fable 5.1 --- .changeset/solid-link-single-memo.md | 5 + packages/solid-router/src/link.tsx | 11 +- .../tests/link-element-props.test.tsx | 442 ++++++++++++++++++ 3 files changed, 453 insertions(+), 5 deletions(-) create mode 100644 .changeset/solid-link-single-memo.md create mode 100644 packages/solid-router/tests/link-element-props.test.tsx diff --git a/.changeset/solid-link-single-memo.md b/.changeset/solid-link-single-memo.md new file mode 100644 index 0000000000..8e3bb1f085 --- /dev/null +++ b/.changeset/solid-link-single-memo.md @@ -0,0 +1,5 @@ +--- +'@tanstack/solid-router': patch +--- + +Solid Links resolve their own props through one reactive memo instead of two, which makes mounting and updating many Links slightly faster. diff --git a/packages/solid-router/src/link.tsx b/packages/solid-router/src/link.tsx index a3c183fc91..27bed97d92 100644 --- a/packages/solid-router/src/link.tsx +++ b/packages/solid-router/src/link.tsx @@ -407,14 +407,16 @@ function createLinkProps( // Link's own, receives the element once; a state change does not re-call it. const linkRef = (el: Element) => { setRef(el) - const ref = Solid.untrack(resolvedProps).ref ?? options.ref + const ref = resolved.ref ?? options.ref if (typeof ref === 'function') { ref(el as HTMLAnchorElement) } } - const resolvedProps = Solid.createMemo(() => - resolveLinkStateProps(linkState(), { + // `mergeProps` memoizes this itself; the ref reads its latest result. + let resolved: Solid.ComponentProps<'a'> + const resolvedProps = () => + (resolved = resolveLinkStateProps(linkState(), { onClick, onBlur, onFocus, @@ -423,8 +425,7 @@ function createLinkProps( onMouseLeave, onMouseOut, onTouchStart, - }), - ) + })) // The ref sits after the memo so reading it does not track the memo: the // element's ref effect then runs once. diff --git a/packages/solid-router/tests/link-element-props.test.tsx b/packages/solid-router/tests/link-element-props.test.tsx new file mode 100644 index 0000000000..7b3364ead4 --- /dev/null +++ b/packages/solid-router/tests/link-element-props.test.tsx @@ -0,0 +1,442 @@ +import * as Solid from 'solid-js' +import { afterEach, expect, test, vi } from 'vitest' +import { + cleanup, + fireEvent, + render, + screen, + waitFor, +} from '@solidjs/testing-library' +import { + Link, + Outlet, + RouterProvider, + createLink, + createMemoryHistory, + createRootRoute, + createRoute, + createRouter, +} from '../src' +import type { RegisteredRouter } from '../src' + +const disposers: Array<() => void> = [] +afterEach(() => { + cleanup() + for (const dispose of disposers.splice(0)) { + dispose() + } +}) + +function renderLinks( + Links: Solid.Component, + options: { preload?: 'intent'; preloadDelay?: number } = {}, +) { + const history = createMemoryHistory({ initialEntries: ['/'] }) + disposers.push(history.destroy) + const root = createRootRoute({ + component: () => ( + <> + + + + ), + }) + const router = createRouter({ + routeTree: root.addChildren([ + createRoute({ getParentRoute: () => root, path: '/' }), + createRoute({ getParentRoute: () => root, path: '/target' }), + createRoute({ getParentRoute: () => root, path: '/other' }), + ]), + history, + scrollRestoration: false, + defaultPreload: options.preload ?? false, + defaultPreloadDelay: options.preloadDelay ?? 0, + }) + render(() => ) + return router as unknown as RegisteredRouter +} + +test('static and reactive element props reach the anchor', async () => { + const [title, setTitle] = Solid.createSignal('first') + const [label, setLabel] = Solid.createSignal('Go to target') + const onKeyDown = vi.fn() + renderLinks(() => ( + <> + + Static + + + Reactive + + + )) + + const staticLink = await screen.findByTestId('static') + expect(staticLink.tagName).toBe('A') + expect(staticLink).toHaveAttribute('href', '/target') + expect(staticLink).toHaveAttribute('data-flag') + expect(staticLink).toHaveAttribute('aria-label', 'Static target') + expect(staticLink).toHaveAttribute('id', 'static-link') + expect(staticLink).toHaveAttribute('rel', 'noopener') + expect(staticLink).toHaveAttribute('target', '_blank') + expect(staticLink).toHaveAttribute('tabindex', '3') + fireEvent.keyDown(staticLink, { key: 'Enter' }) + expect(onKeyDown).toHaveBeenCalledOnce() + + const reactiveLink = screen.getByTestId('reactive') + expect(reactiveLink).toHaveAttribute('title', 'first') + expect(reactiveLink).toHaveAttribute('aria-label', 'Go to target') + setTitle('second') + setLabel('Target') + await waitFor(() => { + expect(reactiveLink).toHaveAttribute('title', 'second') + expect(reactiveLink).toHaveAttribute('aria-label', 'Target') + }) + setTitle(undefined) + await waitFor(() => expect(reactiveLink).not.toHaveAttribute('title')) + expect(reactiveLink).toHaveAttribute('href', '/target') +}) + +test('element props spread into a Link apply, also when their keys change', async () => { + const [extra, setExtra] = Solid.createSignal>({ + 'data-a': 'a', + }) + renderLinks(() => ( + + Spread + + )) + const link = await screen.findByTestId('spread') + expect(link).toHaveAttribute('data-a', 'a') + setExtra({ 'data-b': 'b' }) + await waitFor(() => { + expect(link).not.toHaveAttribute('data-a') + expect(link).toHaveAttribute('data-b', 'b') + }) + expect(link).toHaveAttribute('href', '/target') +}) + +test('element state attributes apply where the Link leaves them unset', async () => { + const router = renderLinks(() => ( + + {(state) => (state.isActive ? 'Active' : 'Inactive')} + + )) + const link = await screen.findByTestId('attributes') + expect(link).toHaveAttribute('aria-current', 'step') + expect(link).toHaveAttribute('data-status', 'custom') + expect(link).toHaveAttribute('role', 'button') + expect(link).toHaveTextContent('Inactive') + + await router.navigate({ to: '/target' }) + await waitFor(() => { + expect(link).toHaveAttribute('aria-current', 'page') + expect(link).toHaveAttribute('data-status', 'active') + expect(link).toHaveTextContent('Active') + }) + expect(link).toHaveAttribute('role', 'button') + + await router.navigate({ to: '/' }) + await waitFor(() => { + expect(link).toHaveAttribute('aria-current', 'step') + expect(link).toHaveAttribute('data-status', 'custom') + expect(link).toHaveTextContent('Inactive') + }) +}) + +test('state props add and remove arbitrary props, over element props of the same name', async () => { + const router = renderLinks(() => ( + + State + + )) + const link = await screen.findByTestId('state') + expect(link).toHaveClass('off') + expect(link).toHaveAttribute('data-inactive', '') + expect(link).toHaveAttribute('title', 'base') + expect(link).not.toHaveAttribute('data-active') + expect(link).not.toHaveAttribute('aria-current') + + await router.navigate({ to: '/target' }) + await waitFor(() => { + expect(link).toHaveClass('on') + expect(link).not.toHaveClass('off') + expect(link.style.color).toBe('red') + expect(link).toHaveAttribute('title', 'active title') + expect(link).toHaveAttribute('data-active', 'yes') + expect(link).toHaveAttribute('aria-label', 'Current target') + expect(link).toHaveAttribute('aria-current', 'page') + expect(link).not.toHaveAttribute('data-inactive') + }) + + await router.navigate({ to: '/' }) + await waitFor(() => { + expect(link).toHaveClass('off') + expect(link).not.toHaveClass('on') + expect(link.style.color).toBe('') + expect(link).toHaveAttribute('title', 'base') + expect(link).not.toHaveAttribute('data-active') + expect(link).not.toHaveAttribute('aria-label') + expect(link).not.toHaveAttribute('aria-current') + expect(link).toHaveAttribute('data-inactive', '') + }) +}) + +test('user handlers run before the Link and can prevent its navigation', async () => { + const calls: Array = [] + const [prevent, setPrevent] = Solid.createSignal(true) + const router = renderLinks(() => ( + { + calls.push(`click:${router.state.location.pathname}`) + if (prevent()) { + event.preventDefault() + } + }} + > + Target + + )) + const link = await screen.findByRole('link', { name: 'Target' }) + fireEvent.click(link) + expect(calls).toEqual(['click:/']) + await Promise.resolve() + expect(router.state.location.pathname).toBe('/') + + setPrevent(false) + fireEvent.click(link) + expect(calls).toEqual(['click:/', 'click:/']) + await waitFor(() => expect(router.state.location.pathname).toBe('/target')) +}) + +test('intent preloading follows the user handlers of each event', async () => { + const onMouseEnter = vi.fn() + const onFocus = vi.fn() + const onTouchStart = vi.fn() + // `mouseover` is cancelable: preventing it skips the Link's preload. + const onMouseOver = vi.fn((event: MouseEvent) => event.preventDefault()) + const router = renderLinks( + () => ( + + Target + + ), + { preload: 'intent' }, + ) + const preloadRoute = vi.spyOn(router, 'preloadRoute') + const link = await screen.findByRole('link', { name: 'Target' }) + + fireEvent.mouseOver(link) + expect(onMouseOver).toHaveBeenCalledOnce() + expect(preloadRoute).not.toHaveBeenCalled() + + fireEvent.mouseEnter(link) + expect(onMouseEnter).toHaveBeenCalledOnce() + expect(preloadRoute).toHaveBeenCalledOnce() + expect(preloadRoute.mock.calls[0]?.[0]).toMatchObject({ to: '/target' }) + + fireEvent.focus(link) + expect(onFocus).toHaveBeenCalledOnce() + expect(preloadRoute).toHaveBeenCalledTimes(2) + + fireEvent.touchStart(link) + expect(onTouchStart).toHaveBeenCalledOnce() + expect(preloadRoute).toHaveBeenCalledTimes(3) +}) + +test('leaving a Link cancels a delayed intent preload after the user handlers', async () => { + vi.useFakeTimers() + try { + const onMouseLeave = vi.fn() + const onBlur = vi.fn() + const router = renderLinks( + () => ( + + Target + + ), + { preload: 'intent', preloadDelay: 50 }, + ) + const preloadRoute = vi.spyOn(router, 'preloadRoute') + await vi.runAllTimersAsync() + const link = screen.getByRole('link', { name: 'Target' }) + + fireEvent.mouseEnter(link) + fireEvent.mouseLeave(link) + expect(onMouseLeave).toHaveBeenCalledOnce() + fireEvent.focus(link) + fireEvent.blur(link) + expect(onBlur).toHaveBeenCalledOnce() + await vi.advanceTimersByTimeAsync(100) + expect(preloadRoute).not.toHaveBeenCalled() + + fireEvent.mouseEnter(link) + await vi.advanceTimersByTimeAsync(100) + expect(preloadRoute).toHaveBeenCalledOnce() + } finally { + vi.useRealTimers() + } +}) + +test('a user ref receives the anchor once', async () => { + const ref = vi.fn() + const router = renderLinks(() => ( + + Ref + + )) + const link = await screen.findByTestId('ref') + expect(ref).toHaveBeenCalledOnce() + expect(ref).toHaveBeenCalledWith(link) + await router.navigate({ to: '/target' }) + await waitFor(() => expect(link).toHaveAttribute('data-status', 'active')) + await router.navigate({ to: '/other' }) + await waitFor(() => expect(link).not.toHaveAttribute('data-status')) + expect(ref).toHaveBeenCalledOnce() +}) + +test('a disabled Link renders no href and does not navigate', async () => { + const onClick = vi.fn() + const [disabled, setDisabled] = Solid.createSignal(true) + const router = renderLinks(() => ( + + Disabled + + )) + const link = await screen.findByTestId('disabled') + expect(link).not.toHaveAttribute('href') + expect(link).toHaveAttribute('role', 'link') + expect(link).toHaveAttribute('aria-disabled', 'true') + expect((link as any).disabled).toBe(true) + // Solid skips delegated handlers of a disabled element, the user's too. + fireEvent.click(link) + expect(onClick).not.toHaveBeenCalled() + await Promise.resolve() + expect(router.state.location.pathname).toBe('/') + + setDisabled(false) + await waitFor(() => expect(link).toHaveAttribute('href', '/target')) + expect(link).not.toHaveAttribute('role') + expect(link).not.toHaveAttribute('aria-disabled') + expect((link as any).disabled).toBe(false) + fireEvent.click(link) + expect(onClick).toHaveBeenCalledOnce() + await waitFor(() => expect(router.state.location.pathname).toBe('/target')) +}) + +test('a custom component receives the element props, state and handlers', async () => { + const ref = vi.fn() + const onClick = vi.fn() + const CustomLink = createLink((props: Solid.ComponentProps<'a'>) => ( + + )) + const router = renderLinks(() => ( + + Custom + + )) + const link = await screen.findByRole('link', { name: 'Custom' }) + expect(link).toHaveAttribute('data-custom') + expect(link).toHaveAttribute('href', '/target') + expect(link).toHaveAttribute('title', 'custom') + expect(link).not.toHaveAttribute('data-on') + expect(ref).toHaveBeenCalledOnce() + expect(ref).toHaveBeenCalledWith(link) + fireEvent.click(link) + expect(onClick).toHaveBeenCalledOnce() + await waitFor(() => expect(router.state.location.pathname).toBe('/target')) + await waitFor(() => { + expect(link).toHaveAttribute('data-status', 'active') + expect(link).toHaveAttribute('data-on', '') + }) +}) + +test('state props added later through a spread apply their extra props', async () => { + const [extra, setExtra] = Solid.createSignal>({}) + const router = renderLinks(() => ( + + Late + + )) + const link = await screen.findByTestId('late') + await router.navigate({ to: '/target' }) + await waitFor(() => expect(link).toHaveAttribute('data-status', 'active')) + setExtra({ activeProps: { title: 'active title', 'data-active': 'yes' } }) + await waitFor(() => { + expect(link).toHaveAttribute('title', 'active title') + expect(link).toHaveAttribute('data-active', 'yes') + }) +}) + +test("the Link's handlers follow the element's own listeners", async () => { + const log: Array = [] + const onclick = vi.fn() + const router = renderLinks(() => ( + log.push('link')} + on:focus={() => log.push('element')} + onclick={onclick} + > + Target + + )) + const link = await screen.findByRole('link', { name: 'Target' }) + fireEvent.focus(link) + expect(log).toEqual(['element', 'link']) + // A lowercase delegated handler is replaced by the Link's own. + fireEvent.click(link) + await waitFor(() => expect(router.state.location.pathname).toBe('/target')) + expect(onclick).not.toHaveBeenCalled() +}) From 9595b9745dd3a34d283ebb6f6bacd5a82c2e43a1 Mon Sep 17 00:00:00 2001 From: Flo Date: Tue, 6 Oct 2026 10:53:58 +0200 Subject: [PATCH 087/175] ci: let workflow_dispatch publish bundle-size history on main (#8620) The workflow already declares a workflow_dispatch trigger, but no job accepted that event, so manual runs on main were always skipped. When a push run is lost (e.g. cancelled waiting for a runner), main's tip gets no history entry and PR comments silently fall back to an older baseline. Co-authored-by: Claude Opus 5.5 (1M context) --- .github/workflows/bundle-size.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml index 5d628ff768..762faa49db 100644 --- a/.github/workflows/bundle-size.yml +++ b/.github/workflows/bundle-size.yml @@ -112,7 +112,7 @@ jobs: benchmark-main: name: Publish Bundle Size History - if: github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'TanStack' + if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' && github.repository_owner == 'TanStack' runs-on: ubuntu-latest permissions: contents: write From 793514d5e47b9cacf70620b3a4852536e5498994 Mon Sep 17 00:00:00 2001 From: Flo Date: Tue, 6 Oct 2026 17:33:04 +0200 Subject: [PATCH 088/175] test(benchmarks): disable Maglev in CodSpeed memory runs (#8625) CodSpeed's --no-opt only disables TurboFan on Node 24, so Maglev still compiles. Under --predictable those compiles run synchronously inside the triggering request, and the forced GC before the measured call can discard optimized code so recompiles land in the measured window. Maglev's malloc'd Zone scratch (32 KiB segments) then dominates allocation metrics and varies with per-process feedback state. The bimodal +32,792 B / +1 alloc in `mem server error-paths unmatched (react)` is one Maglev Zone segment allocated while compiling React Fizz's per-request stream `write` closure; ~97% of that bench's allocation was compiler scratch. Retained-object measurements are unaffected (Zone memory is freed after each compile). Co-authored-by: Claude Opus 5.5 (1M context) --- benchmarks/memory/README.md | 16 +++++++++++++++- benchmarks/memory/runtime.ts | 7 +++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/benchmarks/memory/README.md b/benchmarks/memory/README.md index d93e77e70b..65a13f04a3 100644 --- a/benchmarks/memory/README.md +++ b/benchmarks/memory/README.md @@ -72,13 +72,14 @@ same workload through the Flame profiler. All scenarios use [`memoryConfig`](./runtime.ts). It adds these flags only in memory mode: +- `--no-maglev` - `--no-flush-bytecode` - `--no-minor-gc-task` - `--no-incremental-marking` - `--initial-old-space-size=512` `--jitless` was removed after repeated CI comparisons. Ten unchanged-commit -repetitions with these four flags kept all 48 peak-memory results within 1% +repetitions with the last four flags kept all 48 peak-memory results within 1% (worst spread: 0.834%). With JIT enabled, all 16 subsets of the four flags were tested. Removing bytecode, minor-GC-task, incremental-marking, or heap-budget overrides from this profile produced worst client peak spreads of 6.616%, 2.714%, @@ -101,6 +102,19 @@ collections. This does not preallocate 512 MiB, and the smallest sufficient budg was not determined. Results describe this controlled worker profile, not a production application's absolute memory footprint. +CodSpeed's `--no-opt` only disables TurboFan on Node 24 (V8 13); Maglev still +compiles. Under CodSpeed's `--predictable` there is no background compilation, +so Maglev compiles run synchronously inside whichever request triggers them, and +the forced GC before the measured call can discard optimized code so recompiles +land inside the measured window. Maglev's malloc'd Zone scratch (32 KiB +segments) then dominates allocation metrics, and its size depends on +per-process feedback state. `--no-maglev` was added for this: the bimodal ++32,792 B / +1 allocation in `mem server error-paths unmatched (react)` was one +Maglev Zone segment allocated while compiling React Fizz's per-request stream +`write` closure, and compiler scratch made up ~97% of that bench's allocated +bytes. Retained-object measurements are unaffected because Zone memory is freed +after each compile. The repeatability figures above predate this flag. + ## Bench shapes and signals - **Churn:** a fixed number of sequential operations, measuring native diff --git a/benchmarks/memory/runtime.ts b/benchmarks/memory/runtime.ts index 2aded74582..85f84d922b 100644 --- a/benchmarks/memory/runtime.ts +++ b/benchmarks/memory/runtime.ts @@ -7,9 +7,16 @@ export function memoryExecArgv() { return [] } + // CodSpeed supplies --no-opt, which only disables TurboFan on Node 24. + // Under --predictable, Maglev compilations run synchronously inside the + // request that triggers them, and the forced GC before the measured call can + // discard optimized code so recompiles land in the measured window. Their + // malloc'd Zone scratch (32 KiB segments) then dominates allocation metrics + // and depends on per-process feedback state. // Limit variation from GC scheduling and bytecode reclamation; keep a // fixed initial old-generation budget. return [ + '--no-maglev', '--no-flush-bytecode', '--no-minor-gc-task', '--no-incremental-marking', From df8bbf217fd29e968fa94fd65cc7f7ede2b2c433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciar=C3=A1n=20Curley?= Date: Tue, 6 Oct 2026 16:59:20 +0100 Subject: [PATCH 089/175] docs: use new query methods (#7100) docs: use queryClient.query() in guides and agent skills Co-authored-by: Claude Opus 5.5 (1M context) --- _artifacts/domain_map.yaml | 16 ++--- _artifacts/skill_spec.md | 10 +-- _artifacts/skill_tree.yaml | 2 +- .../eslint/create-route-property-order.md | 20 ++++-- docs/router/guide/deferred-data-loading.md | 10 +-- docs/router/guide/external-data-loading.md | 6 +- docs/router/guide/router-context.md | 3 +- docs/router/guide/type-safety.md | 13 ++-- docs/router/how-to/setup-testing.md | 3 +- docs/router/integrations/query.md | 24 ++++--- .../react/guide/deferred-hydration.md | 8 ++- .../react/guide/server-components.md | 5 +- .../skills/compositions/router-query/SKILL.md | 63 ++++++++++++------- .../react-start/server-components/SKILL.md | 4 +- .../docs/caching-refresh-ssr.md | 7 ++- .../examples/03-query-owned-rsc.tsx | 7 ++- .../skills/router-core/type-safety/SKILL.md | 10 +-- 17 files changed, 136 insertions(+), 75 deletions(-) diff --git a/_artifacts/domain_map.yaml b/_artifacts/domain_map.yaml index 4b5d6f8386..0b2672f0c6 100644 --- a/_artifacts/domain_map.yaml +++ b/_artifacts/domain_map.yaml @@ -147,13 +147,15 @@ skills: context types to not flow into loader. wrong_pattern: | createFileRoute('/posts')({ - loader: ({ context }) => context.queryClient.ensureQueryData(postsQuery), + loader: ({ context }) => + context.queryClient.query({ ...postsQuery, staleTime: 'static' }), beforeLoad: ({ context }) => ({ queryClient: context.queryClient }), }) correct_pattern: | createFileRoute('/posts')({ beforeLoad: ({ context }) => ({ queryClient: context.queryClient }), - loader: ({ context }) => context.queryClient.ensureQueryData(postsQuery), + loader: ({ context }) => + context.queryClient.query({ ...postsQuery, staleTime: 'static' }), }) source: 'docs/router/eslint/create-route-property-order.md' priority: HIGH @@ -536,7 +538,7 @@ skills: - '@tanstack/react-router-ssr-query' covers: - External cache coordination pattern - - queryClient.ensureQueryData in loader + - "queryClient.query with staleTime: 'static' in loader" - useSuspenseQuery in components - setupRouterSsrQueryIntegration - defaultPreloadStaleTime @@ -579,11 +581,11 @@ skills: priority: HIGH status: active - - mistake: 'Awaiting prefetchQuery in loader blocks rendering' + - mistake: 'Awaiting a fire-and-forget query in loader blocks rendering' mechanism: >- - For streaming/deferred patterns, prefetchQuery should NOT - be awaited in the loader — it starts fetching on server - and streams without blocking. Awaiting defeats the purpose. + For streaming/deferred patterns, start a query without awaiting + it and handle failures with catch(noop) — it starts fetching on + the server and streams without blocking. Awaiting defeats the purpose. source: 'docs/router/integrations/query.md' priority: MEDIUM status: active diff --git a/_artifacts/skill_spec.md b/_artifacts/skill_spec.md index 4503afb48a..7eb9554a42 100644 --- a/_artifacts/skill_spec.md +++ b/_artifacts/skill_spec.md @@ -83,11 +83,11 @@ TanStack Router is a type-safe router for React and Solid applications with buil ### external-data-loading (3 failure modes) -| # | Mistake | Priority | Source | Cross-skill? | -| --- | ------------------------------------------------- | -------- | -------------------------------- | ------------ | -| 1 | Not setting defaultPreloadStaleTime to 0 | HIGH | docs/guide/external-data-loading | — | -| 2 | Creating QueryClient outside createRouter for SSR | HIGH | docs/guide/external-data-loading | — | -| 3 | Awaiting prefetchQuery in loader blocks rendering | MEDIUM | docs/integrations/query | — | +| # | Mistake | Priority | Source | Cross-skill? | +| --- | ----------------------------------------------------------- | -------- | -------------------------------- | ------------ | +| 1 | Not setting defaultPreloadStaleTime to 0 | HIGH | docs/guide/external-data-loading | — | +| 2 | Creating QueryClient outside createRouter for SSR | HIGH | docs/guide/external-data-loading | — | +| 3 | Awaiting a fire-and-forget query in loader blocks rendering | MEDIUM | docs/integrations/query | — | ### auth-and-guards (3 failure modes) diff --git a/_artifacts/skill_tree.yaml b/_artifacts/skill_tree.yaml index ec38a04bdd..6f7c4c8742 100644 --- a/_artifacts/skill_tree.yaml +++ b/_artifacts/skill_tree.yaml @@ -246,7 +246,7 @@ skills: package: 'packages/react-router' description: >- Integrating TanStack Router with TanStack Query: queryClient - in router context, ensureQueryData/prefetchQuery in loaders, + in router context, static queries and fire-and-forget queries in loaders, useSuspenseQuery in components, defaultPreloadStaleTime: 0, setupRouterSsrQueryIntegration for SSR dehydration/hydration and streaming, per-request QueryClient isolation. diff --git a/docs/router/eslint/create-route-property-order.md b/docs/router/eslint/create-route-property-order.md index c22aa7c52d..453fd64acc 100644 --- a/docs/router/eslint/create-route-property-order.md +++ b/docs/router/eslint/create-route-property-order.md @@ -37,7 +37,10 @@ import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/path')({ loader: async ({ context }) => { - await context.queryClient.ensureQueryData(getQueryOptions(context.hello)) + await context.queryClient.query({ + ...getQueryOptions(context.hello), + staleTime: 'static', + }) }, beforeLoad: () => ({ hello: 'world' }), }) @@ -55,7 +58,10 @@ import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/path')({ loader: async ({ context }) => { - await context.queryClient.ensureQueryData(getQueryOptions(context.hello)) + await context.queryClient.query({ + ...getQueryOptions(context.hello), + staleTime: 'static', + }) }, beforeLoad: () => ({ hello: 'world' }), }) @@ -80,7 +86,10 @@ import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/path')({ beforeLoad: () => ({ hello: 'world' }), loader: async ({ context }) => { - await context.queryClient.ensureQueryData(getQueryOptions(context.hello)) + await context.queryClient.query({ + ...getQueryOptions(context.hello), + staleTime: 'static', + }) }, }) ``` @@ -98,7 +107,10 @@ import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/path')({ beforeLoad: () => ({ hello: 'world' }), loader: async ({ context }) => { - await context.queryClient.ensureQueryData(getQueryOptions(context.hello)) + await context.queryClient.query({ + ...getQueryOptions(context.hello), + staleTime: 'static', + }) }, }) ``` diff --git a/docs/router/guide/deferred-data-loading.md b/docs/router/guide/deferred-data-loading.md index 9956542ebd..f378d7adbf 100644 --- a/docs/router/guide/deferred-data-loading.md +++ b/docs/router/guide/deferred-data-loading.md @@ -90,15 +90,16 @@ So, instead of using `defer` and `Await`, you'll instead want to use the Route's ```tsx // src/routes/posts.$postId.tsx import { createFileRoute } from '@tanstack/react-router' +import { noop } from '@tanstack/react-query' import { slowDataOptions, fastDataOptions } from '~/api/query-options' export const Route = createFileRoute('/posts/$postId')({ loader: async ({ context: { queryClient } }) => { // Kick off the fetching of some slower data, but do not await it - queryClient.prefetchQuery(slowDataOptions()) + void queryClient.query(slowDataOptions()).catch(noop) // Fetch and await some data that resolves quickly - await queryClient.ensureQueryData(fastDataOptions()) + await queryClient.query({ ...fastDataOptions(), staleTime: 'static' }) }, }) ``` @@ -108,15 +109,16 @@ export const Route = createFileRoute('/posts/$postId')({ ```tsx // src/routes/posts.$postId.tsx import { createFileRoute } from '@tanstack/solid-router' +import { noop } from '@tanstack/solid-query' import { slowDataOptions, fastDataOptions } from '~/api/query-options' export const Route = createFileRoute('/posts/$postId')({ loader: async ({ context: { queryClient } }) => { // Kick off the fetching of some slower data, but do not await it - queryClient.prefetchQuery(slowDataOptions()) + void queryClient.query(slowDataOptions()).catch(noop) // Fetch and await some data that resolves quickly - await queryClient.ensureQueryData(fastDataOptions()) + await queryClient.query({ ...fastDataOptions(), staleTime: 'static' }) }, }) ``` diff --git a/docs/router/guide/external-data-loading.md b/docs/router/guide/external-data-loading.md index c044db7757..664468752d 100644 --- a/docs/router/guide/external-data-loading.md +++ b/docs/router/guide/external-data-loading.md @@ -84,7 +84,8 @@ const postsQueryOptions = queryOptions({ export const Route = createFileRoute('/posts')({ // Use the `loader` option to ensure that the data is loaded - loader: () => queryClient.ensureQueryData(postsQueryOptions), + loader: () => + queryClient.query({ ...postsQueryOptions, staleTime: 'static' }), component: () => { // Read the data from the cache and subscribe to updates const { @@ -108,7 +109,8 @@ When an error occurs while using `suspense` with `TanStack Query`, you need to l ```tsx export const Route = createFileRoute('/')({ - loader: () => queryClient.ensureQueryData(postsQueryOptions), + loader: () => + queryClient.query({ ...postsQueryOptions, staleTime: 'static' }), errorComponent: ({ error, reset }) => { const router = useRouter() const queryErrorResetBoundary = useQueryErrorResetBoundary() diff --git a/docs/router/guide/router-context.md b/docs/router/guide/router-context.md index 5fc4001010..347082106f 100644 --- a/docs/router/guide/router-context.md +++ b/docs/router/guide/router-context.md @@ -278,9 +278,10 @@ Then, in your route: export const Route = createFileRoute('/todos')({ component: Todos, loader: async ({ context }) => { - await context.queryClient.ensureQueryData({ + await context.queryClient.query({ queryKey: ['todos', { userId: user.id }], queryFn: fetchTodos, + staleTime: 'static', }) }, }) diff --git a/docs/router/guide/type-safety.md b/docs/router/guide/type-safety.md index 2adffc58c5..3faaed79e7 100644 --- a/docs/router/guide/type-safety.md +++ b/docs/router/guide/type-safety.md @@ -137,12 +137,13 @@ As your application scales, TypeScript check times will naturally increase. Ther ### Only infer types you need -A great pattern with client side data caches (TanStack Query, etc.) is to prefetch data. For example with TanStack Query you might have a route which calls `queryClient.ensureQueryData` in a `loader`. +A great pattern with client side data caches (TanStack Query, etc.) is to prefetch data. For example with TanStack Query you might have a route which calls `queryClient.query` in a `loader`. ```tsx export const Route = createFileRoute('/posts/$postId/deep')({ + // (ctx: LoaderFnContext) => Promise loader: ({ context: { queryClient }, params: { postId } }) => - queryClient.ensureQueryData(postQueryOptions(postId)), + queryClient.query({ ...postQueryOptions(postId), staleTime: 'static' }), component: PostDeepComponent, }) @@ -154,12 +155,16 @@ function PostDeepComponent() { } ``` -This may look fine and for small route trees and you may not notice any TS performance issues. However in this case TS has to infer the loader's return type, despite it never being used in your route. If the loader data is a complex type with many routes that prefetch in this manner, it can slow down editor performance. In this case, the change is quite simple and let typescript infer Promise. +This may look fine and for small route trees and you may not notice any TS performance issues. However in this case TS has to infer the loader's return type, despite it never being used in your route. If the loader data is a complex type with many routes that prefetch in this manner, it can slow down editor performance. In this case, the change is quite simple and let typescript infer `Promise`. ```tsx export const Route = createFileRoute('/posts/$postId/deep')({ + // (ctx: LoaderFnContext) => Promise loader: async ({ context: { queryClient }, params: { postId } }) => { - await queryClient.ensureQueryData(postQueryOptions(postId)) + await queryClient.query({ + ...postQueryOptions(postId), + staleTime: 'static', + }) }, component: PostDeepComponent, }) diff --git a/docs/router/how-to/setup-testing.md b/docs/router/how-to/setup-testing.md index 48afa122f4..104cbedc0d 100644 --- a/docs/router/how-to/setup-testing.md +++ b/docs/router/how-to/setup-testing.md @@ -659,9 +659,10 @@ describe('React Query Integration', () => { path: '/posts', component: PostsList, loader: ({ context: { queryClient } }) => - queryClient.ensureQueryData({ + queryClient.query({ queryKey: ['posts'], queryFn: mockFetchPosts, + staleTime: 'static', }), }) diff --git a/docs/router/integrations/query.md b/docs/router/integrations/query.md index fd174187b5..707f90900c 100644 --- a/docs/router/integrations/query.md +++ b/docs/router/integrations/query.md @@ -152,7 +152,7 @@ Preload critical data in the route `loader` to avoid waterfalls and loading flas -# React +# Blocking `query` in loader ```tsx title="src/routes/posts.tsx" import { queryOptions, useSuspenseQuery, useQuery } from '@tanstack/react-query' @@ -165,7 +165,12 @@ const postsQuery = queryOptions({ export const Route = createFileRoute('/posts')({ // Ensure the data is in the cache before render - loader: ({ context }) => context.queryClient.ensureQueryData(postsQuery), + loader: ({ context }) => + context.queryClient.query({ + ...postsQuery, + // returns data from cache immediately, otherwise executes a fetch + staleTime: 'static', + }), component: PostsPage, }) @@ -180,15 +185,15 @@ function PostsPage() { ### Prefetching and streaming -You can also prefetch with `fetchQuery` or `ensureQueryData` in a loader without consuming the data in a component. If you return the promise directly from the loader, it will be awaited and thus block the SSR request until the query finishes. If you don't await the promise nor return it, the query will be started on the server and will be streamed to the client without blocking the SSR request. +You can also prefetch with `query` in a loader without consuming the data in a component. If you return the promise directly from the loader, it will be awaited and thus block the SSR request until the query finishes. If you don't await the promise nor return it, the query will be started on the server and will be streamed to the client without blocking the SSR request. -# React +# Non-blocking `query` in loader ```tsx title="src/routes/users.$id.tsx" import { createFileRoute } from '@tanstack/react-router' -import { queryOptions, useQuery } from '@tanstack/react-query' +import { noop, queryOptions, useQuery } from '@tanstack/react-query' const userQuery = (id: string) => queryOptions({ @@ -197,15 +202,18 @@ const userQuery = (id: string) => }) export const Route = createFileRoute('/user/$id')({ - loader: ({ params }) => { - // do not await this nor return the promise, just kick off the query to stream it to the client - context.queryClient.fetchQuery(userQuery(params.id)) + loader: ({ context, params }) => { + // Do not await this nor return the promise, just kick off the query to stream it to the client + void context.queryClient.query(userQuery(params.id)).catch(noop) }, }) ``` +> [!NOTE] +> Previous versions of this guide used `queryClient.ensureQueryData` and `queryClient.prefetchQuery`. These methods are now deprecated in TanStack Query in favor of `queryClient.query`. See the TanStack Query [v5 migration guide](https://tanstack.com/query/latest/docs/framework/react/guides/migrating-to-v5#imperative-queryclient-methods) for more details. + ## Redirect handling If a query or mutation throws a `redirect(...)`, the integration intercepts it on the client and performs a router navigation. diff --git a/docs/start/framework/react/guide/deferred-hydration.md b/docs/start/framework/react/guide/deferred-hydration.md index 1dc4760fa7..ba07d65b24 100644 --- a/docs/start/framework/react/guide/deferred-hydration.md +++ b/docs/start/framework/react/guide/deferred-hydration.md @@ -244,7 +244,7 @@ chunks only exist when `split` is enabled, so TypeScript rejects strategy-form Use procedural prefetch when you need custom work: ```tsx -import { useQueryClient } from '@tanstack/react-query' +import { noop, useQueryClient } from '@tanstack/react-query' import { Hydrate } from '@tanstack/react-start' import { visible } from '@tanstack/react-start/hydration' @@ -255,8 +255,10 @@ function DeferredReviews() { { - await preload() - await queryClient.prefetchQuery(reviewsQueryOptions) + await Promise.all([ + preload(), + queryClient.query(reviewsQueryOptions).catch(noop), + ]) }} > diff --git a/docs/start/framework/react/guide/server-components.md b/docs/start/framework/react/guide/server-components.md index 6bbc716754..356c901dee 100644 --- a/docs/start/framework/react/guide/server-components.md +++ b/docs/start/framework/react/guide/server-components.md @@ -401,7 +401,10 @@ const postQueryOptions = (postId: string) => ({ export const Route = createFileRoute('/posts/$postId')({ loader: async ({ context, params }) => { // Prefetch during SSR - data reused on client without refetch - await context.queryClient.ensureQueryData(postQueryOptions(params.postId)) + await context.queryClient.query({ + ...postQueryOptions(params.postId), + staleTime: 'static', + }) }, component: PostPage, }) diff --git a/packages/react-router/skills/compositions/router-query/SKILL.md b/packages/react-router/skills/compositions/router-query/SKILL.md index 9bda851b1c..ce634b5068 100644 --- a/packages/react-router/skills/compositions/router-query/SKILL.md +++ b/packages/react-router/skills/compositions/router-query/SKILL.md @@ -2,7 +2,7 @@ name: router-query description: >- Integrating TanStack Router with TanStack Query: queryClient - in router context, ensureQueryData/prefetchQuery in loaders, + in router context, static queries and fire-and-forget queries in loaders, useSuspenseQuery in components, defaultPreloadStaleTime: 0, setupRouterSsrQueryIntegration for SSR dehydration/hydration and streaming, per-request QueryClient isolation. @@ -182,9 +182,9 @@ export function createAppRouter() { } ``` -## Core Pattern: `ensureQueryData` in Loader + `useSuspenseQuery` in Component +## Core Pattern: Static `query` in Loader + `useSuspenseQuery` in Component -This is the recommended pattern. The loader ensures data is in the cache before render (no loading flash). The component subscribes to the cache for updates. +This is the recommended pattern. The loader queries data before render (no loading flash), using `staleTime: 'static'` to reuse cached data without a stale refetch. The component subscribes to the cache for updates. ```tsx // src/routes/posts.tsx @@ -204,9 +204,12 @@ const postsQueryOptions = queryOptions({ export const Route = createFileRoute('/posts')({ loader: ({ context }) => { - // ensureQueryData returns cached data if available, fetches if not in cache - // To also refetch stale data, pass revalidateIfStale: true - return context.queryClient.ensureQueryData(postsQueryOptions) + // query returns cached data when available and fetches when it is missing + // Keep this query static so a stale refetch does not block navigation + return context.queryClient.query({ + ...postsQueryOptions, + staleTime: 'static', + }) }, component: PostsPage, }) @@ -246,7 +249,10 @@ const postQueryOptions = (postId: string) => export const Route = createFileRoute('/posts/$postId')({ loader: ({ context, params }) => { - return context.queryClient.ensureQueryData(postQueryOptions(params.postId)) + return context.queryClient.query({ + ...postQueryOptions(params.postId), + staleTime: 'static', + }) }, component: PostPage, }) @@ -259,20 +265,23 @@ function PostPage() { } ``` -## Streaming Pattern: `prefetchQuery` (Not Awaited) +## Streaming Pattern: Fire-and-Forget `query` (Not Awaited) -For non-critical data, start the fetch without blocking navigation: +For non-critical data, start a query without blocking navigation. Handle its rejection with `noop` so a background failure does not become an unhandled rejection: ```tsx -import { useQuery, useSuspenseQuery } from '@tanstack/react-query' +import { noop, useQuery, useSuspenseQuery } from '@tanstack/react-query' export const Route = createFileRoute('/dashboard')({ loader: ({ context }) => { // Await critical data - const user = context.queryClient.ensureQueryData(userQueryOptions) + const user = context.queryClient.query({ + ...userQueryOptions, + staleTime: 'static', + }) - // Start non-critical fetch without awaiting — streams during SSR - context.queryClient.prefetchQuery(analyticsQueryOptions) + // Start non-critical query without awaiting — streams during SSR + void context.queryClient.query({ ...analyticsQueryOptions }).catch(noop) return user }, @@ -304,7 +313,10 @@ import { useRouter } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ loader: ({ context }) => - context.queryClient.ensureQueryData(postsQueryOptions), + context.queryClient.query({ + ...postsQueryOptions, + staleTime: 'static', + }), errorComponent: PostsErrorComponent, component: PostsPage, }) @@ -373,24 +385,29 @@ export function createAppRouter() { } ``` -### 3. MEDIUM: Awaiting `prefetchQuery` in loader blocks rendering +### 3. MEDIUM: Awaiting a fire-and-forget query in a loader blocks rendering -`prefetchQuery` is designed to fire-and-forget. Awaiting it blocks the navigation transition until the data resolves, defeating the purpose of streaming. +A query used for streaming should start in the background and handle errors with `catch(noop)`. Awaiting it blocks the navigation transition until the data resolves, defeating the purpose of streaming. ```tsx +import { noop } from '@tanstack/react-query' + // WRONG — blocks navigation, no streaming benefit loader: async ({ context }) => { - await context.queryClient.prefetchQuery(analyticsQueryOptions) + await context.queryClient.query({ ...analyticsQueryOptions }).catch(noop) } -// CORRECT — fire and forget for streaming +// CORRECT — fire and forget for streaming, with handled rejection loader: ({ context }) => { - context.queryClient.prefetchQuery(analyticsQueryOptions) + void context.queryClient.query({ ...analyticsQueryOptions }).catch(noop) } -// If you need to block (critical data), use ensureQueryData instead: +// If you need to block (critical data), use a static query instead: loader: ({ context }) => { - return context.queryClient.ensureQueryData(criticalQueryOptions) + return context.queryClient.query({ + ...criticalQueryOptions, + staleTime: 'static', + }) } ``` @@ -415,8 +432,8 @@ const rootRoute = createRootRouteWithContext<{ queryClient: QueryClient }>()({ TanStack Router has its own SWR cache (`staleTime`, `gcTime`, `defaultPreloadStaleTime`). When using Query as an external cache: - Set `defaultPreloadStaleTime: 0` to prevent Router's cache from short-circuiting Query's freshness logic -- Router's `staleTime`/`gcTime` still apply to the loader return value. For pure Query patterns, return nothing from the loader (just `ensureQueryData` for the side effect) and read data exclusively from `useSuspenseQuery` -- `router.invalidate()` re-runs loaders (which call `ensureQueryData`), but Query decides whether to actually refetch based on its own `staleTime` +- Router's `staleTime`/`gcTime` still apply to the loader return value. For pure Query patterns, return nothing from the loader (just a static `query` for the side effect) and read data exclusively from `useSuspenseQuery` +- `router.invalidate()` re-runs loaders (which call `query` with `staleTime: 'static'`), so the cached Query data remains the freshness authority ## Cross-References diff --git a/packages/react-start/skills/react-start/server-components/SKILL.md b/packages/react-start/skills/react-start/server-components/SKILL.md index 1d0b0b099f..81561824a0 100644 --- a/packages/react-start/skills/react-start/server-components/SKILL.md +++ b/packages/react-start/skills/react-start/server-components/SKILL.md @@ -74,10 +74,10 @@ Treat TanStack Start RSCs as fetchable React Flight payloads, not as a framework - Simple server fragment in a route loader -> `renderServerComponent` - Interactive slot inside server markup -> `createCompositeComponent` -- Route component needs browser APIs but loader can still prefetch on the server -> `ssr: 'data-only'` +- Route component needs browser APIs but loader can still query on the server -> `ssr: 'data-only'` - Loader itself needs browser APIs -> `ssr: false` - Route cache key must include search params -> `loaderDeps` -- Query-managed RSC -> `useSuspenseQuery` + SSR `ensureQueryData` +- Query-managed RSC -> `useSuspenseQuery` + SSR `query` with `staleTime: 'static'` - Multiple independent RSCs -> separate server functions + `Promise.all` - Multiple RSCs sharing data or invalidating together -> one server function returning many renderables or sources - Need isolated widget failures or staggered reveal -> return promises from the loader and resolve with `use()` inside Suspense diff --git a/packages/react-start/skills/react-start/server-components/docs/caching-refresh-ssr.md b/packages/react-start/skills/react-start/server-components/docs/caching-refresh-ssr.md index 6619f78942..f48ba02d5b 100644 --- a/packages/react-start/skills/react-start/server-components/docs/caching-refresh-ssr.md +++ b/packages/react-start/skills/react-start/server-components/docs/caching-refresh-ssr.md @@ -73,10 +73,13 @@ const postQueryOptions = (postId: string) => ({ }) ``` -For SSR reuse, prefetch in the route loader: +For SSR reuse, run a static query in the route loader so cached data is reused without a stale refetch: ```tsx -await context.queryClient.ensureQueryData(postQueryOptions(params.postId)) +await context.queryClient.query({ + ...postQueryOptions(params.postId), + staleTime: 'static', +}) ``` Then read it with `useSuspenseQuery` in the component. diff --git a/packages/react-start/skills/react-start/server-components/examples/03-query-owned-rsc.tsx b/packages/react-start/skills/react-start/server-components/examples/03-query-owned-rsc.tsx index f22b481035..d891e2230d 100644 --- a/packages/react-start/skills/react-start/server-components/examples/03-query-owned-rsc.tsx +++ b/packages/react-start/skills/react-start/server-components/examples/03-query-owned-rsc.tsx @@ -1,5 +1,5 @@ // Query-owned RSC pattern. -// Assumes your router context provides a queryClient for SSR prefetch. +// Assumes your router context provides a queryClient for SSR queries. import type { ReactNode } from 'react' import { createFileRoute } from '@tanstack/react-router' @@ -68,7 +68,10 @@ const postQueryOptions = (postId: string) => ({ export const Route = createFileRoute('/posts/$postId')({ loader: async ({ context, params }) => { - await context.queryClient.ensureQueryData(postQueryOptions(params.postId)) + await context.queryClient.query({ + ...postQueryOptions(params.postId), + staleTime: 'static', + }) }, component: PostPage, }) diff --git a/packages/router-core/skills/router-core/type-safety/SKILL.md b/packages/router-core/skills/router-core/type-safety/SKILL.md index ce9204677e..15b9d35770 100644 --- a/packages/router-core/skills/router-core/type-safety/SKILL.md +++ b/packages/router-core/skills/router-core/type-safety/SKILL.md @@ -230,17 +230,17 @@ With file-based routing the route tree is generated, so this is handled for you. When using external caches like TanStack Query, don't let the router infer complex return types you never consume: ```tsx -// SLOWER — TS infers the full ensureQueryData return type into the route tree +// SLOWER — TS infers the full query return type into the route tree export const Route = createFileRoute('/posts/$postId')({ loader: ({ context: { queryClient }, params: { postId } }) => - queryClient.ensureQueryData(postQueryOptions(postId)), + queryClient.query({ ...postQueryOptions(postId), staleTime: 'static' }), component: PostComponent, }) -// FASTER — void return, inference stays out of the route tree +// FASTER — async loader returns no query data, inference stays out of the route tree export const Route = createFileRoute('/posts/$postId')({ - loader: async ({ context: { queryClient }, params: { postId } }) => { - await queryClient.ensureQueryData(postQueryOptions(postId)) + loader: async ({ context: { queryClient }, params: { postId: id } }) => { + await queryClient.query({ ...postQueryOptions(id), staleTime: 'static' }) }, component: PostComponent, }) From 30fc108a5ebbc4eadd48439282bf1c27d55fbb94 Mon Sep 17 00:00:00 2001 From: Flo Date: Tue, 6 Oct 2026 18:08:21 +0200 Subject: [PATCH 090/175] test(benchmarks): pin React's scheduler clock in the hydration benchmark (#8621) React's scheduler ends a time slice after 5 ms of performance.now(). The hydration harness evaluates the client bundle in a jsdom window, whose performance.now() is the real wall clock. Under CodSpeed's CPU simulation the wall clock advances by a runner-dependent amount per instruction, so identical samples yielded a varying number of times, each yield adding a scheduler task and event-loop turn (CodSpeed sysCount alternated between ~3.6k and ~5.4k for the same code). Freeze the window's performance.now() so React yields only to paint after commits. Date.now(), used by the Router for match timestamps, is unchanged. The hydration test now asserts every sample uses the same number of scheduler tasks. Co-authored-by: Claude Opus 5.5 (1M context) --- benchmarks/client-nav/README.md | 7 ++++-- .../hydration/react/hydration.test.ts | 4 ++++ .../scenarios/hydration/react/setup.ts | 22 +++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/benchmarks/client-nav/README.md b/benchmarks/client-nav/README.md index ab09596200..67ea50cb4e 100644 --- a/benchmarks/client-nav/README.md +++ b/benchmarks/client-nav/README.md @@ -156,8 +156,11 @@ the existing DOM with the framework's native renderer: - **React:** a separate completion component signals from its post-hydration effect, after the same snapshot transition as hash-sensitive Links. The harness awaits that signal and two idle React scheduler turns, then checks the expected - active links. Concurrent hydration can take as many turns as needed under CPU - instrumentation, with a 60-second failure watchdog. + active links. The window's `performance.now()` is frozen, so React's + scheduler yields only to paint after commits, not after 5 ms of wall time, which CPU + instrumentation stretches by a runner-dependent factor. Each sample therefore + uses the same number of scheduler tasks. `Date.now()` is unchanged. A + 60-second watchdog fails a sample that never settles. - **Solid:** execute the native hydration bootstrap and retain the server's component/key hierarchy. Wait for mount, the router's rendered event, active-link effects, and two idle turns. DOM identity assertions include every workload diff --git a/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts b/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts index 295f9ceb80..4217b66af0 100644 --- a/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts +++ b/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts @@ -7,12 +7,14 @@ const turn = () => new Promise((resolve) => setImmediate(resolve)) test('restores data and context into fresh DOMs and includes follow-up renders', async () => { const scenario = setup({ countRenders: true }) + const schedulerTasks = new Set() for (let iteration = 0; iteration < 3; iteration++) { await scenario.before() try { expect(scenario.snapshot().diagnostics.mounted).toBe(false) expect(scenario.snapshot().matches).toBeUndefined() await scenario.run() + schedulerTasks.add(scenario.schedulerTasks()) const completed = scenario.snapshot() // Supports both main's extra Link update and the optimized snapshot. expect([ordinaryLinkCount, ordinaryLinkCount * 2]).toContain( @@ -30,6 +32,8 @@ test('restores data and context into fresh DOMs and includes follow-up renders', await scenario.after() } } + // React yields on its pinned clock, never on wall time spent hydrating. + expect(schedulerTasks.size).toBe(1) }) test('installs per-iteration preparation for the ordinary Vitest runner', async () => { diff --git a/benchmarks/client-nav/scenarios/hydration/react/setup.ts b/benchmarks/client-nav/scenarios/hydration/react/setup.ts index caaa539991..8a6aa3286f 100644 --- a/benchmarks/client-nav/scenarios/hydration/react/setup.ts +++ b/benchmarks/client-nav/scenarios/hydration/react/setup.ts @@ -18,6 +18,16 @@ type TaskHooks = { const turn = () => new Promise((resolve) => setImmediate(resolve)) +// React's scheduler ends a time slice once performance.now() has advanced 5 ms. +// Under CodSpeed's CPU simulation the wall clock advances much further per +// instruction, by a runner-dependent factor, so real time turned identical +// samples into different numbers of yields, scheduler tasks and event-loop +// turns. With a frozen clock React yields only to paint after a commit, as on +// a fast host. 1 s is past React's initial 300 ms fallback throttle. Only the +// window's performance clock is pinned: Date.now(), which the Router uses for +// match timestamps, is unchanged. +const schedulerTime = 1_000 + export function setup({ countRenders = false } = {}) { // Compile once, outside measurement. Evaluation below creates fresh objects // in each window's realm; neither the payload nor module state is reused. @@ -49,6 +59,7 @@ export function setup({ countRenders = false } = {}) { virtualConsole, }) const immediates = new Set() + const scheduler = { tasks: 0 } try { Object.assign(dom.window, { TextEncoder, @@ -62,6 +73,7 @@ export function setup({ countRenders = false } = {}) { callback: (...args: Array) => void, ...args: Array ) { + scheduler.tasks++ const handle = setImmediate(() => { immediates.delete(handle) callback(...args) @@ -78,6 +90,7 @@ export function setup({ countRenders = false } = {}) { }, scrollTo() {}, }) + dom.window.performance.now = () => schedulerTime const context = dom.getInternalVMContext() // jsdom has no layout/scroll implementation; only hydration CPU is measured. dom.window.HTMLElement.prototype.scrollIntoView = () => {} @@ -110,6 +123,7 @@ export function setup({ countRenders = false } = {}) { scriptElements, executingScript, immediates, + scheduler, errors, started: false, completed: false, @@ -186,6 +200,13 @@ export function setup({ countRenders = false } = {}) { > } + function schedulerTasks() { + if (!current) { + throw new Error('No hydration sample') + } + return current.scheduler.tasks + } + function validate() { assert.ok(current?.started) const { dom, anchors, content, errors } = current @@ -297,6 +318,7 @@ export function setup({ countRenders = false } = {}) { run, after, snapshot, + schedulerTasks, // Vitest passes setup to the Tinybench Bench, where it runs once per // warmup/run stage. Install the Task's public per-iteration hooks there. installIterationHooks(task: TaskHooks) { From 5a641d859c92b97b9c084fdab4de42e82a69f6cb Mon Sep 17 00:00:00 2001 From: Flo Date: Wed, 7 Oct 2026 16:21:29 +0200 Subject: [PATCH 091/175] test: cover compiler output validity and edge cases for code splitting, Hydrate, server functions and the route generator (#8629) * test(router-plugin, start-plugin-core): cover compiler output regressions Add engine-agnostic regression tests for compiler output found while reviewing the compiler migration (#8504). They only use the public compiler entry points and validate emitted code with Vite's Oxc transform/parser (TypeScript erased, parsed as a JS module with semantic checks), so they run unchanged against any compiler implementation. router-plugin: - every emitted code-splitter module stays valid for re-exported imports, partially exported destructuring and anonymous default exports - self-/mutually-referencing side effects stay in the reference module - namespace imports used by `import X = ns.X` and decorator placement before `export` are preserved - React Refresh hoisting keeps closures in scope, hoists the root route component, and declares hoisted components before use start-plugin-core: - self-referencing user code survives client and server compilation - nested and switch-case createServerFn keep provider modules valid - aliased createClientOnlyFn re-exports are transformed in SSR - Hydrate split modules: parent/fallback-only bindings are removed, text children render decoded entities, `'use client'` stays first Co-Authored-By: Claude Opus 5.5 (1M context) * test: require hoisting and declared bindings in compiler regression tests - The React Refresh ordering test now requires the inline pendingComponent to be hoisted instead of passing when it stays inline, since main hoists it and React Refresh needs a top-level binding. - The self-referencing side-effect tests also assert that each binding the callbacks use is still declared. The module validator does not report references to undeclared names. The Start variant now validates the module. Co-Authored-By: Claude Opus 5.5 (1M context) * test(router-plugin, start-plugin-core, router-generator, react-start-rsc): cover compiler edge cases Engine-agnostic tests through public compiler entry points, passing on main. They cover: - code-splitter module state shared with exported functions, `var` declared inside top-level statements, long method chains, duplicate split keys, split options that read `Route`, route options declared in a variable, re-exports, type-only syntax, private class members, and namespace JSX tags - the code-splitter plugin pipeline: analysis cache keys and eviction, plugin-level `splitBehavior`, config `deleteNodes`, and the non-split HMR plugin for Solid and Vue - the route generator transform with parenthesized call parts, and byte-exact edits after a BOM or astral characters - the Start compiler: dev-mode server function ids, provider directives, handler name versioning, provider export removal, cross-module factory resolution, invalidation, and diagnostic locations - Hydrate children with block-bodied callbacks, self-closing boundaries, captures, split attributes, and the virtual module cache - import-protection exports, member-chain boundaries, source-mapped locations, and executed denied-import rewrites - RSC CSS transform import shapes and argument unwrapping Co-Authored-By: Claude Opus 5.5 (1M context) * test(start-plugin-core): port Next.js server actions fixtures to createServerFn Translate the scenarios of Next.js's server-actions transform fixtures (crates/next-custom-transforms/tests/fixture/server-actions) to the createServerFn client, SSR caller and provider outputs: captured module bindings, shadowing, destructuring, handler forms, directives, export forms, non-ASCII names and client/server-only code side by side. The destructuring default and computed-key cases pass on main and fail with the Yuku compiler (#8504), which keeps every sibling of a live destructuring and with it a server-only import in the client output. Co-Authored-By: Claude Opus 5.5 (1M context) * test(router-plugin): port Next.js SSG and React Router route-chunk splitting scenarios Translate edge cases from Next.js's SSG transform fixtures and React Router's route-chunks / remove-exports tests into code-splitter coverage: imports used in JSX positions, shadowed names, transitive pruning of every declaration kind, destructurings and multi-declarator statements split across groups, mutually recursive shared helpers, nested-scope dependency analysis, helpers shared with the loader, top-level calls on imports and split chunk source maps. All scenarios already behave correctly; these tests pin them. Co-Authored-By: Claude Opus 5.5 (1M context) * test(start-plugin-core, router-plugin): port Qwik optimizer extraction edge cases Port capture and extraction scenarios from the Qwik optimizer test suite (QwikDev/qwik, packages/optimizer/core/src/test.rs) to the Hydrate split transform, server function extraction and route code splitting. All of them pass with both the Babel and the Yuku compiler. Co-Authored-By: Claude Opus 5.5 (1M context) * test(router-plugin, start-plugin-core): cover real-world compiler shapes Adds regression coverage derived from a differential audit of in-repo examples/e2e apps and open-source TanStack Router/Start apps: - split chunks import exported route-file bindings instead of copying them - declarations and imports only referenced from TypeScript types survive (classic JSX runtime React imports, side-effecting initializers) - TypeScript type and value exports sharing a name compile - file-level JSX pragmas stay in split chunks and Start compiler output - ambient declarations are not imported from the shared module - chained comparisons in plain JavaScript route files keep their operands - real-world route file names go through the code-splitter plugin pipeline Co-Authored-By: Claude Opus 5.5 (1M context) * test(router-plugin, start-plugin-core): port React Compiler fixture shapes Wrap component bodies adapted from the React Compiler fixture corpus into route files and Start modules: - split route components and Hydrate chunks render like the original for labeled breaks, shadowing catch params and function names, destructuring defaults, getters/computed keys, hoisted functions, optional call chains, tagged templates and classes with static blocks/private fields - server function handlers that read a server-only import through unusual syntax positions keep it off the client - unused locals with side-effectful initializers (hook calls) in shared route modules and Hydrate chunks still run; these fail on the Yuku migration, which removes them Co-Authored-By: Claude Opus 5.5 (1M context) * test: cover exported route variables in split chunks and JSX pragma forms - Split chunks import exported route-file variables (contexts, stores and caches built from private bindings) from the route module instead of redeclaring them. - The Start compiler keeps JSX pragmas in the Hydrate chunk, line-comment and license-header forms, classic `@jsx` with `@jsxFrag`, and after a `'use client'` directive. Both pass on main and on #8504 after its fixes. Co-Authored-By: Claude Opus 5.5 (1M context) * test(start-plugin-core): port SolidStart directive and Waku allowServer edge cases Translate SolidStart's "use server" directive compiler tests and helpers (type-only import specifiers, rejected server fn positions, captured this/arguments/super/private members, id stability and opacity, Hydrate closure captures) and Waku's allowServer transform tests (dependency pruning, aliasing, default exports, untouched look-alikes, zero-argument factories, trailing comments) into Start compiler coverage for React and Solid. The import-alias namespace test passes on main and fails on the Yuku compiler (#8504), which deletes the aliased namespace. Co-Authored-By: Claude Opus 5.5 (1M context) * test(router-plugin): port React Refresh and solid-refresh scenarios to route HMR Covers which route component shapes React Refresh registers after the HMR transforms (checked with Vite's Oxc React Refresh transform), hook signatures, @refresh reset, generated-name collisions, and the module shape solid-refresh expects (registrable components, @refresh reload/skip, top-level createContext). Co-Authored-By: Claude Opus 5.5 (1M context) * test(router-plugin, start-plugin-core, react-start-rsc): port @vitejs/plugin-rsc transform edge cases Port scope, hoisting, export-shape, export * and directive scenarios from @vitejs/plugin-rsc's transform tests (vitejs/vite-plugin-react, MIT) to the Start compiler (server fn providers and callers, env-only functions, Hydrate chunks), the route code splitter and the RSC CSS transforms. Co-Authored-By: Claude Opus 5.5 (1M context) * test: port babel-dead-code-elimination and Turbopack tree-shaker scenarios Port dead-code-elimination scenarios (pcattori/babel-dead-code-elimination) and Turbopack tree-shaker analyzer fixtures (vercel/next.js) to the code splitter and the Start compiler: import specifier pruning, initially unused declarations and cycles, SCC removal, write-only bindings, nested patterns with rests and defaults, empty parameter patterns, var declarations nested in top-level statements, import attributes, typeof references, enum IIFEs, shared mutable state and statement order in the provider. Co-Authored-By: Claude Opus 5.5 (1M context) * test(router-plugin): share compiler regression test helpers The regression suites each re-implemented the same plumbing. Move it into `tests/regression-helpers.ts`: - `compileRouteModules` (reference, virtual chunks and shared module, with optional route HMR, Solid target or file name) and `expectValidModules`, previously copied into 12 files - `buildAndRun`, the Vite build-and-run harness copied into 5 files - `createCodeSplitterTransforms` and `transformWithRouteHmrPlugin`, which drive the bundler plugins the way a bundler does - `evaluateModule`, the JSX-to-text module evaluator copied into 3 files No test is added, removed or renamed. Co-Authored-By: Claude Opus 5.5 (1M context) * test(start-plugin-core): share compiler regression test helpers The regression suites each built their own `StartCompiler`, output compiler, Start runtime stubs and `` chunk loader. Move them into `tests/regression-helpers.ts`: - `createStartCompiler`, `compileFor`, `compileCode` and `compileAll` (client, SSR caller and provider outputs, validated), previously built in 10 files - `importModule`, `callProvider`, `importSources` and `settle`, with one minimal Start runtime instead of four variants - `compileHydrate`, `getChunkParams`, `getChunkIds`, `loadChunk`, `evaluateModule` and `renderChunk`, previously copied into 6 files No test is added, removed or renamed. Co-Authored-By: Claude Opus 5.5 (1M context) * test(react-start-rsc): share the RSC CSS transform compile helper Both RSC CSS transform regression suites defined the same compile helper and a copy of the module validator; move the helper into `tests/regression-helpers.ts` and reuse start-plugin-core's validator. Co-Authored-By: Claude Opus 5.5 (1M context) * test(router-plugin): merge duplicated compiler regression tests Remove tests whose input shape and assertions another suite already covers, folding any unique assertion into the surviving test: - code-splitter-real-world: the two "split chunks share exported route-file bindings" compile checks duplicate code-splitter-exported-bindings (the built-app check stays); "file-level JSX pragmas" duplicates the @jsxImportSource cases of code-splitter-jsx-pragmas, which now also check that Oxc selects the pragma's JSX runtime for every split chunk. - ported-react-compiler-fixtures: "a catch parameter shadowing a module binding" duplicates the plugin-rsc "next to a catch parameter of the same name" case, which now names both sources. - ported-nextjs-ssg: "moves one declarator of a multi-declarator statement into the split chunk" duplicates the React Router "plain declarators" case, which now also asserts where each declarator is declared. Co-Authored-By: Claude Opus 5.5 (1M context) * test(start-plugin-core): merge duplicated compiler regression tests - The SolidStart "local types used by split children are not passed as props" Hydrate test duplicates the Qwik "local types used by the children are not captured as values" test; the Qwik test now also covers JSX type arguments and asserts that no type is passed as a prop. - start-compiler-edge-cases "does not duplicate a directive the module already has" becomes a case of the plugin-rsc "provider module directives" table, which also checks the prologue and module validity. - The single test of aliased-env-only-fns.test.ts moves to the "cross-module factory resolution" tests of start-compiler-edge-cases, where its output is also validated. Co-Authored-By: Claude Opus 5.5 (1M context) * test(router-generator): merge the parenthesized route call transform tests transform-parenthesized.test.ts duplicated the `transform` harness of transform-preservation.test.ts; move its tests there. Co-Authored-By: Claude Opus 5.5 (1M context) * test(router-plugin): keep covering configs without the router plugin Before the code-splitter transforms were shared, the real-world file-name test resolved a Vite config that did not list the router plugin, which covers the early return of the plugin-order check. Let the shared helper take the config's plugins and keep that case. Co-Authored-By: Claude Opus 5.5 (1M context) * test(router-plugin): regroup compiler regression tests by behaviour Dissolve the ported-* and code-splitter edge-case files into behaviour files (dead code, imports/exports, module state, pragmas, route options, scope), drop duplicate cases and vacuous assertions, and replace the five real Vite builds with one. Co-Authored-By: Claude Opus 5.5 (1M context) * test(start-plugin-core): regroup compiler regression tests by behaviour Dissolve the ported-* and start-compiler edge-case files into behaviour files (server fn caller dead code, declaration sites, exports and directives, handler scope, Hydrate captures, factories, user code kept), drop duplicate cases and vacuous assertions, and compile through a single harness. The RSC external-transform scope cases move into compiler.test.ts, replacing react-start-rsc's ported-vite-plugin-rsc.test.tsx. Co-Authored-By: Claude Opus 5.5 (1M context) * test(router-generator): move transform edge cases into transform.test.ts Merge the five parenthesized-call cases into one test next to the existing outer-parens test and fold the remaining preservation cases into transform.test.ts, reusing its makeNode helper. Co-Authored-By: Claude Opus 5.5 (1M context) * test(react-start-rsc): move RSC CSS transform edge cases into rscCssTransform.test.tsx Keep the cases with unique coverage (the @tanstack/react-start-rsc import source, transparent JSX wrappers, non-JSX arguments) next to the existing tests and drop the separate helper, which imported start-plugin-core tests. Co-Authored-By: Claude Opus 5.5 (1M context) * test: keep regression tests valid once known compiler bugs are fixed Co-Authored-By: Claude Opus 5.5 (1M context) * test: share the build and React Refresh helpers Co-Authored-By: Claude Opus 5.5 (1M context) * test(start-plugin-core): link Hydrate chunks to their parent however a fix imports it Co-Authored-By: Claude Opus 5.5 (1M context) --------- Co-authored-by: Claude Opus 5.5 (1M context) --- .../tests/rscCssTransform.test.tsx | 51 ++ .../router-generator/tests/transform.test.ts | 119 ++++ .../tests/code-splitter-dead-code.test.ts | 462 +++++++++++++ .../code-splitter-imports-exports.test.ts | 330 +++++++++ .../tests/code-splitter-module-state.test.ts | 175 +++++ .../code-splitter-plugin-pipeline.test.ts | 230 +++++++ .../tests/code-splitter-pragmas.test.ts | 124 ++++ .../tests/code-splitter-route-options.test.ts | 116 ++++ .../tests/code-splitter-scope.test.ts | 339 +++++++++ .../react-refresh-route-components.test.ts | 281 ++++++++ .../router-plugin/tests/regression-helpers.ts | 474 +++++++++++++ .../router-plugin/tests/validate-module.ts | 38 ++ .../start-plugin-core/tests/compiler.test.ts | 82 +++ .../createServerFn/caller-dead-code.test.ts | 591 ++++++++++++++++ .../createServerFn/createServerFn.test.ts | 31 + .../createServerFn/declaration-sites.test.ts | 122 ++++ .../exports-and-directives.test.ts | 421 ++++++++++++ .../createServerFn/handler-scope.test.ts | 363 ++++++++++ .../tests/hydrate-captures.test.ts | 309 +++++++++ .../tests/hydrate-split-modules.test.ts | 643 ++++++++++++++++++ .../importProtection/analysis.exports.test.ts | 17 + .../importProtection/analysis.usage.test.ts | 50 ++ .../tests/importProtection/rewrite.test.ts | 30 + .../importProtection/sourceLocation.test.ts | 102 +++ .../tests/regression-helpers.ts | 471 +++++++++++++ .../tests/start-compiler-factories.test.ts | 483 +++++++++++++ .../tests/start-compiler-jsx-pragma.test.ts | 145 ++++ ...start-compiler-preserves-user-code.test.ts | 142 ++++ .../tests/validate-module.ts | 38 ++ 29 files changed, 6779 insertions(+) create mode 100644 packages/router-plugin/tests/code-splitter-dead-code.test.ts create mode 100644 packages/router-plugin/tests/code-splitter-imports-exports.test.ts create mode 100644 packages/router-plugin/tests/code-splitter-module-state.test.ts create mode 100644 packages/router-plugin/tests/code-splitter-plugin-pipeline.test.ts create mode 100644 packages/router-plugin/tests/code-splitter-pragmas.test.ts create mode 100644 packages/router-plugin/tests/code-splitter-route-options.test.ts create mode 100644 packages/router-plugin/tests/code-splitter-scope.test.ts create mode 100644 packages/router-plugin/tests/react-refresh-route-components.test.ts create mode 100644 packages/router-plugin/tests/regression-helpers.ts create mode 100644 packages/router-plugin/tests/validate-module.ts create mode 100644 packages/start-plugin-core/tests/createServerFn/caller-dead-code.test.ts create mode 100644 packages/start-plugin-core/tests/createServerFn/declaration-sites.test.ts create mode 100644 packages/start-plugin-core/tests/createServerFn/exports-and-directives.test.ts create mode 100644 packages/start-plugin-core/tests/createServerFn/handler-scope.test.ts create mode 100644 packages/start-plugin-core/tests/hydrate-captures.test.ts create mode 100644 packages/start-plugin-core/tests/hydrate-split-modules.test.ts create mode 100644 packages/start-plugin-core/tests/regression-helpers.ts create mode 100644 packages/start-plugin-core/tests/start-compiler-factories.test.ts create mode 100644 packages/start-plugin-core/tests/start-compiler-jsx-pragma.test.ts create mode 100644 packages/start-plugin-core/tests/start-compiler-preserves-user-code.test.ts create mode 100644 packages/start-plugin-core/tests/validate-module.ts diff --git a/packages/react-start-rsc/tests/rscCssTransform.test.tsx b/packages/react-start-rsc/tests/rscCssTransform.test.tsx index 0e2c2e45cf..afc4686e94 100644 --- a/packages/react-start-rsc/tests/rscCssTransform.test.tsx +++ b/packages/react-start-rsc/tests/rscCssTransform.test.tsx @@ -161,4 +161,55 @@ describe('RSC CSS compiler transforms', () => { detectKindsInCode(code, 'client', { compilerTransforms }), ).toMatchInlineSnapshot(`Set {}`) }) + + test('rewrites render APIs imported from @tanstack/react-start-rsc', async () => { + const code = await compileWithRscCssTransform({ + code: ` + import { renderServerComponent } from '@tanstack/react-start-rsc' + + export const renderable = renderServerComponent() + `, + }) + + expect(code).toContain( + '__tanstackStartRscCss: import.meta.viteRsc.loadCss()', + ) + }) + + test.each([ + { wrapped: '()', bare: '' }, + { wrapped: ' as any', bare: '' }, + { wrapped: '!', bare: '' }, + { wrapped: '(<>) satisfies unknown', bare: '<>' }, + ])( + 'streams $wrapped like the bare JSX it wraps', + async ({ wrapped, bare }) => { + const compileStream = (element: string) => + compileWithRscCssTransform({ + code: ` + import { renderToReadableStream } from '@tanstack/react-start/rsc' + + export const stream = renderToReadableStream(${element}) + `, + }) + + const bareCode = await compileStream(bare) + expect(bareCode).toContain('import.meta.viteRsc.loadCss()') + expect(await compileStream(wrapped)).toBe(bareCode) + }, + ) + + test('does not stream JSX that is not the whole argument', async () => { + const code = await compileWithRscCssTransform({ + code: ` + import { renderToReadableStream } from '@tanstack/react-start/rsc' + + export const conditional = renderToReadableStream(flag ? : ) + export const spread = renderToReadableStream(...args) + `, + }) + + expect(code).toContain('renderToReadableStream(...args)') + expect(code).not.toContain('loadCss') + }) }) diff --git a/packages/router-generator/tests/transform.test.ts b/packages/router-generator/tests/transform.test.ts index f026ecc30e..2267599c15 100644 --- a/packages/router-generator/tests/transform.test.ts +++ b/packages/router-generator/tests/transform.test.ts @@ -13,7 +13,35 @@ function makeNode( } } +function transformToNewRoute(source: string, node = makeNode()) { + return transform({ + source, + ctx: { target: 'react', routeId: '/new', lazy: false }, + node, + }) +} + describe('transform', () => { + it('reads and rewrites the route constructor, id and options through parentheses', () => { + const node = makeNode() + const result = transformToNewRoute( + [ + "import { createLazyFileRoute } from '@tanstack/react-router'", + "export const Route = (createLazyFileRoute)(('/old'))(({ component: Page, server: {} }))", + ].join('\n'), + node, + ) + + expect(result).toEqual({ + result: 'modified', + output: [ + "import { createFileRoute } from '@tanstack/react-router'", + "export const Route = (createFileRoute)(('/new'))(({ component: Page, server: {} }))", + ].join('\n'), + }) + expect(node.createFileRouteProps).toEqual(new Set(['component', 'server'])) + }) + it('updates parenthesized route calls without changing their surrounding source', () => { const result = transform({ source: @@ -535,4 +563,95 @@ describe('transform', () => { ) expect(result.output).not.toContain('createLazyFileRoute') }) + + // The recorded option keys drive prerendering and server-only route pruning. + it('records identifier and string-literal option keys, not computed or spread ones', () => { + const node = makeNode() + const result = transformToNewRoute( + [ + "import { createFileRoute } from '@tanstack/react-router'", + "export const Route = createFileRoute('/new')({ 'component': Page, [key]: load, ...rest, server: {} })", + ].join('\n'), + node, + ) + + expect(result).toEqual({ result: 'not-modified' }) + expect(node.createFileRouteProps).toEqual(new Set(['component', 'server'])) + }) +}) + +// The generator writes its output back over the user's route file, so every +// byte outside the route id and the router import must survive unchanged. +describe('transform preserves the rest of the route file', () => { + it('edits the right spans after a BOM and astral characters', () => { + const result = transformToNewRoute( + [ + '\uFEFF// 😀', + "import { createLazyFileRoute } from '@tanstack/react-router'", + "import { createFileRoute } from '@tanstack/react-router'", + "export const Route = createFileRoute(/* 🚀 */ '/old')({})", + ].join('\n'), + ) + + expect(result).toEqual({ + result: 'modified', + output: [ + '\uFEFF// 😀', + "import { createFileRoute } from '@tanstack/react-router'", + "export const Route = createFileRoute(/* 🚀 */ '/new')({})", + ].join('\n'), + }) + }) + + it.each([ + { + name: 'a default import', + imports: "import Router from '@tanstack/react-router'", + expected: + "import Router, { createFileRoute } from '@tanstack/react-router'", + }, + { + name: 'an aliased import of the constructor', + imports: + "import { createFileRoute as cfr } from '@tanstack/react-router'", + expected: + "import { createFileRoute as cfr, createFileRoute } from '@tanstack/react-router'", + }, + { + // The constructor goes into the named import, never the namespace one. + name: 'a namespace import', + imports: [ + "import * as Router from '@tanstack/react-router'", + "import { Link } from '@tanstack/react-router'", + ].join('\n'), + expected: [ + "import * as Router from '@tanstack/react-router'", + "import { Link, createFileRoute } from '@tanstack/react-router'", + ].join('\n'), + }, + ])('adds the missing constructor next to $name', ({ imports, expected }) => { + const route = "export const Route = createFileRoute('/old')({})" + + expect(transformToNewRoute(`${imports}\n${route}`)).toEqual({ + result: 'modified', + output: `${expected}\n${route.replace('/old', '/new')}`, + }) + }) + + it('updates only the Route declarator of a multi-declarator export', () => { + const result = transformToNewRoute( + [ + "import { createFileRoute } from '@tanstack/react-router'", + "export const Route = createFileRoute('/old')({}), path = '/old'", + ].join('\n'), + ) + + expect(result).toEqual({ + result: 'modified', + output: [ + "import { createFileRoute } from '@tanstack/react-router'", + "export const Route = createFileRoute('/new')({}), path = '/old'", + ].join('\n'), + }) + }) }) diff --git a/packages/router-plugin/tests/code-splitter-dead-code.test.ts b/packages/router-plugin/tests/code-splitter-dead-code.test.ts new file mode 100644 index 0000000000..038f323caf --- /dev/null +++ b/packages/router-plugin/tests/code-splitter-dead-code.test.ts @@ -0,0 +1,462 @@ +import { describe, expect, it } from 'vitest' +import { + compileRouteModules, + declarationOf, + evaluateModule, + expectValidModules, + head, + importSources, + importedNames, + transformWithRouteHmrPlugin, +} from './regression-helpers' + +const sharedModule = 'route.tsx?tsr-shared=1' + +/** Whether a module declares `name` or imports it from the shared module. */ +function binds(module: string, name: string) { + return ( + declarationOf(name).test(module) || + importedNames(module, sharedModule).includes(name) + ) +} + +/** + * The reference module, compiled without and with React HMR: HMR rewrites the + * route options (hoisted components, refresh anchor) before dead code is + * removed, so the removal runs on a different program. + */ +function referenceModules(code: string) { + return { + reference: compileRouteModules(code).modules.reference!, + 'reference with HMR': compileRouteModules(code, { hmr: true }).modules + .reference!, + } +} + +/** + * Renders the split component the way an app loads it: the shared module (if + * any) and the reference module run first, then the component chunk, all + * linked to one instance of the shared module. A top-level statement may then + * reach the component by moving into its chunk or by staying in the + * reference module and writing to a shared binding. + */ +async function renderSplitComponent(modules: Record) { + const stubs: Record> = {} + if (modules.shared) { + stubs[sharedModule] = await evaluateModule(modules.shared) + } + await evaluateModule(modules.reference!, { + ...stubs, + '@tanstack/react-router': { + createFileRoute: () => (options: unknown) => ({ options }), + lazyRouteComponent: () => () => null, + }, + }) + const chunk = await evaluateModule(modules['virtual component']!, stubs) + return chunk.component!() +} + +describe('the reference module only drops code that splitting left unused', () => { + it.each([ + { + name: 'a store subscription that unsubscribes itself', + setup: `import { store } from './store' +const unsubscribe = store.subscribe(() => { + if (store.state.done) unsubscribe() +})`, + declared: ['unsubscribe'], + }, + { + name: 'mutually-referencing declarations', + setup: `import { createPersister } from './persist' +const persister = createPersister({ onRestore: () => restore() }) +function restore() { + persister.restore() +}`, + declared: ['persister', 'restore'], + }, + { + // Source: babel-dead-code-elimination dead-code-elimination.test.ts "only + // eliminates newly unreferenced identifiers", "unexported circular references" + // and "SCC with external caller used -> all preserved" + name: 'unused functions, one calling a helper of the split component', + setup: `function helper() { return 'helper' } +function unused() { return helper() } +function ping(): number { return pong() } +function pong(): number { return ping() }`, + component: '

{helper()}

', + declared: ['helper', 'unused', 'ping', 'pong'], + }, + ])( + 'keeps $name that nothing used before splitting', + async ({ setup, component = '
', declared }) => { + const code = `${head}${setup} +export const Route = createFileRoute('/')({ component: () => ${component} }) +` + const modules = referenceModules(code) + // The validator does not report references to undeclared names. A + // binding the split component reads may come from the shared module. + for (const [module, reference] of Object.entries(modules)) { + for (const name of declared) { + expect(binds(reference, name), `${module} binds ${name}`).toBe(true) + } + } + await expectValidModules(modules) + }, + ) + + // Source: babel-dead-code-elimination dead-code-elimination.test.ts "SCC dead + // code elimination" > "arrow functions in mutual recursion -> removed" + it('moves mutually recursive helpers only the component uses, and their imports, into its chunk', async () => { + const code = `${head}import { dep } from './dep' +const ping = (n: number): number => (n > 0 ? pong(n - 1) : 0) +const pong = function (n: number): number { return n > 0 ? ping(n - 1) : dep } +export const Route = createFileRoute('/')({ + loader: () => 'data', + component: () =>

{ping(3)}

, +}) +` + for (const reference of Object.values(referenceModules(code))) { + expect(reference).not.toMatch(declarationOf('ping')) + expect(reference).not.toMatch(declarationOf('pong')) + expect(importSources(reference)).not.toContain('./dep') + } + const { modules } = compileRouteModules(code) + expect(modules['virtual component']).toMatch(declarationOf('ping')) + expect(modules['virtual component']).toMatch(declarationOf('pong')) + await expectValidModules(modules) + }) + + // Source: Next.js ssg/getStaticProps/should-remove-re-exported-function-declarations-dependents-variables-functions-imports + it('keeps the import specifiers nothing used before splitting', async () => { + const { modules } = + compileRouteModules(`${head}import { used, preUnused } from 'bar' +const b = function apples() { return used } +export const Route = createFileRoute('/')({ + loader: () => 'data', + component: () =>

{b()}

, +}) +`) + expect(importedNames(modules.reference!, 'bar')).toEqual(['preUnused']) + expect(modules.reference).not.toContain('apples') + expect(modules['virtual component']).toMatch(declarationOf('b')) + expect(importedNames(modules['virtual component']!, 'bar')).toContain( + 'used', + ) + await expectValidModules(modules) + }) + + // Source: React Router route-chunks-test.ts "shared imports across chunks but + // not main chunk with shared side effect usage" + it('runs a top-level call only in the reference module, even when the chunks import its callee', async () => { + const { modules } = + compileRouteModules(`${head}import { shared } from './shared' +shared('side-effect-marker') +export const Route = createFileRoute('/')({ + component: () =>
{shared('component')}
, + errorComponent: () =>
{shared('error')}
, +}) +`) + expect(modules.reference).toContain('side-effect-marker') + expect(modules['virtual component']).not.toContain('side-effect-marker') + expect(modules['virtual errorComponent']).not.toContain( + 'side-effect-marker', + ) + await expectValidModules(modules) + }) + + // TypeScript erases type positions, so a declaration whose binding only + // appears in a type is still live code that runs when the route loads. + it.each([ + { + name: 'the reference module', + compile: (code: string) => compileRouteModules(code).modules.reference!, + }, + { + name: 'a route module compiled for HMR', + compile: (code: string) => transformWithRouteHmrPlugin(code), + }, + ])( + 'keeps a declaration only referenced from types in $name', + async ({ compile }) => { + const output = + compile(`${head}import { registerAnalytics } from './analytics' +const analytics = registerAnalytics('/posts') +declare module './analytics' { + interface Registry { + posts: typeof analytics + } +} +export const Route = createFileRoute('/posts')({ + component: () =>

posts

, +}) +`) + expect(output).toMatch(declarationOf('analytics')) + expect(output).toContain('registerAnalytics(') + await expectValidModules({ output }) + }, + ) +}) + +describe('code a split option needs moves with it', () => { + // Source: Qwik optimizer test.rs should_not_move_over_side_effects, + // example_drop_side_effects; Turbopack tree-shaker analyzer/route-kind + it.each([ + { + name: 'a compound component member assignment', + setup: `function Card({ children }) { return
{children}
} +Card.Title = function Title() { return

t

}`, + render: '', + rendered: '

t

', + }, + { + name: 'a registry filled by a top-level call', + setup: `const registry = new Map() +registry.set('a', 'A')`, + render: `

{registry.get('a')}

`, + rendered: '

A

', + }, + { + name: 'a compiled enum initializing a var', + setup: `var Kind: any +;(function (Kind: any) { + Kind['A'] = 'a' +})(Kind || (Kind = {}))`, + render: '

{Kind.A}

', + rendered: '

a

', + }, + ])( + 'renders a split component that relies on $name', + async ({ setup, render, rendered }) => { + const { modules } = compileRouteModules(`${head}${setup} +export const Route = createFileRoute('/')({ + component: () => ${render}, +}) +`) + await expectValidModules(modules) + expect(await renderSplitComponent(modules)).toBe(rendered) + }, + ) + + // Source: React Compiler hook-ref-callback.js and + // dont-memoize-primitive-function-call-non-escaping.js: a function shared by + // the loader and the split component declares a local it never reads. + it.each([ + { name: 'a call', initializer: 'track(id)' }, + { name: 'an optional call', initializer: 'track?.(id)' }, + ])( + 'keeps an unused local initialized by $name in a shared function', + async ({ initializer }) => { + const { modules } = + compileRouteModules(`${head}import { track } from './track' +function useShared(id) { + const unused = ${initializer} + return id +} +export const Route = createFileRoute('/')({ + loader: () => useShared('loader'), + component: () =>

{useShared('component')}

, +}) +`) + const calls: Array = [] + const shared = await evaluateModule(modules.shared!, { + './track': { track: (label: string) => calls.push(label) }, + }) + expect(shared.useShared!('render')).toBe('render') + expect(calls).toEqual(['render']) + }, + ) + + // Source: babel-dead-code-elimination dead-code-elimination.test.ts "object + // pattern" > "within function param" + it('keeps empty destructuring parameters of helpers moved into the chunk', async () => { + const { modules } = + compileRouteModules(`${head}function f(a: any, {}: any) { return a } +const g = (a: any, []: any) => a +export const Route = createFileRoute('/')({ + loader: () => 'data', + component: () =>

{f.length}{g.length}

, +}) +`) + const chunk = await evaluateModule(modules['virtual component']!) + expect(chunk.component!()).toBe('

22

') + }) + + // Source: React Router remove-exports-test.ts "iife with dependencies" + it('moves a component created by an IIFE with its dependencies and shares the helper the loader uses too', async () => { + const { modules, sharedBindings } = + compileRouteModules(`${head}import { removedLib } from 'removed-lib' +import { keptLib } from 'kept-lib' +import { sharedLib } from 'shared-lib' +const sharedUtil = (value?: unknown) => sharedLib(value) +const removedUtil = () => sharedUtil(removedLib()) +const keptUtil = () => sharedUtil(keptLib()) +const Page = (() => { + const message = removedUtil() + return () =>
{String(message)}
+})() +export const Route = createFileRoute('/')({ + loader: () => keptUtil(), + component: Page, +}) +`) + expect(sharedBindings).toEqual(['sharedUtil']) + expect(importSources(modules.reference!)).toEqual([ + '@tanstack/react-router', + 'kept-lib', + 'route.tsx?tsr-shared=1', + ]) + expect(modules.reference).not.toContain('removedUtil') + expect(importSources(modules['virtual component']!)).toEqual([ + 'removed-lib', + 'route.tsx?tsr-shared=1', + ]) + expect(modules['virtual component']).toMatch(declarationOf('Page')) + expect(importSources(modules.shared!)).toEqual(['shared-lib']) + await expectValidModules(modules) + }) + + // Source: React Router route-chunks-test.ts "isolated exported variable + // declarations sharing an export statement"; Next.js + // ssg/getStaticProps/should-remove-re-exported-variable-declarations-safe + it.each([ + { + name: 'plain declarators', + declarations: `const Page = () =>
{chunkMessage}
, + main = mainMessage`, + }, + { + name: 'destructured declarators', + declarations: `const { Page } = { Page: () =>
{chunkMessage}
}, + { main } = { main: mainMessage }`, + }, + ])( + 'gives each of the $name of one statement to the module that reads it', + async ({ declarations }) => { + const { modules, sharedBindings } = + compileRouteModules(`${head}import { chunkMessage, mainMessage } from './messages' +${declarations} +export const Route = createFileRoute('/')({ + loader: () => main, + component: Page, +}) +`) + expect(sharedBindings).toEqual([]) + expect(importedNames(modules.reference!, './messages')).toEqual([ + 'mainMessage', + ]) + expect(modules.reference).not.toMatch(/\bPage\b/) + expect( + importedNames(modules['virtual component']!, './messages'), + ).toEqual(['chunkMessage']) + expect(modules['virtual component']).not.toMatch(/\bmain\b/) + await expectValidModules(modules) + }, + ) + + // Source: React Router route-chunks-test.ts "exported variable declarations + // sharing an export statement" + it('shares a declarator that a sibling declarator reads', async () => { + const { modules, sharedBindings } = + compileRouteModules(`${head}import { sharedMessage } from './messages' +const Page = () =>
{sharedMessage}
, + Preview = Page +export const Route = createFileRoute('/')({ + loader: () => Preview.name, + component: Page, +}) +`) + expect(sharedBindings).toEqual(['Page']) + expect(modules.shared).toMatch(declarationOf('Page')) + expect(modules.reference).toMatch(declarationOf('Preview')) + expect(importedNames(modules.reference!, sharedModule)).toEqual(['Page']) + expect(modules.reference).not.toMatch(declarationOf('Page')) + expect(modules['virtual component']).not.toMatch(declarationOf('Page')) + await expectValidModules(modules) + }) +}) + +describe('var declarations nested in top-level statements', () => { + it.each([ + { + name: 'a for loop head', + setup: 'for (var value = 0; value < 3; value++) {}', + }, + { name: 'a for-of head', setup: "for (var value of ['a']) {}" }, + { + name: 'an if block', + setup: "if (typeof window === 'undefined') { var value = 'server' }", + }, + ])( + 'stay bound in every module when $name declares a binding the loader and the component read', + async ({ setup }) => { + const { modules } = compileRouteModules(`${head}${setup} +export const Route = createFileRoute('/')({ + loader: () => value, + component: () =>
{value}
, +}) +`) + // Known limitation on main: the statement runs in both modules instead + // of once in the shared module; only check that each module binds `value`. + for (const name of ['reference', 'virtual component']) { + expect(binds(modules[name]!, 'value'), `${name} binds value`).toBe(true) + } + await expectValidModules(modules) + }, + ) + + it('stay bound in the reference module when exported and read by the component', async () => { + const { modules } = + compileRouteModules(`${head}if (typeof window === 'undefined') { var flag = 'server' } +export { flag } +export const Route = createFileRoute('/')({ + component: () =>
{flag}
, +}) +`) + expect(binds(modules.reference!, 'flag')).toBe(true) + await expectValidModules(modules) + }) + + // Source: babel-dead-code-elimination dead-code-elimination.test.ts "variable" + // (var bindings declared inside nested statements) + it('follow the only option that reads them', async () => { + const { modules } = + compileRouteModules(`${head}import { compute, connect } from './lib' +if (typeof window !== 'undefined') { + var flag = compute() +} +for (var index = 0; index < 3; index++) {} +{ + var block = connect() +} +export const Route = createFileRoute('/')({ + loader: () => block, + component: () =>

{String(flag)}{index}

, +}) +`) + expect(modules.reference).not.toContain('compute()') + expect(modules.reference).toMatch(declarationOf('block')) + const chunk = modules['virtual component']! + expect(chunk).toMatch(declarationOf('flag')) + expect(chunk).toMatch(declarationOf('index')) + expect(chunk).not.toContain('connect()') + await expectValidModules(modules) + }) +}) + +describe('robustness', () => { + it('compiles a route with a long method chain', async () => { + // Builder APIs (schemas, query builders) produce deep left-nested calls + const chain = Array.from({ length: 200 }, (_, i) => `.add(${i})`).join('') + const { modules } = + compileRouteModules(`${head}import { builder } from './builder' +const schema = builder()${chain} +export const Route = createFileRoute('/')({ + loader: () => schema, + component: () =>
{String(schema)}
, +}) +`) + expect(modules.shared).toContain('.add(199)') + await expectValidModules(modules) + }) +}) diff --git a/packages/router-plugin/tests/code-splitter-imports-exports.test.ts b/packages/router-plugin/tests/code-splitter-imports-exports.test.ts new file mode 100644 index 0000000000..b679782bdc --- /dev/null +++ b/packages/router-plugin/tests/code-splitter-imports-exports.test.ts @@ -0,0 +1,330 @@ +import { transformWithOxc } from 'vite' +import { describe, expect, it } from 'vitest' +import { + compileRouteModules, + componentChunk, + declarationOf, + evaluateModule, + expectValidModules, + exportedNames, + head, + importSources, + importedNames, + transformWithRouteHmrPlugin, +} from './regression-helpers' + +describe('each module imports only the specifiers it reads', () => { + // Source: React Router route-chunks-test.ts "functions referencing their own + // identifiers"; babel-dead-code-elimination dead-code-elimination.test.ts + // "import" > "mixed default and named" and "namespace" + it('splits default, named and namespace specifiers between the modules', async () => { + const { modules, sharedBindings } = + compileRouteModules(`${head}import defaultMessage, { targetMessage, otherMessage } from './messages' +import * as messages from './messages' +import other, * as ns from './other' +const getDefault = () => defaultMessage +const getTarget = () => targetMessage +const getOther = () => otherMessage +function getNamespaced() { + return messages.namespaced +} +export const Route = createFileRoute('/')({ + loader: () => [getOther(), other], + component: () =>
{getDefault()}{ns.x}
, + errorComponent: () =>
{getNamespaced()}
, + notFoundComponent: () =>
{getTarget()}
, +}) +`) + expect(sharedBindings).toEqual([]) + const imports = (module: string, source: string) => + importedNames(modules[module]!, source) + expect(imports('reference', './messages')).toEqual(['otherMessage']) + expect(imports('reference', './other')).toEqual(['default']) + expect(imports('virtual component', './messages')).toEqual(['default']) + expect(imports('virtual component', './other')).toEqual(['*']) + expect(imports('virtual errorComponent', './messages')).toEqual(['*']) + expect(imports('virtual notFoundComponent', './messages')).toEqual([ + 'targetMessage', + ]) + await expectValidModules(modules) + }) + + it('moves a specifier with a string name into the chunk', async () => { + const { modules } = + compileRouteModules(`${head}import { "kebab-name" as Kebab } from './icons' +export const Route = createFileRoute('/')({ + loader: () => 'data', + component: () => , +}) +`) + expect(importedNames(modules['virtual component']!, './icons')).toEqual([ + 'kebab-name', + ]) + expect(importSources(modules.reference!)).not.toContain('./icons') + await expectValidModules(modules) + }) + + // Source: babel-dead-code-elimination dead-code-elimination.test.ts "import" > + // "mixed default and named: none used" and "side-effect" + it('removes an import whose specifiers all moved instead of leaving a side-effect import', async () => { + const code = `${head}import a, { b } from 'pkg' +import './styles.css' +export const Route = createFileRoute('/')({ + loader: () => 'data', + component: () =>

{a}{b}

, +}) +` + const { modules } = compileRouteModules(code) + // React HMR rewrites the reference module before unused code is removed. + const hmrReference = compileRouteModules(code, { hmr: true }).modules + .reference! + for (const reference of [modules.reference!, hmrReference]) { + expect(importSources(reference)).toContain('./styles.css') + expect(importSources(reference)).not.toContain('pkg') + } + expect(importedNames(modules['virtual component']!, 'pkg')).toEqual([ + 'b', + 'default', + ]) + await expectValidModules(modules) + }) + + // With React's classic JSX runtime (`jsx: "react"` in tsconfig), JSX + // compiles to `React.createElement`, so a React import that the TypeScript + // code only uses in types must stay. + it.each([ + { name: 'split chunk', compile: componentChunk }, + { + name: 'route module compiled for HMR', + compile: (code: string) => transformWithRouteHmrPlugin(code), + }, + ])( + 'keeps the React import of the $name for classic JSX', + async ({ compile }) => { + const output = compile(`import * as React from 'react' +${head}function Page({ title = 'classic' }: { title?: React.ReactNode }) { + return

{title}

+} +export const Route = createFileRoute('/')({ component: Page }) +`) + const { code } = await transformWithOxc(output, 'module.tsx', { + jsx: { runtime: 'classic' }, + }) + expect(importedNames(code, 'react')).toEqual(['*']) + }, + ) +}) + +describe('exports of the route file', () => { + it.each([ + { name: 'as-is', exports: 'export { Foo }' }, + { name: 'renamed', exports: 'export { Foo as Bar }' }, + ])( + 'are not redeclared when they re-export an import $name', + async ({ exports }) => { + const { modules } = + compileRouteModules(`${head}import { Foo } from './foo' +${exports} +export const Route = createFileRoute('/')({ component: Page }) +function Page() { + return +} +`) + await expectValidModules(modules) + }, + ) + + it('are not redeclared when destructured next to a non-exported binding', async () => { + const { modules } = compileRouteModules(`${head}const { a, b } = getStuff() +export { a } +export const Route = createFileRoute('/')({ + component: () =>
{a}{b}
, +}) +`) + await expectValidModules(modules) + }) + + it.each([ + { name: 'function', declaration: 'function () {\n return null\n}' }, + { name: 'class', declaration: 'class {\n x = 1\n}' }, + ])( + 'keep an anonymous default-exported $name valid in every module', + async ({ declaration }) => { + const { modules } = compileRouteModules(`${head}const cache = new Map() +function Page() { + return
{cache.size}
+} +export const Route = createFileRoute('/')({ + loader: () => cache.get('x'), + component: Page, +}) +export default ${declaration} +`) + expect(Object.keys(modules)).toContain('shared') + await expectValidModules(modules) + }, + ) + + // Source: Next.js ssg/getStaticProps/issue-31855 and multi-declarator-export + it('are imported by the chunk when declared in one statement', async () => { + const { modules } = compileRouteModules(`${head}export const a = 1, + b = 2 +export const Route = createFileRoute('/')({ + component: () =>
{a + b}
, +}) +`) + expect(exportedNames(modules.reference!)).toEqual(['Route', 'a', 'b']) + const chunk = modules['virtual component']! + // From the route module, or from the shared module the route module + // re-exports them from. + expect( + [ + ...importedNames(chunk, 'route.tsx'), + ...importedNames(chunk, 'route.tsx?tsr-shared=1'), + ].sort(), + ).toEqual(['a', 'b']) + expect(chunk).not.toMatch(declarationOf('a')) + expect(chunk).not.toMatch(declarationOf('b')) + await expectValidModules(modules) + }) + + it('keep module-level re-exports in the reference module', async () => { + const { modules } = compileRouteModules(`${head}export * from './lib' +export * as lib from './lib' +export {} +const cache = new Map() +export const Route = createFileRoute('/')({ + loader: () => cache.size, + component: () =>
{cache.size}
, +}) +`) + expect(modules.reference).toMatch(/export \* from ['"]\.\/lib['"]/) + expect(modules.reference).toMatch(/export \* as lib from ['"]\.\/lib['"]/) + await expectValidModules(modules) + }) +}) + +describe('TypeScript-only syntax', () => { + it('erases type-only imports and exports from the split modules', async () => { + const { modules } = + compileRouteModules(`${head}import type { User } from './types' +import { type Settings, defaults } from './settings' +export type * from './types' +export type { User } +const current: User | Settings = defaults +export const Route = createFileRoute('/')({ + loader: () => current, + component: () =>
{String(current)}
, +}) +`) + expect(importedNames(modules['virtual component']!, './types')).toEqual([]) + expect(importedNames(modules.shared!, './types')).toEqual([]) + expect(importedNames(modules.shared!, './settings')).toEqual(['defaults']) + await expectValidModules(modules) + }) + + // Ambient declarations (`declare ...`) have no runtime binding: the + // environment provides the value (a ', + 'entry.js': "import './root.css'; import('./component.js')", + 'component.js': + "import './component.module.css'; import './unused.css?inline'", + 'root.css': '@import "./base.css"; .root { color: red; }', + 'base.css': '.base { --base-marker: 1; }', + 'component.module.css': '.component { --component-marker: 1; }', + 'unused.css': '.unused { --unused-marker: 1; }', + }).map(([file, code]) => writeFile(path.join(root, file), code)), + ) + let snapshot: ReturnType | undefined + const completed = Promise.withResolvers() + const server = await createServer({ + root, + configFile: false, + logLevel: 'silent', + experimental: { bundledDev: true }, + build: { rolldownOptions: { experimental: { devMode: { lazy: false } } } }, + optimizeDeps: { noDiscovery: true }, + server: { port: 0 }, + plugins: [ + { + name: 'capture-completed-styles', + generateBundle() { + if (!this.getModuleInfo(path.join(root, 'entry.js'))) { + return + } + snapshot = captureBundledDevStyles(this, root) + completed.resolve() + }, + }, + ], + }) + try { + await server.listen() + const address = server.httpServer!.address() + if (!address || typeof address === 'string') { + throw new Error('Expected the dev server to listen on a TCP port') + } + await fetch(`http://localhost:${address.port}/`) + await completed.promise + const css = collectBundledDevStyles(snapshot, [path.join(root, 'entry.js')]) + expect(css).toContain('/* /root.css */') + expect(css).toContain('/* /component.module.css */') + expect(css?.match(/--base-marker/g)).toHaveLength(1) + expect(css).toContain('--component-marker') + expect(css).not.toContain('--unused-marker') + expect(css!.indexOf('/* /root.css */')).toBeLessThan( + css!.indexOf('/* /component.module.css */'), + ) + expect( + collectBundledDevStyles(snapshot, [path.join(root, 'unknown.js')]), + ).toBeUndefined() + } finally { + await server.close() + await rm(root, { recursive: true, force: true }) + } +}, 20_000) diff --git a/packages/start-plugin-core/tests/vite/dev-styles.test.ts b/packages/start-plugin-core/tests/vite/dev-styles.test.ts new file mode 100644 index 0000000000..da355b74c2 --- /dev/null +++ b/packages/start-plugin-core/tests/vite/dev-styles.test.ts @@ -0,0 +1,644 @@ +import { describe, expect, test } from 'vitest' +import { + collectDevStyles, + fetchCssFromModule, +} from '../../src/vite/dev-server-plugin/dev-styles' +import type { EnvironmentModuleNode } from 'vite' + +function createCssNode(url: string, css: string): EnvironmentModuleNode { + return { + url, + file: `/app${url}`, + importedModules: new Set(), + transformResult: { + code: `const __vite__css = ${JSON.stringify(css)}`, + }, + } as EnvironmentModuleNode +} + +function createEntryNode( + url: string, + depUrl: string | Array, +): EnvironmentModuleNode { + return { + url, + file: `/app${url}`, + importedModules: new Set(), + transformResult: { + deps: Array.isArray(depUrl) ? depUrl : [depUrl], + }, + } as EnvironmentModuleNode +} + +describe('collectDevStyles', () => { + test('recognizes virtual Vue style blocks by URL', async () => { + const styleUrl = '/src/App.vue?vue&type=style&index=0&lang.css' + const entry = createEntryNode('/src/entry.tsx', styleUrl) + const vueStyle = createCssNode(styleUrl, '.vue-style {}') + vueStyle.file = '/app/src/App.vue' + const importedCss = createCssNode('/src/imported.css', '.imported {}') + vueStyle.transformResult!.deps = [importedCss.url] + vueStyle.importedModules.add(importedCss) + const modules = new Map( + [entry, vueStyle, importedCss].map((node) => [node.url, node]), + ) + const environment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url) => fetchCssFromModule(environment, url), + }) + + expect(css).toContain(`/* ${styleUrl} */`) + expect(css).toContain('.vue-style {}') + expect(css).not.toContain('/* /src/imported.css */') + }) + + test('does not traverse dependencies of CSS files', async () => { + const entry = createEntryNode('/src/entry.tsx', '/src/importer.css') + const importerCss = createCssNode( + '/src/importer.css', + '.dep-imported {}\n.module-imported {}\n.importer {}', + ) + const depImportedCss = createCssNode( + '/src/dep-imported.css', + '.dep-imported {}', + ) + const moduleImportedCss = createCssNode( + '/src/module-imported.css', + '.module-imported {}', + ) + importerCss.transformResult!.deps = [depImportedCss.url] + importerCss.importedModules.add(moduleImportedCss) + const modules = new Map( + [entry, importerCss, depImportedCss, moduleImportedCss].map((node) => [ + node.url, + node, + ]), + ) + const environment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url) => fetchCssFromModule(environment, url), + }) + + expect(css).toContain('/* /src/importer.css */') + expect(css).not.toContain('/* /src/dep-imported.css */') + expect(css).not.toContain('/* /src/module-imported.css */') + }) + + test('loads CSS modules from the client environment', async () => { + const serverEntry = createEntryNode( + '/src/entry.tsx', + '/src/route.module.css', + ) + const serverCssModule = createCssNode( + '/src/route.module.css', + '.server-transform {}', + ) + const clientCssModule = createCssNode( + '/src/route.module.css', + '.client-transform {}', + ) + const serverModules = new Map( + [serverEntry, serverCssModule].map((node) => [node.url, node]), + ) + const clientModules = new Map([[clientCssModule.url, clientCssModule]]) + const serverEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return serverModules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + const clientEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return clientModules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + + const css = await collectDevStyles({ + serverEnvironment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url) => fetchCssFromModule(clientEnvironment, url), + }) + + expect(css).toContain('.client-transform {}') + expect(css).not.toContain('.server-transform {}') + }) + + test('traverses code-split modules that are only in importedModules', async () => { + const entry = createEntryNode('/src/entry.tsx', []) + const splitModule = createEntryNode( + '/src/entry.tsx?tsr-split=component', + '/src/code-split.css', + ) + const splitCss = createCssNode('/src/code-split.css', '.code-split {}') + entry.importedModules.add(splitModule) + const modules = new Map( + [entry, splitModule, splitCss].map((node) => [node.url, node]), + ) + const environment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url) => fetchCssFromModule(environment, url), + }) + + expect(css).toContain('/* /src/code-split.css */') + expect(css?.match(/\.code-split \{\}/g)).toHaveLength(1) + }) + + test('preserves entry order when graph lookups finish out of order', async () => { + const rootEntry = createEntryNode('/src/root.tsx', '/src/root.css') + const routeEntry = createEntryNode('/src/route.tsx', '/src/route.css') + const rootCss = createCssNode('/src/root.css', '.root {}') + const routeCss = createCssNode('/src/route.css', '.route {}') + + const modules = new Map( + [rootEntry, routeEntry, rootCss, routeCss].map((node) => [ + node.url, + node, + ]), + ) + const moduleGraph = { + async getModuleByUrl(url: string) { + if (url === rootEntry.url) { + await new Promise((resolve) => setTimeout(resolve, 20)) + } + return modules.get(url) + }, + } + const environment = { + moduleGraph, + async transformRequest() { + return null + }, + } + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/root.tsx', '/app/src/route.tsx'], + loadCssContents: (url) => fetchCssFromModule(environment, url), + }) + + expect(css).toBeDefined() + expect(css!.indexOf('/* /src/root.css */')).toBeLessThan( + css!.indexOf('/* /src/route.css */'), + ) + }) + + test('preserves dependency order while resolving dependencies in parallel', async () => { + const entry = createEntryNode('/src/entry.tsx', [ + '/src/first.css', + '/src/second.css', + ]) + const firstCss = createCssNode('/src/first.css', '.first {}') + const secondCss = createCssNode('/src/second.css', '.second {}') + const modules = new Map( + [entry, firstCss, secondCss].map((node) => [node.url, node]), + ) + + let firstLookupFinished = false + let secondStartedBeforeFirstFinished = false + const moduleGraph = { + async getModuleByUrl(url: string) { + if (url === firstCss.url && !firstLookupFinished) { + await new Promise((resolve) => setTimeout(resolve, 20)) + firstLookupFinished = true + } + if (url === secondCss.url && !firstLookupFinished) { + secondStartedBeforeFirstFinished = true + } + return modules.get(url) + }, + } + const environment = { + moduleGraph, + async transformRequest() { + return null + }, + } + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url) => fetchCssFromModule(environment, url), + }) + + expect(secondStartedBeforeFirstFinished).toBe(true) + expect(css).toContain('/* /src/first.css */') + expect(css).toContain('/* /src/second.css */') + expect(css!.indexOf('/* /src/first.css */')).toBeLessThan( + css!.indexOf('/* /src/second.css */'), + ) + }) + + test('preserves CSS order while loading regular and module CSS in parallel', async () => { + const entry = createEntryNode('/src/entry.tsx', [ + '/src/root.css', + '/src/route.module.css', + ]) + const rootCss = createCssNode('/src/root.css', '') + const routeCss = createCssNode('/src/route.module.css', '') + const modules = new Map( + [entry, rootCss, routeCss].map((node) => [node.url, node]), + ) + const environment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + let rootFinished = false + let routeStartedBeforeRootFinished = false + + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: async (url) => { + if (url === rootCss.url) { + await new Promise((resolve) => setTimeout(resolve, 20)) + rootFinished = true + return '.root {}' + } + if (!rootFinished) { + routeStartedBeforeRootFinished = true + } + return '.route {}' + }, + }) + + expect(routeStartedBeforeRootFinished).toBe(true) + expect(css!.indexOf('/* /src/root.css */')).toBeLessThan( + css!.indexOf('/* /src/route.module.css */'), + ) + }) + + test('handles cycles and coalesces shared dependency lookups', async () => { + const firstEntry = createEntryNode('/src/first.tsx', [ + '/src/first.css', + 'external-package', + '/src/shared.css', + ]) + const secondEntry = createEntryNode('/src/second.tsx', [ + '/src/second.css', + 'external-package', + '/src/shared.css', + ]) + const firstCss = createCssNode('/src/first.css', '.first {}') + const secondCss = createCssNode('/src/second.css', '.second {}') + const sharedCss = createCssNode('/src/shared.css', '.shared {}') + firstEntry.importedModules.add(secondEntry) + secondEntry.importedModules.add(firstEntry) + const modules = new Map( + [firstEntry, secondEntry, firstCss, secondCss, sharedCss].map((node) => [ + node.url, + node, + ]), + ) + const lookupCounts = new Map() + const environment = { + moduleGraph: { + async getModuleByUrl(url: string) { + lookupCounts.set(url, (lookupCounts.get(url) ?? 0) + 1) + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + + const css = await collectDevStyles({ + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/first.tsx', '/app/src/second.tsx'], + loadCssContents: async (url) => `.${url.split('/').at(-1)} {}`, + }) + + expect(lookupCounts.get('external-package')).toBe(1) + expect(lookupCounts.get('/src/shared.css')).toBe(1) + expect(css?.match(/\/\* \/src\/shared\.css \*\//g)).toHaveLength(1) + expect(css!.indexOf('/* /src/first.css */')).toBeLessThan( + css!.indexOf('/* /src/shared.css */'), + ) + expect(css!.indexOf('/* /src/shared.css */')).toBeLessThan( + css!.indexOf('/* /src/second.css */'), + ) + }) + + test('refreshes the graph and client CSS after invalidation', async () => { + const entry = createEntryNode('/src/entry.tsx', '/src/old.css') + const oldServerCss = createCssNode('/src/old.css', '') + const newServerCss = createCssNode('/src/new.css', '') + const oldClientCss = createCssNode('/src/old.css', '.old {}') + const newClientCss = createCssNode('/src/new.css', '.new {}') + const newClientTransform = newClientCss.transformResult! + newClientCss.transformResult = null + + const serverModules = new Map( + [entry, oldServerCss, newServerCss].map((node) => [node.url, node]), + ) + const clientModules = new Map( + [oldClientCss, newClientCss].map((node) => [node.url, node]), + ) + const serverEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return serverModules.get(url) + }, + }, + async transformRequest(url: string) { + if (url === entry.url) { + entry.transformResult = { + code: '', + map: null, + deps: [newServerCss.url], + } + } + return entry.transformResult + }, + } + const clientEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return clientModules.get(url) + }, + }, + async transformRequest(url: string) { + if (url === newClientCss.url) { + newClientCss.transformResult = newClientTransform + return newClientTransform + } + return null + }, + } + const options = { + serverEnvironment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url: string) => + fetchCssFromModule(clientEnvironment, url), + } + + const initialCss = await collectDevStyles(options) + entry.transformResult = null + const invalidatedCss = await collectDevStyles(options) + + expect(initialCss).toContain('.old {}') + expect(invalidatedCss).toContain('.new {}') + expect(invalidatedCss).not.toContain('.old {}') + }) + + test('refreshes cached CSS when the same URL is invalidated', async () => { + const entry = createEntryNode('/src/entry.tsx', '/src/route.css') + const serverCss = createCssNode('/src/route.css', '') + const clientCss = createCssNode('/src/route.css', '.old {}') + const serverModules = new Map( + [entry, serverCss].map((node) => [node.url, node]), + ) + const clientModules = new Map([[clientCss.url, clientCss]]) + const newTransform = { + code: `const __vite__css = ${JSON.stringify('.new {}')}`, + map: null, + } + const serverEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return serverModules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + const clientEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return clientModules.get(url) + }, + }, + async transformRequest(url: string) { + if (url === clientCss.url) { + clientCss.transformResult = newTransform + return newTransform + } + return null + }, + } + const options = { + serverEnvironment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url: string) => + fetchCssFromModule(clientEnvironment, url), + } + + const initialCss = await collectDevStyles(options) + clientCss.transformResult = null + const invalidatedCss = await collectDevStyles(options) + + expect(initialCss).toContain('.old {}') + expect(invalidatedCss).toContain('.new {}') + expect(invalidatedCss).not.toContain('.old {}') + }) + + test('snapshots importedModules before awaiting dependency lookups', async () => { + const entry = createEntryNode('/src/entry.tsx', 'slow-dependency') + const initialCss = createCssNode('/src/initial.css', '.initial {}') + const lateCss = createCssNode('/src/late.css', '.late {}') + entry.importedModules.add(initialCss) + const modules = new Map( + [entry, initialCss, lateCss].map((node) => [node.url, node]), + ) + let notifyLookupStarted!: () => void + let finishLookup!: () => void + const lookupStarted = new Promise((resolve) => { + notifyLookupStarted = resolve + }) + const lookupCanFinish = new Promise((resolve) => { + finishLookup = resolve + }) + const environment = { + moduleGraph: { + async getModuleByUrl(url: string) { + if (url === 'slow-dependency') { + notifyLookupStarted() + await lookupCanFinish + } + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + const options = { + serverEnvironment: environment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url: string) => fetchCssFromModule(environment, url), + } + + const inFlightCollection = collectDevStyles(options) + await lookupStarted + entry.importedModules.add(lateCss) + finishLookup() + const inFlightCss = await inFlightCollection + const nextCss = await collectDevStyles(options) + + expect(inFlightCss).toContain('.initial {}') + expect(inFlightCss).not.toContain('.late {}') + expect(nextCss).toContain('.late {}') + }) + + test('keeps other styles when a CSS transform fails', async () => { + const entry = createEntryNode('/src/entry.tsx', [ + '/src/good.css', + '/src/partial.scss', + ]) + const goodServerCss = createCssNode('/src/good.css', '') + const partialServerCss = createCssNode('/src/partial.scss', '') + const goodClientCss = createCssNode('/src/good.css', '.good {}') + const partialClientCss = createCssNode('/src/partial.scss', '') + partialClientCss.transformResult = null + const serverModules = new Map( + [entry, goodServerCss, partialServerCss].map((node) => [node.url, node]), + ) + const clientModules = new Map( + [goodClientCss, partialClientCss].map((node) => [node.url, node]), + ) + const serverEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return serverModules.get(url) + }, + }, + async transformRequest() { + return null + }, + } + const clientEnvironment = { + moduleGraph: { + async getModuleByUrl(url: string) { + return clientModules.get(url) + }, + }, + async transformRequest(url: string) { + if (url === partialClientCss.url) { + throw new Error('Sass partial cannot compile in isolation') + } + return null + }, + } + + const css = await collectDevStyles({ + serverEnvironment, + rootDirectory: '/app', + entries: ['/app/src/entry.tsx'], + loadCssContents: (url) => fetchCssFromModule(clientEnvironment, url), + }) + + expect(css).toContain('.good {}') + expect(css).not.toContain('partial.scss') + }) + + test('does not traverse modules that exist only in the client graph', async () => { + const ssrRoot = createEntryNode('/src/root.tsx', '/src/root.css') + const ssrRootCss = createCssNode('/src/root.css', '') + const ssrModules = new Map( + [ssrRoot, ssrRootCss].map((node) => [node.url, node]), + ) + + const clientRoot = createEntryNode('/src/root.tsx', '/src/root.css') + const clientRootCss = createCssNode('/src/root.css', '.root {}') + const clientOnlyModule = createEntryNode( + '/src/client-only.ts', + '/src/client-only.css', + ) + const clientOnlyCss = createCssNode( + '/src/client-only.css', + '.client-only {}', + ) + clientRoot.importedModules.add(clientOnlyModule) + const clientModules = new Map( + [clientRoot, clientRootCss, clientOnlyModule, clientOnlyCss].map( + (node) => [node.url, node], + ), + ) + + const createEnvironment = ( + modules: Map, + ) => ({ + moduleGraph: { + async getModuleByUrl(url: string) { + return modules.get(url) + }, + }, + async transformRequest() { + return null + }, + }) + const clientEnvironment = createEnvironment(clientModules) + const ssrEnvironment = createEnvironment(ssrModules) + + const css = await collectDevStyles({ + serverEnvironment: ssrEnvironment, + rootDirectory: '/app', + entries: ['/app/src/root.tsx'], + loadCssContents: (url) => fetchCssFromModule(clientEnvironment, url), + }) + + expect(css).toContain('.root {}') + expect(css).not.toContain('.client-only {}') + }) +}) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3a44f02d76..15ee79ec63 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -91,7 +91,7 @@ overrides: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 eslint: ^9.22.0 - vite: ^8.0.14 + vite: ^8.3.4 '@types/node': 25.0.9 '@playwright/test': ^1.63.0 '@tanstack/query-core': ^5.102.0 @@ -200,8 +200,8 @@ importers: specifier: npm:typescript@5.9 version: typescript@5.9.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) benchmarks/bundle-size: dependencies: @@ -262,22 +262,22 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) benchmarks/client-nav: dependencies: @@ -311,7 +311,7 @@ importers: devDependencies: '@codspeed/vitest-plugin': specifier: ^5.7.1 - version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4) + version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vitest@4.1.4) '@platformatic/flame': specifier: ^1.6.0 version: 1.6.0 @@ -335,13 +335,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: ^29.1.1 version: 29.1.1(@noble/hashes@2.0.1) @@ -349,14 +349,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) benchmarks/memory/client: dependencies: @@ -387,7 +387,7 @@ importers: devDependencies: '@codspeed/vitest-plugin': specifier: ^5.7.1 - version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4) + version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vitest@4.1.4) '@datadog/pprof': specifier: ^5.13.2 version: 5.13.2 @@ -411,13 +411,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: 29.1.1 version: 29.1.1(@noble/hashes@2.0.1) @@ -425,14 +425,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) benchmarks/memory/server: dependencies: @@ -469,7 +469,7 @@ importers: devDependencies: '@codspeed/vitest-plugin': specifier: ^5.7.1 - version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4) + version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vitest@4.1.4) '@datadog/pprof': specifier: ^5.13.2 version: 5.13.2 @@ -484,10 +484,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: 29.1.1 version: 29.1.1(@noble/hashes@2.0.1) @@ -495,14 +495,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) benchmarks/ssr: dependencies: @@ -539,7 +539,7 @@ importers: devDependencies: '@codspeed/vitest-plugin': specifier: ^5.7.1 - version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4) + version: 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vitest@4.1.4) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -548,10 +548,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: 29.1.1 version: 29.1.1(@noble/hashes@2.0.1) @@ -562,14 +562,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/e2e-utils: devDependencies: @@ -583,14 +583,14 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/eslint-plugin-start: devDependencies: @@ -623,7 +623,7 @@ importers: version: 5.9.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/react-router/basepath-file-based: dependencies: @@ -657,16 +657,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -700,10 +700,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-esbuild-file-based: dependencies: @@ -749,7 +749,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -789,19 +789,19 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: ^1.1.11 version: 1.1.11 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-file-based-code-splitting: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -841,16 +841,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-react-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 version: 5.102.0(react@19.2.3) @@ -890,16 +890,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-react-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 version: 5.102.0(react@19.2.3) @@ -945,16 +945,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-scroll-restoration: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -991,19 +991,19 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: ~5.9.0 version: 5.9.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-virtual-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1046,16 +1046,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-virtual-named-export-config-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1098,10 +1098,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/escaped-special-strings: dependencies: @@ -1132,16 +1132,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/generator-cli-only: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1178,16 +1178,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/i18n-paraglide: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1227,13 +1227,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/issue-4759: dependencies: @@ -1261,10 +1261,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/issue-7120: dependencies: @@ -1295,10 +1295,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/issue-7457: dependencies: @@ -1332,16 +1332,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/js-only-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1378,10 +1378,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/match-params: dependencies: @@ -1408,8 +1408,8 @@ importers: specifier: ^19.2.3 version: 19.2.3(@types/react@19.2.9) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/react-compiler: dependencies: @@ -1431,7 +1431,7 @@ importers: version: 1.63.0 '@rolldown/plugin-babel': specifier: ^0.2.0 - version: 0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)) + version: 0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1443,13 +1443,13 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) babel-plugin-react-compiler: specifier: ^1.0.0 version: 1.0.0 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/rspack-basic-file-based: dependencies: @@ -1568,7 +1568,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1608,10 +1608,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/sentry-integration: dependencies: @@ -1626,7 +1626,7 @@ importers: version: 4.6.1(supports-color@10.2.2) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1660,16 +1660,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/view-transitions: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1712,13 +1712,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/basic: dependencies: @@ -1767,7 +1767,7 @@ importers: version: 4.2.2 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1788,7 +1788,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: ^1.1.11 version: 1.1.11 @@ -1802,8 +1802,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) zod: specifier: ^4.4.3 version: 4.4.3 @@ -1846,7 +1846,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1864,7 +1864,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) dotenv: specifier: ^17.2.3 version: 17.2.3 @@ -1878,8 +1878,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/basic-cloudflare: dependencies: @@ -1901,13 +1901,13 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 - version: 1.29.1(vite@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.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) + version: 1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1925,7 +1925,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -1933,8 +1933,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -1980,7 +1980,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1998,7 +1998,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -2009,8 +2009,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/basic-tsr-config: dependencies: @@ -2052,8 +2052,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/clerk-basic: dependencies: @@ -2087,7 +2087,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2105,7 +2105,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2113,8 +2113,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/csp: dependencies: @@ -2156,8 +2156,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/css-inline: dependencies: @@ -2206,13 +2206,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/css-modules: dependencies: @@ -2231,7 +2231,7 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 - version: 1.29.1(vite@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.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) + version: 1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) '@playwright/test': specifier: ^1.63.0 version: 1.63.0 @@ -2252,10 +2252,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta sass: specifier: ^1.97.2 version: 1.97.2 @@ -2266,8 +2266,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -2301,7 +2301,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2322,7 +2322,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) cross-env: specifier: ^10.0.0 version: 10.0.0 @@ -2339,8 +2339,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/custom-server-rsbuild: dependencies: @@ -2444,7 +2444,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.15 @@ -2452,8 +2452,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/dev-ssr-styles: dependencies: @@ -2493,10 +2493,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta srvx: specifier: ^0.11.9 version: 0.11.12 @@ -2504,8 +2504,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) zod: specifier: ^4.4.3 version: 4.4.3 @@ -2548,7 +2548,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) node-forge: specifier: ^1.3.1 version: 1.3.1 @@ -2562,8 +2562,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/flamegraph-bench: dependencies: @@ -2591,7 +2591,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) autocannon: specifier: ^8.0.0 version: 8.0.0 @@ -2599,14 +2599,14 @@ importers: specifier: 9.2.1 version: 9.2.1 nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/hmr: dependencies: @@ -2637,7 +2637,7 @@ importers: version: 4.2.2 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2655,7 +2655,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2663,8 +2663,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/i18n-paraglide: dependencies: @@ -2692,7 +2692,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2710,7 +2710,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2718,8 +2718,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/import-protection: dependencies: @@ -2765,7 +2765,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -2773,8 +2773,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/import-protection-custom-config: dependencies: @@ -2811,7 +2811,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -2819,8 +2819,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/issue-8049: dependencies: @@ -2851,10 +2851,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/query-integration: dependencies: @@ -2894,7 +2894,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2912,7 +2912,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2920,8 +2920,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/root-document-hydration: dependencies: @@ -2958,7 +2958,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -2966,8 +2966,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/rsbuild: dependencies: @@ -3059,10 +3059,10 @@ importers: version: 8.44.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@5.9.2) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-rsc': specifier: ^0.5.30 - version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@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.9.0)) + version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint: specifier: ^9.22.0 version: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) @@ -3073,8 +3073,8 @@ importers: specifier: ^5.7.2 version: 5.9.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/rsc-deferred-hydration: dependencies: @@ -3111,10 +3111,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-rsc': specifier: ^0.5.30 - version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@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.9.0)) + version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.15 @@ -3122,8 +3122,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/rsc-query: dependencies: @@ -3169,10 +3169,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-rsc': specifier: ^0.5.30 - version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@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.9.0)) + version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.10.0 version: 0.10.0 @@ -3180,8 +3180,8 @@ importers: specifier: ^5.7.2 version: 5.9.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/rsc-rsbuild: dependencies: @@ -3258,7 +3258,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3276,7 +3276,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: ^1.1.11 version: 1.1.11 @@ -3290,8 +3290,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/selective-ssr: dependencies: @@ -3316,7 +3316,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3334,7 +3334,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -3345,8 +3345,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/serialization-adapters: dependencies: @@ -3371,7 +3371,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3389,7 +3389,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -3400,8 +3400,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/server-functions: dependencies: @@ -3453,7 +3453,7 @@ importers: version: 4.2.2 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3474,7 +3474,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: ^1.1.11 version: 1.1.11 @@ -3488,8 +3488,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/server-functions-global-middleware: dependencies: @@ -3511,7 +3511,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3529,7 +3529,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -3540,8 +3540,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/server-routes: dependencies: @@ -3584,7 +3584,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3605,7 +3605,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: ^1.1.11 version: 1.1.11 @@ -3619,8 +3619,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/server-routes-global-middleware: dependencies: @@ -3642,7 +3642,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3660,7 +3660,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -3671,8 +3671,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/spa-mode: dependencies: @@ -3694,7 +3694,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3717,8 +3717,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/split-base-and-basepath: dependencies: @@ -3758,7 +3758,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -3766,8 +3766,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/start-manifest: dependencies: @@ -3804,16 +3804,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/static-server-functions: dependencies: @@ -3827,8 +3827,8 @@ importers: specifier: workspace:* version: link:../../../packages/start-static-server-functions nitro: - specifier: ^3.0.1-alpha.2 - version: 3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta react: specifier: ^19.2.3 version: 19.2.3 @@ -3856,13 +3856,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/streaming-ssr: dependencies: @@ -3905,7 +3905,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -3913,8 +3913,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/transform-asset-urls: dependencies: @@ -3954,7 +3954,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -3962,8 +3962,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/virtual-routes: dependencies: @@ -4000,7 +4000,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4018,7 +4018,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: ^1.1.11 version: 1.1.11 @@ -4032,8 +4032,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/website: dependencies: @@ -4067,7 +4067,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4085,7 +4085,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -4096,8 +4096,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/solid-router/basepath-file-based: dependencies: @@ -4121,17 +4121,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4155,11 +4155,11 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-esbuild-file-based: dependencies: @@ -4199,7 +4199,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4232,17 +4232,17 @@ importers: specifier: ^1.1.11 version: 1.1.11 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-file-based-code-splitting: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4272,17 +4272,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-scroll-restoration: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4312,17 +4312,17 @@ importers: specifier: ~5.9.0 version: 5.9.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-solid-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -4352,17 +4352,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-solid-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4398,17 +4398,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-virtual-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4441,17 +4441,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/basic-virtual-named-export-config-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4484,17 +4484,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/generator-cli-only: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-cli': specifier: workspace:* version: link:../../../packages/router-cli @@ -4521,17 +4521,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/js-only-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4558,11 +4558,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/rspack-basic-file-based: dependencies: @@ -4669,7 +4669,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4699,11 +4699,11 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/sentry-integration: dependencies: @@ -4718,7 +4718,7 @@ importers: version: 4.6.1(supports-color@7.2.0) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4742,17 +4742,17 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-router/view-transitions: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4788,11 +4788,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/basic: dependencies: @@ -4844,7 +4844,7 @@ importers: version: 4.2.2 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4870,11 +4870,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/basic-auth: dependencies: @@ -4911,7 +4911,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4937,11 +4937,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/basic-cloudflare: dependencies: @@ -4960,13 +4960,13 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 - version: 1.29.1(vite@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.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) + version: 1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4983,11 +4983,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -5030,7 +5030,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5050,11 +5050,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/basic-tsr-config: dependencies: @@ -5090,11 +5090,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/csp: dependencies: @@ -5127,11 +5127,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/css-modules: dependencies: @@ -5167,11 +5167,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/custom-basepath: dependencies: @@ -5199,7 +5199,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5228,11 +5228,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/deferred-hydration: dependencies: @@ -5271,11 +5271,51 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + + e2e/solid-start/dev-ssr-styles: + dependencies: + '@tanstack/solid-router': + specifier: workspace:* + version: link:../../../packages/solid-router + '@tanstack/solid-start': + specifier: workspace:* + version: link:../../../packages/solid-start + solid-js: + specifier: 1.9.12 + version: 1.9.12 + devDependencies: + '@playwright/test': + specifier: ^1.63.0 + version: 1.63.0 + '@tanstack/router-core': + specifier: workspace:* + version: link:../../../packages/router-core + '@tanstack/router-e2e-utils': + specifier: workspace:* + version: link:../../e2e-utils + '@types/node': + specifier: 25.0.9 + version: 25.0.9 + '@typescript/native': + specifier: npm:typescript@^7.0.2 + version: typescript@7.0.2 + srvx: + specifier: ^0.11.9 + version: 0.11.15 + typescript: + specifier: npm:@typescript/typescript6@^6.0.2 + version: '@typescript/typescript6@6.0.2' + vite: + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite-plugin-solid: + specifier: ^2.11.11 + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/query-integration: dependencies: @@ -5312,7 +5352,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5329,11 +5369,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/scroll-restoration: dependencies: @@ -5364,7 +5404,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5387,11 +5427,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/selective-ssr: dependencies: @@ -5410,7 +5450,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5427,11 +5467,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/serialization-adapters: dependencies: @@ -5453,7 +5493,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5473,11 +5513,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/server-functions: dependencies: @@ -5517,7 +5557,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5543,11 +5583,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/server-routes: dependencies: @@ -5587,7 +5627,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5613,11 +5653,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/solid-query-layout-suspense: dependencies: @@ -5650,11 +5690,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/spa-mode: dependencies: @@ -5676,7 +5716,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5690,11 +5730,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/start-manifest: dependencies: @@ -5727,11 +5767,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/streaming-ssr: dependencies: @@ -5770,11 +5810,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/virtual-routes: dependencies: @@ -5808,7 +5848,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5831,11 +5871,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/solid-start/website: dependencies: @@ -5866,7 +5906,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5886,17 +5926,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) e2e/vue-router/basepath-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -5930,16 +5970,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -5948,7 +5988,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -5973,13 +6013,13 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6049,7 +6089,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6089,10 +6129,10 @@ importers: version: 8.44.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@5.8.3) '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) eslint-plugin-vue: specifier: ^9.33.0 version: 9.33.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -6100,8 +6140,8 @@ importers: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-eslint-parser: specifier: ^9.4.3 version: 9.4.3(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -6113,7 +6153,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6144,16 +6184,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6162,7 +6202,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6190,16 +6230,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.9.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.9.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.9.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.9.3)) typescript: specifier: ~5.9.0 version: 5.9.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.9.3) @@ -6208,7 +6248,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6245,16 +6285,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6263,7 +6303,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6300,16 +6340,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6318,7 +6358,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/vue-query': specifier: ^5.102.0 version: 5.102.0(vue@3.5.25(typescript@5.8.3)) @@ -6349,16 +6389,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6367,7 +6407,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6404,16 +6444,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6422,7 +6462,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-cli': specifier: workspace:* version: link:../../../packages/router-cli @@ -6450,16 +6490,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6468,7 +6508,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6502,13 +6542,13 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@7.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@7.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@7.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@7.0.2)) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-router/rspack-basic-file-based: dependencies: @@ -6630,7 +6670,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6661,16 +6701,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6688,7 +6728,7 @@ importers: version: 10.32.0(@tanstack/vue-router@packages+vue-router)(vue@3.5.25(typescript@5.8.3)) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6713,13 +6753,13 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6728,7 +6768,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6762,16 +6802,16 @@ importers: version: link:../../e2e-utils '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6829,7 +6869,7 @@ importers: version: 4.2.2 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6844,10 +6884,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) combinate: specifier: ^1.1.11 version: 1.1.11 @@ -6861,8 +6901,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/basic-auth: dependencies: @@ -6899,7 +6939,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6911,10 +6951,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) dotenv: specifier: ^17.2.3 version: 17.2.3 @@ -6931,8 +6971,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/basic-cloudflare: dependencies: @@ -6951,13 +6991,13 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 - version: 1.29.1(vite@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.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) + version: 1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) '@playwright/test': specifier: ^1.63.0 version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6969,10 +7009,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -6980,8 +7020,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -7012,10 +7052,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) rimraf: specifier: 'catalog:' version: 6.1.2 @@ -7026,8 +7066,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/basic-vue-query: dependencies: @@ -7067,7 +7107,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7079,10 +7119,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -7093,8 +7133,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/css-modules: dependencies: @@ -7122,7 +7162,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) sass: specifier: ^1.97.2 version: 1.97.2 @@ -7133,8 +7173,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/custom-basepath: dependencies: @@ -7162,7 +7202,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7177,10 +7217,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) cross-env: specifier: ^10.0.0 version: 10.0.0 @@ -7197,8 +7237,51 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + + e2e/vue-start/dev-ssr-styles: + dependencies: + '@tanstack/vue-router': + specifier: workspace:* + version: link:../../../packages/vue-router + '@tanstack/vue-start': + specifier: workspace:* + version: link:../../../packages/vue-start + vue: + specifier: ^3.5.16 + version: 3.5.25(@typescript/typescript6@6.0.2) + devDependencies: + '@playwright/test': + specifier: ^1.63.0 + version: 1.63.0 + '@tanstack/router-core': + specifier: workspace:* + version: link:../../../packages/router-core + '@tanstack/router-e2e-utils': + specifier: workspace:* + version: link:../../e2e-utils + '@types/node': + specifier: 25.0.9 + version: 25.0.9 + '@typescript/native': + specifier: npm:typescript@^7.0.2 + version: typescript@7.0.2 + '@vitejs/plugin-vue': + specifier: ^6.0.5 + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + '@vitejs/plugin-vue-jsx': + specifier: ^5.1.5 + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + srvx: + specifier: ^0.11.9 + version: 0.11.15 + typescript: + specifier: npm:@typescript/typescript6@^6.0.2 + version: '@typescript/typescript6@6.0.2' + vite: + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/query-integration: dependencies: @@ -7235,7 +7318,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7247,10 +7330,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7258,8 +7341,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/scroll-restoration: dependencies: @@ -7290,7 +7373,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7302,10 +7385,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) combinate: specifier: ^1.1.11 version: 1.1.11 @@ -7319,8 +7402,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/selective-ssr: dependencies: @@ -7339,7 +7422,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7348,10 +7431,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -7362,8 +7445,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(@typescript/typescript6@6.0.2) @@ -7388,7 +7471,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7397,10 +7480,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -7411,8 +7494,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(@typescript/typescript6@6.0.2) @@ -7455,7 +7538,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7470,10 +7553,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) combinate: specifier: ^1.1.11 version: 1.1.11 @@ -7487,8 +7570,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/server-routes: dependencies: @@ -7528,7 +7611,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7543,10 +7626,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) combinate: specifier: ^1.1.11 version: 1.1.11 @@ -7560,8 +7643,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/spa-mode: dependencies: @@ -7583,7 +7666,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7592,10 +7675,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7603,8 +7686,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/start-manifest: dependencies: @@ -7632,7 +7715,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) srvx: specifier: ^0.11.9 version: 0.11.15 @@ -7640,8 +7723,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/streaming-ssr: dependencies: @@ -7675,7 +7758,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) srvx: specifier: ^0.11.9 version: 0.11.15 @@ -7683,8 +7766,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/virtual-routes: dependencies: @@ -7718,7 +7801,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7730,10 +7813,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) combinate: specifier: ^1.1.11 version: 1.1.11 @@ -7747,8 +7830,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/website: dependencies: @@ -7779,7 +7862,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7791,10 +7874,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) srvx: specifier: ^0.11.9 version: 0.11.12 @@ -7805,14 +7888,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/authenticated-routes: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7849,19 +7932,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/authenticated-routes-firebase: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7904,19 +7987,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7947,19 +8030,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-default-search-params: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 version: 5.102.0(react@19.2.3) @@ -7996,19 +8079,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-devtools-panel: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 version: 5.102.0(react@19.2.3) @@ -8045,19 +8128,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8094,19 +8177,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-non-nested-devtools: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8137,19 +8220,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-react-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 version: 5.102.0(react@19.2.3) @@ -8186,19 +8269,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-react-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 version: 5.102.0(react@19.2.3) @@ -8241,13 +8324,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-ssr-file-based: dependencies: @@ -8293,13 +8376,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-ssr-streaming-file-based: dependencies: @@ -8345,19 +8428,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-virtual-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8397,19 +8480,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-virtual-inside-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8449,19 +8532,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/deferred-data: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8495,19 +8578,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/i18n-paraglide: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8541,19 +8624,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/kitchen-sink: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8590,19 +8673,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/kitchen-sink-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8642,19 +8725,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/kitchen-sink-react-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 version: 5.102.0(react@19.2.3) @@ -8697,19 +8780,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/kitchen-sink-react-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 version: 5.102.0(react@19.2.3) @@ -8755,19 +8838,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/large-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 version: 5.102.0(react@19.2.3) @@ -8807,13 +8890,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/location-masking: dependencies: @@ -8822,7 +8905,7 @@ importers: version: 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 version: 5.102.0(react@19.2.3) @@ -8856,19 +8939,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/navigation-blocking: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 version: 5.102.0(react@19.2.3) @@ -8902,19 +8985,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/quickstart: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8942,13 +9025,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/quickstart-esbuild-file-based: dependencies: @@ -8988,7 +9071,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9025,13 +9108,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/quickstart-rspack-file-based: dependencies: @@ -9172,16 +9255,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-react-query/packages/app: dependencies: @@ -9203,7 +9286,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router-devtools': specifier: workspace:^ version: link:../../../../../packages/react-router-devtools @@ -9218,7 +9301,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9226,11 +9309,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-react-query/packages/post-feature: dependencies: @@ -9261,16 +9344,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-react-query/packages/post-query: dependencies: @@ -9289,13 +9372,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/router-monorepo-react-query/packages/router: dependencies: @@ -9338,16 +9421,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple: dependencies: @@ -9384,16 +9467,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple-lazy: dependencies: @@ -9430,16 +9513,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple-lazy/packages/app: dependencies: @@ -9458,7 +9541,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router-devtools': specifier: workspace:^ version: link:../../../../../packages/react-router-devtools @@ -9473,7 +9556,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9481,11 +9564,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple-lazy/packages/post-feature: dependencies: @@ -9513,16 +9596,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple-lazy/packages/router: dependencies: @@ -9559,16 +9642,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple/packages/app: dependencies: @@ -9587,7 +9670,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router-devtools': specifier: workspace:^ version: link:../../../../../packages/react-router-devtools @@ -9602,7 +9685,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9610,11 +9693,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple/packages/post-feature: dependencies: @@ -9639,16 +9722,16 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple/packages/router: dependencies: @@ -9685,22 +9768,22 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/scroll-restoration: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9731,19 +9814,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/search-validator-adapters: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/arktype-adapter': specifier: workspace:* version: link:../../../packages/arktype-adapter @@ -9801,7 +9884,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) jsdom: specifier: ^27.0.0 version: 27.0.0(supports-color@10.2.2) @@ -9809,11 +9892,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: ^4.1.4 - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/react/start-bare: dependencies: @@ -9850,13 +9933,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic: dependencies: @@ -9884,7 +9967,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -9899,10 +9982,10 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9910,8 +9993,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic-auth: dependencies: @@ -9948,7 +10031,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -9963,7 +10046,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) dotenv: specifier: ^17.2.3 version: 17.2.3 @@ -9977,8 +10060,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic-authjs: dependencies: @@ -10009,7 +10092,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10024,7 +10107,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10032,8 +10115,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic-cloudflare: dependencies: @@ -10055,10 +10138,10 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 - version: 1.29.1(vite@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.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) + version: 1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10073,7 +10156,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10081,8 +10164,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -10125,7 +10208,7 @@ importers: version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10140,7 +10223,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10148,8 +10231,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic-rsbuild: dependencies: @@ -10222,7 +10305,7 @@ importers: version: link:../../../packages/start-static-server-functions '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) react: specifier: ^19.2.3 version: 19.2.3 @@ -10238,7 +10321,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10258,14 +10341,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-bun: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-devtools': specifier: ^0.7.0 version: 0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) @@ -10320,7 +10403,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) jsdom: specifier: ^27.0.0 version: 27.0.0(supports-color@10.2.2) @@ -10331,11 +10414,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: ^4.1.4 - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) web-vitals: specifier: ^5.1.0 version: 5.1.0 @@ -10356,7 +10439,7 @@ importers: version: link:../../../packages/react-start '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) react: specifier: ^19.2.3 version: 19.2.3 @@ -10375,7 +10458,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10395,8 +10478,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-convex-trellaux: dependencies: @@ -10454,7 +10537,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10469,7 +10552,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10477,8 +10560,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-counter: dependencies: @@ -10512,13 +10595,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-i18n-paraglide: dependencies: @@ -10546,7 +10629,7 @@ importers: version: 2.4.0(babel-plugin-macros@3.1.0) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10561,7 +10644,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10569,8 +10652,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-large: dependencies: @@ -10604,7 +10687,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10619,7 +10702,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10627,8 +10710,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-material-ui: dependencies: @@ -10680,13 +10763,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-next-migration: dependencies: @@ -10723,16 +10806,16 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - specifier: ^8.0.14 - version: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-rscs: dependencies: @@ -10766,7 +10849,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.1.18 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10778,13 +10861,13 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-rsc': specifier: ^0.5.30 - version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@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.9.0)) + version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta tailwindcss: specifier: ^4.1.18 version: 4.2.2 @@ -10792,8 +10875,8 @@ importers: specifier: ^5.7.2 version: 5.9.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-streaming-data-from-server-functions: dependencies: @@ -10830,13 +10913,13 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-supabase-basic: dependencies: @@ -10867,7 +10950,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -10879,7 +10962,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10887,8 +10970,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-tailwind-v4: dependencies: @@ -10916,7 +10999,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10931,7 +11014,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10939,8 +11022,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-trellaux: dependencies: @@ -10989,7 +11072,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -11004,7 +11087,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -11012,8 +11095,8 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-workos: dependencies: @@ -11050,19 +11133,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/view-transitions: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11099,19 +11182,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/with-framer-motion: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11148,19 +11231,19 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/with-trpc: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11206,19 +11289,19 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tsx: specifier: ^4.20.3 version: 4.20.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/react/with-trpc-react-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/react-query': specifier: ^5.102.0 version: 5.102.0(react@19.2.3) @@ -11273,19 +11356,19 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) tsx: specifier: ^4.20.3 version: 4.20.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) examples/solid/authenticated-routes: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -11315,17 +11398,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/authenticated-routes-firebase: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -11361,17 +11444,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -11401,17 +11484,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-default-search-params: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -11441,17 +11524,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-devtools-panel: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -11475,17 +11558,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -11515,17 +11598,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-non-nested-devtools: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -11555,17 +11638,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-solid-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -11598,17 +11681,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-solid-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -11644,11 +11727,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-ssr-file-based: dependencies: @@ -11687,17 +11770,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-ssr-streaming-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -11742,17 +11825,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-virtual-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -11785,17 +11868,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/basic-virtual-inside-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -11828,17 +11911,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/deferred-data: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -11865,17 +11948,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/i18n-paraglide: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -11902,17 +11985,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/kitchen-sink: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -11942,17 +12025,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/kitchen-sink-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -11985,17 +12068,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/kitchen-sink-solid-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -12031,17 +12114,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/kitchen-sink-solid-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -12080,17 +12163,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/large-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -12123,17 +12206,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/location-masking: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -12160,17 +12243,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/navigation-blocking: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -12197,17 +12280,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/quickstart: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -12228,11 +12311,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/quickstart-esbuild-file-based: dependencies: @@ -12269,7 +12352,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -12299,11 +12382,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/quickstart-rspack-file-based: dependencies: @@ -12434,14 +12517,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/router-monorepo-simple-lazy: dependencies: @@ -12471,14 +12554,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/router-monorepo-solid-query: dependencies: @@ -12514,20 +12597,20 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-dts: specifier: 4.2.3 - version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/scroll-restoration: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -12551,17 +12634,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/search-validator-adapters: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/arktype-adapter': specifier: workspace:* version: link:../../../packages/arktype-adapter @@ -12615,14 +12698,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: ^4.1.4 - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic: dependencies: @@ -12647,7 +12730,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12655,8 +12738,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -12664,11 +12747,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic-auth: dependencies: @@ -12702,7 +12785,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12722,11 +12805,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic-authjs: dependencies: @@ -12754,7 +12837,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12768,11 +12851,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic-cloudflare: dependencies: @@ -12791,10 +12874,10 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 - version: 1.29.1(vite@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.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) + version: 1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12808,11 +12891,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -12834,10 +12917,10 @@ importers: devDependencies: '@netlify/vite-plugin-tanstack-start': specifier: ^1.3.19 - version: 1.3.19(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 1.3.19(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12851,11 +12934,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic-nitro: dependencies: @@ -12874,7 +12957,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12882,8 +12965,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 nitro: - specifier: ^3.0.260311-beta - version: 3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)) + specifier: ^3.0.260903-beta + version: 3.0.260903-beta tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -12891,11 +12974,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic-solid-query: dependencies: @@ -12929,7 +13012,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12943,11 +13026,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-basic-static: dependencies: @@ -12975,7 +13058,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -12989,17 +13072,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-bun: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -13053,14 +13136,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: ^4.1.4 - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) web-vitals: specifier: ^5.1.0 version: 5.1.0 @@ -13072,7 +13155,7 @@ importers: version: 0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@opentelemetry/api@1.9.1)(@prisma/client@7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)))(@tanstack/solid-start@packages+solid-start)(mysql2@3.15.3)(next@16.3.4(@babel/core@7.29.7(supports-color@10.2.2))(@opentelemetry/api@1.9.1)(@playwright/test@1.63.0)(@types/node@25.0.9)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(sass@1.97.2))(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vitest@4.1.4)(vue@3.5.25(@typescript/typescript6@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -13123,11 +13206,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-counter: dependencies: @@ -13166,11 +13249,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-i18n-paraglide: dependencies: @@ -13195,7 +13278,7 @@ importers: version: 2.4.0(babel-plugin-macros@3.1.0) '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13209,11 +13292,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-large: dependencies: @@ -13244,7 +13327,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13258,11 +13341,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-streaming-data-from-server-functions: dependencies: @@ -13292,11 +13375,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-supabase-basic: dependencies: @@ -13324,7 +13407,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13338,11 +13421,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-tailwind-v4: dependencies: @@ -13367,7 +13450,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13381,17 +13464,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/view-transitions: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -13421,17 +13504,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/with-framer-motion: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': specifier: ^1.170.38 version: link:../../../packages/solid-router @@ -13461,17 +13544,17 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/with-trpc: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -13510,11 +13593,11 @@ importers: specifier: ^4.20.3 version: 4.20.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) examples/vue/basic: dependencies: @@ -13536,22 +13619,22 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@typescript/native': specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) typescript: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(@typescript/typescript6@6.0.2) @@ -13560,7 +13643,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -13594,10 +13677,10 @@ importers: version: 8.44.1(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@5.8.3) '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) eslint-plugin-vue: specifier: ^9.33.0 version: 9.33.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -13605,8 +13688,8 @@ importers: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-eslint-parser: specifier: ^9.4.3 version: 9.4.3(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -13618,7 +13701,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@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.9.0)) + version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -13643,16 +13726,16 @@ importers: devDependencies: '@vitejs/plugin-vue': specifier: ^6.0.5 - version: 6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) '@vitejs/plugin-vue-jsx': specifier: ^5.1.5 - version: 5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3)) + version: 5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3)) typescript: specifier: ~5.8.3 version: 5.8.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -13667,7 +13750,7 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -13699,11 +13782,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/eslint-plugin-router: dependencies: @@ -13716,7 +13799,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@typescript-eslint/rule-tester': specifier: ^8.23.0 version: 8.23.0(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -13733,11 +13816,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/eslint-plugin-start: dependencies: @@ -13753,7 +13836,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@typescript-eslint/rule-tester': specifier: ^8.44.1 version: 8.53.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@5.9.2) @@ -13771,7 +13854,7 @@ importers: version: 5.9.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/history: devDependencies: @@ -13780,7 +13863,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -13791,30 +13874,30 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/nitro-v2-vite-plugin: dependencies: nitropack: specifier: ^2.13.4 - version: 2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.2.7(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@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.9.0))(webpack@5.110.3) + version: 2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.2.7(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.2.13)(srvx@0.11.22)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3) pathe: specifier: 'catalog:' version: 2.0.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) devDependencies: '@arethetypeswrong/cli': specifier: 'catalog:' version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) publint: specifier: 'catalog:' version: 0.3.17 @@ -13823,7 +13906,7 @@ importers: version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-router: dependencies: @@ -13851,7 +13934,7 @@ importers: version: 5.102.0(react@19.2.3) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -13869,7 +13952,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@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.9.0)) + version: 4.7.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) combinate: specifier: 'catalog:' version: 1.1.11 @@ -13892,11 +13975,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) zod: specifier: 'catalog:' version: 4.5.4 @@ -13921,7 +14004,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13933,7 +14016,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@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.9.0)) + version: 4.7.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -13953,11 +14036,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-router-ssr-query: dependencies: @@ -13982,7 +14065,7 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -13991,7 +14074,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@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.9.0)) + version: 4.7.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14011,11 +14094,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-start: dependencies: @@ -14047,8 +14130,8 @@ importers: specifier: 'catalog:' version: 2.0.3 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) devDependencies: '@arethetypeswrong/cli': specifier: 'catalog:' @@ -14061,7 +14144,7 @@ importers: version: 2.2.5 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14091,7 +14174,7 @@ importers: version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-start-client: dependencies: @@ -14113,7 +14196,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/react': specifier: 'catalog:' version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) @@ -14128,7 +14211,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@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.9.0)) + version: 4.7.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14148,11 +14231,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-start-rsc: dependencies: @@ -14192,7 +14275,7 @@ importers: version: 2.2.7(@swc/helpers@0.5.23) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/react': specifier: 'catalog:' version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) @@ -14204,10 +14287,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.7.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-rsc': specifier: ^0.5.30 - version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14231,7 +14314,7 @@ importers: version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/react-start-server: dependencies: @@ -14253,7 +14336,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -14265,7 +14348,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@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.9.0)) + version: 4.7.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14288,11 +14371,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-cli: dependencies: @@ -14311,7 +14394,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14325,11 +14408,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-core: dependencies: @@ -14354,7 +14437,7 @@ importers: version: 0.11.2 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14371,11 +14454,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-devtools: dependencies: @@ -14397,7 +14480,7 @@ importers: version: 1.26.2(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(ts-api-utils@2.4.0(@typescript/typescript6@6.0.2)) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -14406,7 +14489,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.7.0(supports-color@10.2.2)(vite@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.9.0)) + version: 4.7.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14423,11 +14506,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-devtools-core: dependencies: @@ -14449,7 +14532,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -14466,14 +14549,14 @@ importers: specifier: 1.9.12 version: 1.9.12 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: 'catalog:' - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-generator: dependencies: @@ -14510,7 +14593,7 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14527,11 +14610,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-plugin: dependencies: @@ -14561,13 +14644,13 @@ importers: version: 5.0.0 unplugin: specifier: ^3.3.0 - version: 3.3.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) + version: 3.3.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.2.13)(rollup@4.63.1)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: ^2.11.10 || ^3.0.0-0 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) zod: specifier: 'catalog:' version: 4.5.4 @@ -14580,7 +14663,7 @@ importers: version: 2.2.5 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/babel__core': specifier: ^7.20.5 version: 7.20.5 @@ -14613,10 +14696,10 @@ importers: version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) webpack: specifier: ^5.104.1 - version: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + version: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) packages/router-ssr-query-core: devDependencies: @@ -14631,7 +14714,7 @@ importers: version: link:../router-core '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -14642,11 +14725,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-utils: dependencies: @@ -14680,7 +14763,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/babel__generator': specifier: ^7.27.0 version: 7.27.0 @@ -14694,11 +14777,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/router-vite-plugin: dependencies: @@ -14711,7 +14794,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) publint: specifier: 'catalog:' version: 0.3.17 @@ -14719,11 +14802,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/solid-router: dependencies: @@ -14751,7 +14834,7 @@ importers: version: 0.8.10(solid-js@1.9.12) '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -14774,14 +14857,14 @@ importers: specifier: 1.9.12 version: 1.9.12 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: 'catalog:' - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) zod: specifier: 'catalog:' version: 4.5.4 @@ -14803,7 +14886,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14817,14 +14900,14 @@ importers: specifier: 1.9.12 version: 1.9.12 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: 'catalog:' - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/solid-router-ssr-query: dependencies: @@ -14846,7 +14929,7 @@ importers: version: link:../solid-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) eslint-plugin-solid: specifier: ^0.14.5 version: 0.14.5(@typescript/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) @@ -14863,14 +14946,14 @@ importers: specifier: 1.9.12 version: 1.9.12 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: 'catalog:' - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/solid-start: dependencies: @@ -14913,7 +14996,7 @@ importers: version: link:../router-utils '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14930,11 +15013,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/solid-start-client: dependencies: @@ -14956,7 +15039,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -14970,14 +15053,14 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: 'catalog:' - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/solid-start-server: dependencies: @@ -14996,7 +15079,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@typescript/native': specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 @@ -15016,14 +15099,14 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vite-plugin-solid: specifier: 'catalog:' - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/start-client-core: dependencies: @@ -15045,7 +15128,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15059,11 +15142,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/start-fn-stubs: devDependencies: @@ -15072,7 +15155,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) publint: specifier: 'catalog:' version: 0.3.17 @@ -15080,11 +15163,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/start-plugin-core: dependencies: @@ -15144,7 +15227,7 @@ importers: version: 1.6.4 vitefu: specifier: ^1.1.3 - version: 1.1.3(vite@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.9.0)) + version: 1.1.3(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) xmlbuilder2: specifier: ^4.0.3 version: 4.0.3 @@ -15160,7 +15243,7 @@ importers: version: 2.2.5 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/babel__code-frame': specifier: ^7.0.6 version: 7.0.6 @@ -15180,11 +15263,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/start-server-core: dependencies: @@ -15205,7 +15288,7 @@ importers: version: 0.1.7 h3-v2: specifier: npm:h3@2.0.1-rc.20 - version: h3@2.0.1-rc.20(crossws@0.4.12(srvx@0.11.22)) + version: h3@2.0.1-rc.20(crossws@0.4.12(srvx@1.0.5)) seroval: specifier: ^1.6.7 version: 1.6.7 @@ -15218,7 +15301,7 @@ importers: version: 1.0.0 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15235,11 +15318,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/start-static-server-functions: dependencies: @@ -15261,7 +15344,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15275,11 +15358,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/start-storage-context: dependencies: @@ -15292,7 +15375,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15306,11 +15389,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/valibot-adapter: devDependencies: @@ -15322,7 +15405,7 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -15354,11 +15437,11 @@ importers: specifier: 1.0.0-beta.15 version: 1.0.0-beta.15(typescript@7.0.2) vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/virtual-file-routes: devDependencies: @@ -15367,7 +15450,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15378,11 +15461,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) packages/vue-router: dependencies: @@ -15407,7 +15490,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -15419,7 +15502,7 @@ importers: version: 25.0.9 '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.2.0(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vitest/ui': specifier: 'catalog:' version: 4.1.4(vitest@4.1.4) @@ -15436,11 +15519,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15460,21 +15543,21 @@ importers: specifier: workspace:* version: link:../vue-router vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) devDependencies: '@arethetypeswrong/cli': specifier: 'catalog:' version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.2.0(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) publint: specifier: 'catalog:' version: 0.3.17 @@ -15483,7 +15566,7 @@ importers: version: 6.1.2 vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15505,13 +15588,13 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/vue-router': specifier: workspace:* version: link:../vue-router '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.2.0(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) publint: specifier: 'catalog:' version: 0.3.17 @@ -15519,11 +15602,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15563,13 +15646,13 @@ importers: version: link:../router-utils '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.2.0(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15580,11 +15663,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15606,10 +15689,10 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.2.0(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15620,11 +15703,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15646,13 +15729,13 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@typescript/native': specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.2.0(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) + version: 4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15666,11 +15749,11 @@ importers: specifier: npm:@typescript/typescript6@^6.0.2 version: '@typescript/typescript6@6.0.2' vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15685,7 +15768,7 @@ importers: version: link:../react-router '@tanstack/vite-config': specifier: 'catalog:' - version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) + version: 0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@testing-library/jest-dom': specifier: 'catalog:' version: 6.6.3 @@ -15714,11 +15797,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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.9.0) + specifier: ^8.3.4 + version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) zod: specifier: ^3.24.2 version: 3.25.57 @@ -16337,7 +16420,7 @@ packages: '@cloudflare/vite-plugin@1.29.1': resolution: {integrity: sha512-HTbVG43olzk3KTZD8b0nlmJTI3G6sQdFTmuD9HMJy7bkQbxKppkt16jayFo/NWAAs1GJXpFjLkC8udRdyn3aEg==} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 wrangler: ^4.75.0 '@cloudflare/workerd-darwin-64@1.20260317.1': @@ -16377,7 +16460,7 @@ packages: resolution: {integrity: sha512-yKNqaYVxZZPJYkhVHpz30Oem4TUgcI+/IRDD9YHvcAgi0P42CL6TB/+qYjuFOWghFzTPrm3TUbNFoBsevSTbUA==} peerDependencies: tinybench: '>=2.9.0' - vite: ^8.0.14 + vite: ^8.3.4 vitest: ^3.2 || ^4 '@colors/colors@1.5.0': @@ -18961,7 +19044,7 @@ packages: peerDependencies: '@tanstack/react-start': workspace:* '@tanstack/solid-start': workspace:* - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: '@tanstack/react-start': optional: true @@ -18972,7 +19055,7 @@ packages: resolution: {integrity: sha512-63vL+KpnbfJv+xQSfOn37j8aSOWjiljeaFL9g/HY+YNJpDJ3Y5BPPW1VExx4dcPqXBkggBHm5Y6HpTvBeTSx3Q==} engines: {node: '>=22.12.0'} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 '@netlify/zip-it-and-ship-it@15.5.1': resolution: {integrity: sha512-ECHwLIHkSgfkxqF+q40xLMTTSxir1/pDGK6d55oKvwKidrW4qyTyHCAkuKtjOTJ30A+E238X2iiRyI+SCDjTuA==} @@ -19206,138 +19289,8 @@ packages: resolution: {integrity: sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA==} engines: {node: '>=14'} - '@oxc-minify/binding-android-arm-eabi@0.110.0': - resolution: {integrity: sha512-43fMTO8/5bMlqfOiNSZNKUzIqeLIYuB9Hr1Ohyf58B1wU11S2dPGibTXOGNaWsfgHy99eeZ1bSgeIHy/fEYqbw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [android] - - '@oxc-minify/binding-android-arm64@0.110.0': - resolution: {integrity: sha512-5oQrnn9eK/ccOp80PTrNj0Vq893NPNNRryjGpOIVsYNgWFuoGCfpnKg68oEFcN8bArizYAqw4nvgHljEnar69w==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [android] - - '@oxc-minify/binding-darwin-arm64@0.110.0': - resolution: {integrity: sha512-dqBDgTG9tF2z2lrZp9E8wU+Godz1i8gCGSei2eFKS2hRploBOD5dmOLp1j4IMornkPvSQmbwB3uSjPq7fjx4EA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [darwin] - - '@oxc-minify/binding-darwin-x64@0.110.0': - resolution: {integrity: sha512-U0AqabqaooDOpYmeeOye8wClv8PSScELXgOfYqyqgrwH9J9KrpCE1jL8Rlqgz68QbL4mPw3V6sKiiHssI4CLeQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [darwin] - - '@oxc-minify/binding-freebsd-x64@0.110.0': - resolution: {integrity: sha512-H0w8o/Wo1072WSdLfhwwrpFpwZnPpjQODlHuRYkTfsSSSJbTxQtjJd4uxk7YJsRv5RQp69y0I7zvdH6f8Xueyw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [freebsd] - - '@oxc-minify/binding-linux-arm-gnueabihf@0.110.0': - resolution: {integrity: sha512-qd6sW0AvEVYZhbVVMGtmKZw3b1zDYGIW+54Uh42moWRAj6i4Jhk/LGr6r9YNZpOINeuvZfkFuEeDD/jbu7xPUA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@oxc-minify/binding-linux-arm-musleabihf@0.110.0': - resolution: {integrity: sha512-7WXP0aXMrWSn0ScppUBi3jf68ebfBG0eri8kxLmBOVSBj6jw1repzkHMITJMBeLr5d0tT/51qFEptiAk2EP2iA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@oxc-minify/binding-linux-arm64-gnu@0.110.0': - resolution: {integrity: sha512-LYfADrq5x1W5gs+u9OIbMbDQNYkAECTXX0ufnAuf3oGmO51rF98kGFR5qJqC/6/csokDyT3wwTpxhE0TkcF/Og==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@oxc-minify/binding-linux-arm64-musl@0.110.0': - resolution: {integrity: sha512-53GjCVY8kvymk9P6qNDh6zyblcehF5QHstq9QgCjv13ONGRnSHjeds0PxIwiihD7h295bxsWs84DN39syLPH4Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@oxc-minify/binding-linux-ppc64-gnu@0.110.0': - resolution: {integrity: sha512-li8XcN81dxbJDMBESnTgGhoiAQ+CNIdM0QGscZ4duVPjCry1RpX+5FJySFbGqG3pk4s9ZzlL/vtQtbRzZIZOzg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [ppc64] - os: [linux] - libc: [glibc] - - '@oxc-minify/binding-linux-riscv64-gnu@0.110.0': - resolution: {integrity: sha512-SweKfsnLKShu6UFV8mwuj1d1wmlNoL/FlAxPUzwjEBgwiT2HQkY24KnjBH+TIA+//1O83kzmWKvvs4OuEhdIEQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [riscv64] - os: [linux] - libc: [glibc] - - '@oxc-minify/binding-linux-riscv64-musl@0.110.0': - resolution: {integrity: sha512-oH8G4aFMP8XyTsEpdANC5PQyHgSeGlopHZuW1rpyYcaErg5YaK0vXjQ4EM5HVvPm+feBV24JjxgakTnZoF3aOQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [riscv64] - os: [linux] - libc: [musl] - - '@oxc-minify/binding-linux-s390x-gnu@0.110.0': - resolution: {integrity: sha512-W9na+Vza7XVUlpf8wMt4QBfH35KeTENEmnpPUq3NSlbQHz8lSlSvhAafvo43NcKvHAXV3ckD/mUf2VkqSdbklg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [s390x] - os: [linux] - libc: [glibc] - - '@oxc-minify/binding-linux-x64-gnu@0.110.0': - resolution: {integrity: sha512-XJdA4mmmXOjJxSRgNJXsDP7Xe8h3gQhmb56hUcCrvq5d+h5UcEi2pR8rxsdIrS8QmkLuBA3eHkGK8E27D7DTgQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@oxc-minify/binding-linux-x64-musl@0.110.0': - resolution: {integrity: sha512-QqzvALuOTtSckI8x467R4GNArzYDb/yEh6aNzLoeaY1O7vfT7SPDwlOEcchaTznutpeS9Dy8gUS/AfqtUHaufw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - libc: [musl] - - '@oxc-minify/binding-openharmony-arm64@0.110.0': - resolution: {integrity: sha512-gAMssLs2Q3+uhLZxanh1DF+27Kaug3cf4PXb9AB7XK81DR+LVcKySXaoGYoOs20Co0fFSphd6rRzKge2qDK3dA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [openharmony] - - '@oxc-minify/binding-wasm32-wasi@0.110.0': - resolution: {integrity: sha512-7Wqi5Zjl022bs2zXq+ICdalDPeDuCH/Nhbi8q2isLihAonMVIT0YH2hqqnNEylRNGYck+FJ6gRZwMpGCgrNxPg==} - engines: {node: '>=14.0.0'} - cpu: [wasm32] - - '@oxc-minify/binding-win32-arm64-msvc@0.110.0': - resolution: {integrity: sha512-ZPx+0Tj4dqn41ecyoGotlvekQKy6JxJCixn9Rw7h/dafZ3eDuBcEVh3c2ZoldXXsyMIt5ywI8IWzFZsjNedd5Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [win32] - - '@oxc-minify/binding-win32-ia32-msvc@0.110.0': - resolution: {integrity: sha512-H0Oyd3RWBfpEyvJIrFK94RYiY7KKSQl11Ym7LMDwLEagelIAfRCkt1amHZhFa/S3ZRoaOJFXzEw4YKeSsjVFsg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [ia32] - os: [win32] - - '@oxc-minify/binding-win32-x64-msvc@0.110.0': - resolution: {integrity: sha512-Hr3nK90+qXKJ2kepXwFIcNfQQIOBecB4FFCyaMMypthoEEhVP08heRynj4eSXZ8NL9hLjs3fQzH8PJXfpznRnQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [win32] - - '@oxc-project/types@0.115.0': - resolution: {integrity: sha512-4n91DKnebUS4yjUHl2g3/b2T+IUdCfmoZGhmwsovZCDaJSs+QkVAM+0AqqTxHSsHfeiMuueT75cZaZcT/m0pSw==} - - '@oxc-project/types@0.132.0': - resolution: {integrity: sha512-FESMOxil5Se014ui/Eq8fT5uHJo6nIRwH0PfJrZJXs6Gek3ZVFOrpUv3YIZT20m+extU98Hg1Ym72U58rlsxUQ==} + '@oxc-project/types@0.153.0': + resolution: {integrity: sha512-jSNrRIyvPVLL5E1z/tS5zLAprosGz/FuI1PWwEOz59j3E4TTTzSpqKb/RDGqJhhW0QHYISGXxq582wGx6T11Tw==} '@oxc-resolver/binding-android-arm-eabi@11.19.1': resolution: {integrity: sha512-aUs47y+xyXHUKlbhqHUjBABjvycq6YSD7bpxSW7vplUmdzAlJ93yXY6ZR0c1o1x5A/QKbENCvs3+NlY8IpIVzg==} @@ -19447,133 +19400,6 @@ packages: cpu: [x64] os: [win32] - '@oxc-transform/binding-android-arm-eabi@0.110.0': - resolution: {integrity: sha512-sE9dxvqqAax1YYJ3t7j+h5ZSI9jl6dYuDfngl6ieZUrIy5P89/8JKVgAzgp8o3wQSo7ndpJvYsi1K4ZqrmbP7w==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [android] - - '@oxc-transform/binding-android-arm64@0.110.0': - resolution: {integrity: sha512-nqtbP4aMCtsCZ6qpHlHaQoWVHSBtlKzwaAgwEOvR+9DWqHjk31BHvpGiDXlMeed6CVNpl3lCbWgygb3RcSjcfw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [android] - - '@oxc-transform/binding-darwin-arm64@0.110.0': - resolution: {integrity: sha512-oeSeHnL4Z4cMXtc8V0/rwoVn0dgwlS9q0j6LcHn9dIhtFEdp3W0iSBF8YmMQA+E7sILeLDjsHmHE4Kp0sOScXw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [darwin] - - '@oxc-transform/binding-darwin-x64@0.110.0': - resolution: {integrity: sha512-nL9K5x7OuZydobAGPylsEW9d4APs2qEkIBLMgQPA+kY8dtVD3IR87QsTbs4l4DBQYyun/+ay6qVCDlxqxdX2Jg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [darwin] - - '@oxc-transform/binding-freebsd-x64@0.110.0': - resolution: {integrity: sha512-GS29zXXirDQhZEUq8xKJ1azAWMuUy3Ih3W5Bc5ddk12LRthO5wRLFcKIyeHpAXCoXymQ+LmxbMtbPf84GPxouw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [freebsd] - - '@oxc-transform/binding-linux-arm-gnueabihf@0.110.0': - resolution: {integrity: sha512-glzDHak8ISyZJemCUi7RCvzNSl+MQ1ly9RceT2qRufhUsvNZ4C/2QLJ1HJwd2N6E88bO4laYn+RofdRzNnGGEA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@oxc-transform/binding-linux-arm-musleabihf@0.110.0': - resolution: {integrity: sha512-8JThvgJ2FRoTVfbp7e4wqeZqCZbtudM06SfZmNzND9kPNu/LVYygIR+72RWs+xm4bWkuYHg/islo/boNPtMT5Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@oxc-transform/binding-linux-arm64-gnu@0.110.0': - resolution: {integrity: sha512-IRh21Ub/g4bkHoErZ0AUWMlWfoZaS0A6EaOVtbcY70RSYIMlrsbjiFwJCzM+b/1DD1rXbH5tsGcH7GweTbfRqg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@oxc-transform/binding-linux-arm64-musl@0.110.0': - resolution: {integrity: sha512-e5JN94/oy+wevk76q+LMr+2klTTcO60uXa+Wkq558Ms7mdF2TvkKFI++d/JeiuIwJLTi/BxQ4qdT5FWcsHM/ug==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@oxc-transform/binding-linux-ppc64-gnu@0.110.0': - resolution: {integrity: sha512-Y3/Tnnz1GvDpmv8FXBIKtdZPsdZklOEPdrL6NHrN5i2u54BOkybFaDSptgWF53wOrJlTrcmAVSE6fRKK9XCM2Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [ppc64] - os: [linux] - libc: [glibc] - - '@oxc-transform/binding-linux-riscv64-gnu@0.110.0': - resolution: {integrity: sha512-Y0E35iA9/v9jlkNcP6tMJ+ZFOS0rLsWDqG6rU9z+X2R3fBFJBO9UARIK6ngx8upxk81y1TFR2CmBFhupfYdH6Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [riscv64] - os: [linux] - libc: [glibc] - - '@oxc-transform/binding-linux-riscv64-musl@0.110.0': - resolution: {integrity: sha512-JOUSYFfHjBUs7xp2FHmZHb8eTYD/oEu0NklS6JgUauqnoXZHiTLPLVW2o2uVCqldnabYHcomuwI2iqVFYJNhTw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [riscv64] - os: [linux] - libc: [musl] - - '@oxc-transform/binding-linux-s390x-gnu@0.110.0': - resolution: {integrity: sha512-7blgoXF9D3Ngzb7eun23pNrHJpoV/TtE6LObwlZ3Nmb4oZ6Z+yMvBVaoW68NarbmvNGfZ95zrOjgm6cVETLYBA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [s390x] - os: [linux] - libc: [glibc] - - '@oxc-transform/binding-linux-x64-gnu@0.110.0': - resolution: {integrity: sha512-YQ2joGWCVDZVEU2cD/r/w49hVjDm/Qu1BvC/7zs8LvprzdLS/HyMXGF2oA0puw0b+AqgYaz3bhwKB2xexHyITQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@oxc-transform/binding-linux-x64-musl@0.110.0': - resolution: {integrity: sha512-fkjr5qE632ULmNgvFXWDR/8668WxERz3tU7TQFp6JebPBneColitjSkdx6VKNVXEoMmQnOvBIGeP5tUNT384oA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - libc: [musl] - - '@oxc-transform/binding-openharmony-arm64@0.110.0': - resolution: {integrity: sha512-HWH9Zj+lMrdSTqFRCZsvDWMz7OnMjbdGsm3xURXWfRZpuaz0bVvyuZNDQXc4FyyhRDsemICaJbU1bgeIpUJDGw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [openharmony] - - '@oxc-transform/binding-wasm32-wasi@0.110.0': - resolution: {integrity: sha512-ejdxHmYfIcHDPhZUe3WklViLt9mDEJE5BzcW7+R1vc5i/5JFA8D0l7NUSsHBJ7FB8Bu9gF+5iMDm6cXGAgaghw==} - engines: {node: '>=14.0.0'} - cpu: [wasm32] - - '@oxc-transform/binding-win32-arm64-msvc@0.110.0': - resolution: {integrity: sha512-9VTwpXCZs7xkV+mKhQ62dVk7KLnLXtEUxNS2T4nLz3iMl1IJbA4h5oltK0JoobtiUAnbkV53QmMVGW8+Nh3bDQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [win32] - - '@oxc-transform/binding-win32-ia32-msvc@0.110.0': - resolution: {integrity: sha512-5y0fzuNON7/F2hh2P94vANFaRPJ/3DI1hVl5rseCT8VUVqOGIjWaza0YS/D1g6t1WwycW2LWDMi2raOKoWU5GQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [ia32] - os: [win32] - - '@oxc-transform/binding-win32-x64-msvc@0.110.0': - resolution: {integrity: sha512-QROrowwlrApI1fEScMknGWKM6GTM/Z2xwMnDqvSaEmzNazBsDUlE08Jasw610hFEsYAVU2K5sp/YaCa9ORdP4A==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [win32] - '@panva/hkdf@1.2.1': resolution: {integrity: sha512-6oclG6Y3PiDFcoyk8srjLfVKyMfVCKJ27JwNPViuXziFpmdz+MZnZN/aKY0JGXgYuO/VghU0jcOAZgWXZ1Dmrw==} @@ -20505,192 +20331,98 @@ packages: '@types/react-dom': optional: true - '@rolldown/binding-android-arm64@1.0.0-rc.9': - resolution: {integrity: sha512-lcJL0bN5hpgJfSIz/8PIf02irmyL43P+j1pTCfbD1DbLkmGRuFIA4DD3B3ZOvGqG0XiVvRznbKtN0COQVaKUTg==} + '@rolldown/binding-android-arm-eabi@1.2.13': + resolution: {integrity: sha512-Vu/NICrgdRvUOeaJZIyB2FP63s6fO/4ud5l8dXmxDx9yDyn+mN0y+gsvsVviSli+T361Aqo0h46EuMoobrwawA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [android] + + '@rolldown/binding-android-arm64@1.2.13': + resolution: {integrity: sha512-6LEoIrGy5vvCd2boNnv2soPSUZj/PRvhp8R/t9KlX+mIZxThIE/ZqxrGXxmuNX0FuvQFvLdZr7S4HrYpYBVhEQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@rolldown/binding-android-arm64@1.0.2': - resolution: {integrity: sha512-ZS4D1JPGn/MYQN/SYDWftIE/nVsM8j/AFOYEzAoOE2O3NktQOZru+/vYXGbR/qtdLdIfGCP0lcoJiYVzsEz+iQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [android] - - '@rolldown/binding-darwin-arm64@1.0.0-rc.9': - resolution: {integrity: sha512-J7Zk3kLYFsLtuH6U+F4pS2sYVzac0qkjcO5QxHS7OS7yZu2LRs+IXo+uvJ/mvpyUljDJ3LROZPoQfgBIpCMhdQ==} + '@rolldown/binding-darwin-arm64@1.2.13': + resolution: {integrity: sha512-CaJSRzlQ6Q+zkDMVA9OkVxBjVoPRCDEE3v0FSJ9kIQBgRjFApA3Si4ijhbNVUji7ZJt+PfO0e46qy4nPInHUPA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@rolldown/binding-darwin-arm64@1.0.2': - resolution: {integrity: sha512-vdFA9+C/rekyGce7WqHs/xoT0ioZEWaOFyZLIV1mEeNFaFDUQrPIo8Vs2GvJ6eetb3rzDUtUBgzto3ExpXJB3w==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [darwin] - - '@rolldown/binding-darwin-x64@1.0.0-rc.9': - resolution: {integrity: sha512-iwtmmghy8nhfRGeNAIltcNXzD0QMNaaA5U/NyZc1Ia4bxrzFByNMDoppoC+hl7cDiUq5/1CnFthpT9n+UtfFyg==} + '@rolldown/binding-darwin-x64@1.2.13': + resolution: {integrity: sha512-e4r340I5hxSzJkD3YJBxgzq/rJ3wwxwdLLb2FPt1Zpyem20nrQPT11DDEEkazwxaHumH8wpglsp/Ozgj/wT6mw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@rolldown/binding-darwin-x64@1.0.2': - resolution: {integrity: sha512-BewSOwTHazv77DTYiAZXSqqKZ4KP/KonFisDMVU7PImxoWfB2aepnPhd2E4SWz3zDzYgDNbs6jBmTdgNnF02GA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [darwin] - - '@rolldown/binding-freebsd-x64@1.0.0-rc.9': - resolution: {integrity: sha512-DLFYI78SCiZr5VvdEplsVC2Vx53lnA4/Ga5C65iyldMVaErr86aiqCoNBLl92PXPfDtUYjUh+xFFor40ueNs4Q==} + '@rolldown/binding-freebsd-x64@1.2.13': + resolution: {integrity: sha512-hoBWDZ4/K/mJKVMbsgUd1jfpA2DiOrJ54mpegObU9TBHBBrtX4FLIXJJQRDPZ/2Dn91GvPob+Z2hwKJzf4E5SQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@rolldown/binding-freebsd-x64@1.0.2': - resolution: {integrity: sha512-m41o7M0YWtUdqk61Tb+jnKb2rN++iRdIASlExkUoKfIAH30DOHCB8fVLzSUpbWHHU8esmEioY62PxzexE8MBuA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [freebsd] - - '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.9': - resolution: {integrity: sha512-CsjTmTwd0Hri6iTw/DRMK7kOZ7FwAkrO4h8YWKoX/kcj833e4coqo2wzIFywtch/8Eb5enQ/lwLM7w6JX1W5RQ==} + '@rolldown/binding-linux-arm-gnueabihf@1.2.13': + resolution: {integrity: sha512-oF9fZu3vTWnTiVAkDFxU9PJLt1nh20K9RRpuHsR7ZnE2L7XookBbDBVLojCVSLGbvtSlxeUNnjAj6DbNsKyzbg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@rolldown/binding-linux-arm-gnueabihf@1.0.2': - resolution: {integrity: sha512-jcojB9H7W/jS29pMKWAK1N+fU99vXodHDTatS3b3y/XSOCiHo0kkA74pL3jJmkoQtYpOCxDvaKs1fo2Ij/1X5w==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.9': - resolution: {integrity: sha512-2x9O2JbSPxpxMDhP9Z74mahAStibTlrBMW0520+epJH5sac7/LwZW5Bmg/E6CXuEF53JJFW509uP+lSedaUNxg==} + '@rolldown/binding-linux-arm64-gnu@1.2.13': + resolution: {integrity: sha512-DTpb/+jMiqWMPgphn4ksW1zW+XLJ6dJJ9FMvnIk9I291LhCctMPhMYJrP5t9p6C9qa3KXadDdUEZHBaPh3kNxQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [glibc] - '@rolldown/binding-linux-arm64-gnu@1.0.2': - resolution: {integrity: sha512-1jn6qDU5iiOgFgygDzKUuKP0maTi0/f1+sBLgvij/76C77Nm3ts6ufz9Bjg5q5dduxiUIxtq86JIoBvo1xQ4Ig==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@rolldown/binding-linux-arm64-musl@1.0.0-rc.9': - resolution: {integrity: sha512-JA1QRW31ogheAIRhIg9tjMfsYbglXXYGNPLdPEYrwFxdbkQCAzvpSCSHCDWNl4hTtrol8WeboCSEpjdZK8qrCg==} + '@rolldown/binding-linux-arm64-musl@1.2.13': + resolution: {integrity: sha512-xU+Kvv9N2A3SY35zFh1FWWNjxbadE/BKeqnkXe7vScU4GZsw757BlVmDLITZEq8DPpk6m7uoDYkK7P+x/uU5Ow==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [musl] - '@rolldown/binding-linux-arm64-musl@1.0.2': - resolution: {integrity: sha512-QVLO/czFMdoMFSqlX3bcswcJNm/23r+qoa/jgtmFc/qEp6/jXmIkDjF/XIo8dPfGaiwy1xfQn8o77L79GeXFgw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.9': - resolution: {integrity: sha512-aOKU9dJheda8Kj8Y3w9gnt9QFOO+qKPAl8SWd7JPHP+Cu0EuDAE5wokQubLzIDQWg2myXq2XhTpOVS07qqvT+w==} + '@rolldown/binding-linux-ppc64-gnu@1.2.13': + resolution: {integrity: sha512-XMk/hnhh25oQ756Lclb1Q11h4ll0xC0Esa5w4Vzp+mAE2S3AGJgeM0SonrIgY8fHhjarb6hcoTuwoFG0VVP2ig==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] libc: [glibc] - '@rolldown/binding-linux-ppc64-gnu@1.0.2': - resolution: {integrity: sha512-hgO5Abm0w5UL6FEa2iFnZqo2KlK7TQ5QhV5x09hujBf7t5KzHQ1VmfPuTpqRy/rNlSxua3eWH374xxiVrP+lcA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [ppc64] - os: [linux] - libc: [glibc] - - '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.9': - resolution: {integrity: sha512-OalO94fqj7IWRn3VdXWty75jC5dk4C197AWEuMhIpvVv2lw9fiPhud0+bW2ctCxb3YoBZor71QHbY+9/WToadA==} + '@rolldown/binding-linux-s390x-gnu@1.2.13': + resolution: {integrity: sha512-U1BoTHYmlywE2n3HUWjzZ+8EQsKr+OwpxYuDWaubx42tUL8QSL7nOqRz/NVHanibbFP3M1Rxuprz/wNcbMKjqw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] libc: [glibc] - '@rolldown/binding-linux-s390x-gnu@1.0.2': - resolution: {integrity: sha512-fy8rXxuYEu602abC8MUNaPjYLIFzReOaEIEMKMUa0rFEUxNpVXhs15KSSQ4qlqSaM7B6rcj9rDZgADh/IGDzLQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [s390x] - os: [linux] - libc: [glibc] - - '@rolldown/binding-linux-x64-gnu@1.0.0-rc.9': - resolution: {integrity: sha512-cVEl1vZtBsBZna3YMjGXNvnYYrOJ7RzuWvZU0ffvJUexWkukMaDuGhUXn0rjnV0ptzGVkvc+vW9Yqy6h8YX4pg==} + '@rolldown/binding-linux-x64-gnu@1.2.13': + resolution: {integrity: sha512-J4cm80Pc6wEwV5AZ42o62sIQgDk+Y7R2s646jIwuvO+4V46QB58N4vVuMPWCBaNgursXLpmUWJV//WQAkPvHBQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [glibc] - '@rolldown/binding-linux-x64-gnu@1.0.2': - resolution: {integrity: sha512-0+bOkiQ779+r1WpoHOWHqncvyySci0vKph+myNDYb+im6meJAzHQXay6oEgnkHuUGouM1LKTZwqKpBow6Kj7CQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@rolldown/binding-linux-x64-musl@1.0.0-rc.9': - resolution: {integrity: sha512-UzYnKCIIc4heAKgI4PZ3dfBGUZefGCJ1TPDuLHoCzgrMYPb5Rv6TLFuYtyM4rWyHM7hymNdsg5ik2C+UD9VDbA==} + '@rolldown/binding-linux-x64-musl@1.2.13': + resolution: {integrity: sha512-W0euZS40U4V6JkmEnVCIX9mcsL6cbXQ4X8c2w+MMOIjFg68TXUW+u3RT+2e1t1pv9mg/EP3pDtK3POXdQ7Rxyw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [musl] - '@rolldown/binding-linux-x64-musl@1.0.2': - resolution: {integrity: sha512-mjSkrzZK5Qsl0a9d1JgILOiuZOSDTVdKENcSXBoqbzSrspLR/4/IRVDo5wd2GgZjNss/viBFJdeq+j7qH2nypw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - libc: [musl] - - '@rolldown/binding-openharmony-arm64@1.0.0-rc.9': - resolution: {integrity: sha512-+6zoiF+RRyf5cdlFQP7nm58mq7+/2PFaY2DNQeD4B87N36JzfF/l9mdBkkmTvSYcYPE8tMh/o3cRlsx1ldLfog==} + '@rolldown/binding-openharmony-arm64@1.2.13': + resolution: {integrity: sha512-do/AF/4n9MRshia3a5aXoy8xM2c6mgfT6D7H/dY6my5z+hfCIR4ab7mk4IRj++nsEQpKy39kd0DQnDq+r692tw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@rolldown/binding-openharmony-arm64@1.0.2': - resolution: {integrity: sha512-1v5vHasdfQAZoEHakBV72LIFAC9JjnymsiKxp+GEr/ma3+NJCPSaYK+qavInOovJkgwFrs7GccX2d6IgDA3Z5w==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [openharmony] - - '@rolldown/binding-wasm32-wasi@1.0.0-rc.9': - resolution: {integrity: sha512-rgFN6sA/dyebil3YTlL2evvi/M+ivhfnyxec7AccTpRPccno/rPoNlqybEZQBkcbZu8Hy+eqNJCqfBR8P7Pg8g==} - engines: {node: '>=14.0.0'} - cpu: [wasm32] - - '@rolldown/binding-wasm32-wasi@1.0.2': - resolution: {integrity: sha512-mb1VobWn6NheziTk5/WEaR6AKVbrwT5sOi6C7zk3gy/pD1qtJfU1j4PgTo2NJnOtbL9Dl3Aeei8w9jJ7qC2jZQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [wasm32] - - '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.9': - resolution: {integrity: sha512-lHVNUG/8nlF1IQk1C0Ci574qKYyty2goMiPlRqkC5R+3LkXDkL5Dhx8ytbxq35m+pkHVIvIxviD+TWLdfeuadA==} + '@rolldown/binding-win32-arm64-msvc@1.2.13': + resolution: {integrity: sha512-6FtUf2cJZobutJdxnGYX8z0vtbgqU0b2v8vfBhkXb9wp2MppMFtkunE+IaOntyi01rkIQoPW2GHABtfzsC0BRQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@rolldown/binding-win32-arm64-msvc@1.0.2': - resolution: {integrity: sha512-SqKonF56vA/L2yHwHYcEp2P34URpOZ7d1fS635cTkpDnUtEGdUbhI6NzsPdqeSWvAAeGDrxjWjNmibDIdFf9/A==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [win32] - - '@rolldown/binding-win32-x64-msvc@1.0.0-rc.9': - resolution: {integrity: sha512-G0oA4+w1iY5AGi5HcDTxWsoxF509hrFIPB2rduV5aDqS9FtDg1CAfa7V34qImbjfhIcA8C+RekocJZA96EarwQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [win32] - - '@rolldown/binding-win32-x64-msvc@1.0.2': - resolution: {integrity: sha512-v7qRI7gXLRINcOGXt+7YmAZ6iFuyZVMIoXAxhd8oP+DR9dLfL9GfNIx7PLMxmhZdvq8waUJBQiWN9EKNy+TRBQ==} + '@rolldown/binding-win32-x64-msvc@1.2.13': + resolution: {integrity: sha512-UKhFaZTeTcbKrb3iU82m17jVcPEAoqDkCN5MBqgPyZSwp/cQmib21crTS0DdH7T1B7wZRWEI89YQAOJMet5yhg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] @@ -20703,7 +20435,7 @@ packages: '@babel/plugin-transform-runtime': ^7.29.0 || ^8.0.0-rc.1 '@babel/runtime': ^7.27.0 || ^8.0.0-rc.1 rolldown: ^1.0.0-rc.5 - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: '@babel/plugin-transform-runtime': optional: true @@ -21891,7 +21623,7 @@ packages: '@tailwindcss/vite@4.2.2': resolution: {integrity: sha512-mEiF5HO1QqCLXoNEfXVA1Tzo+cYsrqV7w9Juj2wdUFyW07JRenqMG225MvPwr3ZD9N1bFQj46X7r33iHxLUW0w==} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 '@tailwindcss/webpack@4.3.1': resolution: {integrity: sha512-HM33EjYPbkMlBGcYoVA/pk/hML3wAn2JOnjF79eDWVLuktOhRczDwWsSBQBOWV6LLBVAgGZS/pZ519OHUF8vKg==} @@ -22046,7 +21778,7 @@ packages: resolution: {integrity: sha512-cTswDmoTn5UZA5pV2z/IWhGYgb8NS0zPRYYLv5q9JxHY4WxL/l/Riy6Aq76QttH8w6IHAIO/ZGwHBfF/OV0Kcw==} engines: {node: '>=18'} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 '@tanstack/vue-query-devtools@5.91.0': resolution: {integrity: sha512-Kn6p5ffEKUj+YGEP+BapoPI8kUiPtNnFDyzjTvUx6GHbyfzfefQPhYoRtFiWeyrGHjUB/Mvtnr7Rosbzs/ngVg==} @@ -22783,7 +22515,7 @@ packages: resolution: {integrity: sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 '@vitejs/plugin-react@6.0.1': resolution: {integrity: sha512-l9X/E3cDb+xY3SWzlG1MOGt2usfEHGMNIaegaUGFsLkb3RCn/k8/TOXBcab+OndDI4TBtktT8/9BwwW8Vi9KUQ==} @@ -22791,7 +22523,7 @@ packages: peerDependencies: '@rolldown/plugin-babel': ^0.1.7 || ^0.2.0 babel-plugin-react-compiler: ^1.0.0 - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: '@rolldown/plugin-babel': optional: true @@ -22804,7 +22536,7 @@ packages: react: ^19.2.3 react-dom: ^19.2.3 react-server-dom-webpack: '*' - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: react-server-dom-webpack: optional: true @@ -22813,21 +22545,21 @@ packages: resolution: {integrity: sha512-DSTrmrdLp+0LDNF77fqrKfx7X0ErRbOcUAgJL/HbSesqQwoUvUQ4uYQqaex+rovqgGcoPqVk+AwUh3v9CuiYIw==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 vue: ^3.0.0 '@vitejs/plugin-vue-jsx@5.1.5': resolution: {integrity: sha512-jIAsvHOEtWpslLOI2MeElGFxH7M8pM83BU/Tor4RLyiwH0FM4nUW3xdvbw20EeU9wc5IspQwMq225K3CMnJEpA==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 vue: ^3.0.0 '@vitejs/plugin-vue@6.0.5': resolution: {integrity: sha512-bL3AxKuQySfk1iGcBsQnoRVexTPJq0Z/ixFVM8OhVJAP6ZXXXLtM7NFKWhLl30Kg7uTBqIaPXbh+nuQCuBDedg==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 vue: ^3.2.25 '@vitest/expect@4.1.4': @@ -22837,7 +22569,7 @@ packages: resolution: {integrity: sha512-R9HTZBhW6yCSGbGQnDnH3QHfJxokKN4KB+Yvk9Q1le7eQNYwiCyKxmLmurSpFy6BzJanSLuEUDrD+j97Q+ZLPg==} peerDependencies: msw: ^2.4.9 - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: msw: optional: true @@ -24120,30 +23852,6 @@ packages: srvx: optional: true - crossws@0.4.3: - resolution: {integrity: sha512-lmf5mtwHiToP3HumOx53cqS0T5TK8GMBpsbSCXRB5OuszbltTgGOO4B1WhrDYqTeXOk3BAemibNjJx8E0/ecNw==} - peerDependencies: - srvx: '>=0.7.1' - peerDependenciesMeta: - srvx: - optional: true - - crossws@0.4.4: - resolution: {integrity: sha512-w6c4OdpRNnudVmcgr7brb/+/HmYjMQvYToO/oTrprTwxRUiom3LYWU1PMWuD006okbUWpII1Ea9/+kwpUfmyRg==} - peerDependencies: - srvx: '>=0.7.1' - peerDependenciesMeta: - srvx: - optional: true - - crossws@0.4.5: - resolution: {integrity: sha512-wUR89x/Rw7/8t+vn0CmGDYM9TD6VtARGb0LD5jq2wjtMy1vCP4M+sm6N6TigWeTYvnA8MoW29NqqXD0ep0rfBA==} - peerDependencies: - srvx: '>=0.11.5' - peerDependenciesMeta: - srvx: - optional: true - css-loader@7.1.2: resolution: {integrity: sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==} engines: {node: '>= 18.12.0'} @@ -24249,6 +23957,9 @@ packages: sqlite3: optional: true + db0@0.4.1: + resolution: {integrity: sha512-6RBY/bSn42UrqATwsiULj2uYFyEykB3XeA/NLIVQeHNXlYV6D4Idxx3/aa6k5Y45Dwzx7sygeLotnqHWSeURYA==} + de-indent@1.0.2: resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==} @@ -24639,14 +24350,9 @@ packages: resolution: {integrity: sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - env-runner@0.1.6: - resolution: {integrity: sha512-fSb7X1zdda8k6611a6/SdSQpDe7a/bqMz2UWdbHjk9YWzpUR4/fn9YtE/hqgGQ2nhvVN0zUtcL1SRMKwIsDbAA==} + env-runner@0.2.3: + resolution: {integrity: sha512-S8EFBKyznRwPVwayK187cYjvnpgC92xy+q0BIF++V965pfjMVVRbQ/HoTYGA/1EHmZ7E68k6Heq+4WnvVhOL5w==} hasBin: true - peerDependencies: - miniflare: ^4.0.0 - peerDependenciesMeta: - miniflare: - optional: true envinfo@7.14.0: resolution: {integrity: sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==} @@ -25415,26 +25121,6 @@ packages: h3@1.15.11: resolution: {integrity: sha512-L3THSe2MPeBwgIZVSH5zLdBBU90TOxarvhK9d04IDY2AmVS8j2Jz2LIWtwsGOU3lu2I5jCN7FNvVfY2+XyF+mg==} - h3@2.0.1-rc.14: - resolution: {integrity: sha512-163qbGmTr/9rqQRNuqMqtgXnOUAkE4KTdauiC9y0E5iG1I65kte9NyfWvZw5RTDMt6eY+DtyoNzrQ9wA2BfvGQ==} - engines: {node: '>=20.11.1'} - hasBin: true - peerDependencies: - crossws: ^0.4.1 - peerDependenciesMeta: - crossws: - optional: true - - h3@2.0.1-rc.16: - resolution: {integrity: sha512-h+pjvyujdo9way8qj6FUbhaQcHlR8FEq65EhTX9ViT5pK8aLj68uFl4hBkF+hsTJAH+H1END2Yv6hTIsabGfag==} - engines: {node: '>=20.11.1'} - hasBin: true - peerDependencies: - crossws: ^0.4.1 - peerDependenciesMeta: - crossws: - optional: true - h3@2.0.1-rc.20: resolution: {integrity: sha512-28ljodXuUp0fZovdiSRq4G9OgrxCztrJe5VdYzXAB7ueRvI7pIUqLU14Xi3XqdYJ/khXjfpUOOD2EQa6CmBgsg==} engines: {node: '>=20.11.1'} @@ -25445,6 +25131,19 @@ packages: crossws: optional: true + h3@2.0.1-rc.32: + resolution: {integrity: sha512-Epg1E85L8yIKd9UeAQAVdm6QVrnHbppMsQ641EjpNi4c0IlAg+PJlwp4Xw03Z1loRXPQaH9k64gJT5qDELqm+g==} + engines: {node: '>=20.11.1'} + hasBin: true + peerDependencies: + crossws: ^0.4.12 + ocache: '>=0.3.0' + peerDependenciesMeta: + crossws: + optional: true + ocache: + optional: true + handle-thing@2.0.1: resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==} @@ -25515,8 +25214,8 @@ packages: hookable@5.5.3: resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==} - hookable@6.1.0: - resolution: {integrity: sha512-ZoKZSJgu8voGK2geJS+6YtYjvIzu9AOM/KZXsBxr83uhLL++e9pEv/dlgwgy3dvHg06kTz6JOh1hk3C8Ceiymw==} + hookable@6.1.2: + resolution: {integrity: sha512-+abwxtiEA52GCVIsQqut3S/uKTbUwYIp4Pe/vv+6py5XiXBCqMZHg6pA6Y5qhgLSEys0/cYuPbO0z1QFj5ZCmg==} hosted-git-info@7.0.2: resolution: {integrity: sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==} @@ -25624,9 +25323,6 @@ packages: resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==} engines: {node: '>= 14'} - httpxy@0.3.1: - resolution: {integrity: sha512-XjG/CEoofEisMrnFr0D6U6xOZ4mRfnwcYQ9qvvnT4lvnX8BoeA3x3WofB75D+vZwpaobFVkBIHrZzoK40w8XSw==} - httpxy@0.5.5: resolution: {integrity: sha512-uDjmnPyp1q4Sgzf3w+J/Fc6UqcCEj0x4Wjp7OqK5dGhNeDgpyrAmnS6ey8QWrX3SWDon2DMKf9sBa5X9+CVyMA==} @@ -26827,13 +26523,13 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - nanoid@3.3.12: - resolution: {integrity: sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==} + nanoid@3.3.18: + resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - nanoid@3.3.18: - resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==} + nanoid@3.3.19: + resolution: {integrity: sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -26888,58 +26584,13 @@ packages: sass: optional: true - nf3@0.3.11: - resolution: {integrity: sha512-ObKp/SA3f1g1f/OMeDlRWaZmqGgk7A0NnDIbeO7c/MV4r/quMlpP/BsqMGuTi3lUlXbC1On8YH7ICM2u2bIAOw==} + nf3@0.3.24: + resolution: {integrity: sha512-HxLK4bo+5jNsEETZp4w3tJblHOA9MCBY14IN9nZJJV8JDxt9yNIYxuBuLMjTAR5GFa3HL61+8VQDUrXv3/C8fw==} - nf3@0.3.6: - resolution: {integrity: sha512-/XRUUILTAyuy1XunyVQuqGp8aEmZ2TfRTn8Rji+FA4xqv20qzL4jV7Reqbuey2XucKgPeRVcEYGScmJM0UnB6Q==} - - nitro@3.0.1-alpha.2: - resolution: {integrity: sha512-YviDY5J/trS821qQ1fpJtpXWIdPYiOizC/meHavlm1Hfuhx//H+Egd1+4C5SegJRgtWMnRPW9n//6Woaw81cTQ==} + nitro@3.0.260903-beta: + resolution: {integrity: sha512-54gANPi62O8rfMvepiJUVuIzEIinYfpeHbebywlLxvVTgIYXDwSvpaU9Id+0sJOBjBx0wC1/CVYXJkH7SY+l0g==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true - peerDependencies: - rolldown: '>=1.0.0-beta.0' - rollup: ^4 - vite: ^8.0.14 - xml2js: ^0.6.2 - peerDependenciesMeta: - rolldown: - optional: true - rollup: - optional: true - vite: - optional: true - xml2js: - optional: true - - nitro@3.0.260311-beta: - resolution: {integrity: sha512-0o0fJ9LUh4WKUqJNX012jyieUOtMCnadkNDWr0mHzdraoHpJP/1CGNefjRyZyMXSpoJfwoWdNEZu2iGf35TUvQ==} - engines: {node: ^20.19.0 || >=22.12.0} - hasBin: true - peerDependencies: - dotenv: '*' - giget: '*' - jiti: ^2.6.1 - rollup: ^4.59.0 - vite: ^8.0.14 - xml2js: ^0.6.2 - zephyr-agent: ^0.1.15 - peerDependenciesMeta: - dotenv: - optional: true - giget: - optional: true - jiti: - optional: true - rollup: - optional: true - vite: - optional: true - xml2js: - optional: true - zephyr-agent: - optional: true nitropack@2.13.4: resolution: {integrity: sha512-tX7bT6zxNeMwkc6hxHiZeUoTOjVrcjoh1Z3cmxOlodIqjl4HISgqfGOmkWSayky3Nv9Z5+KQH52F8nmXJY5AAA==} @@ -27101,15 +26752,12 @@ packages: obug@2.1.1: resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==} - ocache@0.1.2: - resolution: {integrity: sha512-lI34wjM7cahEdrq2I5obbF7MEdE97vULf6vNj6ZCzwEadzyXO1w7QOl2qzzG4IL8cyO7wDtXPj9CqW/aG3mn7g==} + ocache@0.3.0: + resolution: {integrity: sha512-RS/9P0zeBb0gDJmadGERLH8lZNXK7xbufTDhclkXGvFGTsj0G4M5/cLk+mizcERH29mLXNnocfB5wjcK70wGJg==} ofetch@1.5.1: resolution: {integrity: sha512-2W4oUZlVaqAPAil6FUg/difl6YhqhUR7x2eZY4bQCko22UXg3hptq9KLQdqFClV+Wu85UX7hNtdGTngi/1BxcA==} - ofetch@2.0.0-alpha.3: - resolution: {integrity: sha512-zpYTCs2byOuft65vI3z43Dd6iSdFbOZZLb9/d21aCpx2rGastVU9dOCv0lu4ykc1Ur1anAYjDi3SUvR0vq50JA==} - ohash@2.0.11: resolution: {integrity: sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==} @@ -27169,17 +26817,9 @@ packages: outvariant@1.4.3: resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==} - oxc-minify@0.110.0: - resolution: {integrity: sha512-KWGTzPo83QmGrXC4ml83PM9HDwUPtZFfasiclUvTV4i3/0j7xRRqINVkrL77CbQnoWura3CMxkRofjQKVDuhBw==} - engines: {node: ^20.19.0 || >=22.12.0} - oxc-resolver@11.19.1: resolution: {integrity: sha512-qE/CIg/spwrTBFt5aKmwe3ifeDdLfA2NESN30E42X/lII5ClF8V7Wt6WIJhcGZjp0/Q+nQ+9vgxGk//xZNX2hg==} - oxc-transform@0.110.0: - resolution: {integrity: sha512-/fymQNzzUoKZweH0nC5yvbI2eR0yWYusT9TEKDYVgOgYrf9Qmdez9lUFyvxKR9ycx+PTHi/reIOzqf3wkShQsw==} - engines: {node: ^20.19.0 || >=22.12.0} - p-event@6.0.1: resolution: {integrity: sha512-Q6Bekk5wpzW5qIyUP4gdMEujObYstZl6DMMOSenwBvV0BlE5LkDwkjs5yHbZmdCEq2o4RJx4tE1vwxFVf2FG1w==} engines: {node: '>=16.17'} @@ -27482,14 +27122,14 @@ packages: peerDependencies: postcss: ^8.2.9 - postcss@8.5.15: - resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==} - engines: {node: ^10 || ^12 || >=14} - postcss@8.5.23: resolution: {integrity: sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==} engines: {node: ^10 || ^12 || >=14} + postcss@8.5.29: + resolution: {integrity: sha512-49cGhUbXj8Qenv0iTMxA1cFBzxXoctpC9Ujd77t1WcbJIr6nF/eI7g/8MgxrYldFRuAXvja7xQRwavoW7kgrxQ==} + engines: {node: ^10 || ^12 || >=14} + postcss@8.5.3: resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} engines: {node: ^10 || ^12 || >=14} @@ -28009,13 +27649,8 @@ packages: engines: {node: 20 || >=22} hasBin: true - rolldown@1.0.0-rc.9: - resolution: {integrity: sha512-9EbgWge7ZH+yqb4d2EnELAntgPTWbfL8ajiTW+SyhJEC4qhBbkCKbqFV4Ge4zmu5ziQuVbWxb/XwLZ+RIO7E8Q==} - engines: {node: ^20.19.0 || >=22.12.0} - hasBin: true - - rolldown@1.0.2: - resolution: {integrity: sha512-oZx5zVDtVB44AW3eaifgDml1gWRDZGvjcfdxonE4swNPG98PrrXjaO/KrnUjzlMnztCCRVlUueA1kCXhARGk6g==} + rolldown@1.2.13: + resolution: {integrity: sha512-/5apOkwWxtACcQtZ5WlrAsKS4JwXVThQPJZ3RqIruRY9UG9M8e0VlXN068xum/JRKA4aIUoJ13ghe/kGCvidiQ==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true @@ -28043,6 +27678,9 @@ packages: rou3@0.8.1: resolution: {integrity: sha512-ePa+XGk00/3HuCqrEnK3LxJW7I0SdNg6EFzKUJG73hMAdDcOUC/i/aSz7LSDwLrGr33kal/rqOGydzwl6U7zBA==} + rou3@0.9.2: + resolution: {integrity: sha512-3SOzvaAg8rkHrXtRjpCvCvbyO5to9oOO27Z/XqHEYXfMRVSw/qMIVdmaOk9W2lcRLtR6dlqTjo9hDeJk70QBYQ==} + router@2.2.0: resolution: {integrity: sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==} engines: {node: '>= 18'} @@ -28371,6 +28009,10 @@ packages: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} + source-map-js@1.2.2: + resolution: {integrity: sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==} + engines: {node: '>=0.10.0'} + source-map-support@0.5.21: resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} @@ -28461,6 +28103,11 @@ packages: engines: {node: '>=20.16.0'} hasBin: true + srvx@1.0.5: + resolution: {integrity: sha512-KvSKRpgPG/oaq3cyT614OQ2bAa7DynuGamivCZeoZzIUULOdbQz6wUtnnVuC4+DCx2Zglzo8v5gBYmWIWYhDxA==} + engines: {node: '>=20.16.0'} + hasBin: true + stable-hash-x@0.2.0: resolution: {integrity: sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==} engines: {node: '>=12.0.0'} @@ -29120,7 +28767,7 @@ packages: rolldown: '*' rollup: '*' unloader: '*' - vite: ^8.0.14 + vite: ^8.3.4 webpack: '*' peerDependenciesMeta: '@farmfe/core': @@ -29207,153 +28854,8 @@ packages: uploadthing: optional: true - unstorage@2.0.0-alpha.5: - resolution: {integrity: sha512-Sj8btci21Twnd6M+N+MHhjg3fVn6lAPElPmvFTe0Y/wR0WImErUdA1PzlAaUavHylJ7uDiFwlZDQKm0elG4b7g==} - peerDependencies: - '@azure/app-configuration': ^1.9.0 - '@azure/cosmos': ^4.7.0 - '@azure/data-tables': ^13.3.1 - '@azure/identity': ^4.13.0 - '@azure/keyvault-secrets': ^4.10.0 - '@azure/storage-blob': ^12.29.1 - '@capacitor/preferences': ^6.0.3 || ^7.0.0 - '@deno/kv': '>=0.12.0' - '@netlify/blobs': ^6.5.0 || ^7.0.0 || ^8.1.0 || ^9.0.0 || ^10.0.0 - '@planetscale/database': ^1.19.0 - '@upstash/redis': ^1.35.6 - '@vercel/blob': '>=0.27.3' - '@vercel/functions': ^2.2.12 || ^3.0.0 - '@vercel/kv': ^1.0.1 - aws4fetch: ^1.0.20 - chokidar: ^4 || ^5 - db0: '>=0.3.4' - idb-keyval: ^6.2.2 - ioredis: ^5.8.2 - lru-cache: ^11.2.2 - mongodb: ^6 || ^7 - ofetch: '*' - uploadthing: ^7.7.4 - peerDependenciesMeta: - '@azure/app-configuration': - optional: true - '@azure/cosmos': - optional: true - '@azure/data-tables': - optional: true - '@azure/identity': - optional: true - '@azure/keyvault-secrets': - optional: true - '@azure/storage-blob': - optional: true - '@capacitor/preferences': - optional: true - '@deno/kv': - optional: true - '@netlify/blobs': - optional: true - '@planetscale/database': - optional: true - '@upstash/redis': - optional: true - '@vercel/blob': - optional: true - '@vercel/functions': - optional: true - '@vercel/kv': - optional: true - aws4fetch: - optional: true - chokidar: - optional: true - db0: - optional: true - idb-keyval: - optional: true - ioredis: - optional: true - lru-cache: - optional: true - mongodb: - optional: true - ofetch: - optional: true - uploadthing: - optional: true - - unstorage@2.0.0-alpha.6: - resolution: {integrity: sha512-w5vLYCJtnSx3OBtDk7cG4c1p3dfAnHA4WSZq9Xsurjbl2wMj7zqfOIjaHQI1Bl7yKzUxXAi+kbMr8iO2RhJmBA==} - peerDependencies: - '@azure/app-configuration': ^1.11.0 - '@azure/cosmos': ^4.9.1 - '@azure/data-tables': ^13.3.2 - '@azure/identity': ^4.13.0 - '@azure/keyvault-secrets': ^4.10.0 - '@azure/storage-blob': ^12.31.0 - '@capacitor/preferences': ^6 || ^7 || ^8 - '@deno/kv': '>=0.13.0' - '@netlify/blobs': ^6.5.0 || ^7.0.0 || ^8.1.0 || ^9.0.0 || ^10.0.0 - '@planetscale/database': ^1.19.0 - '@upstash/redis': ^1.36.2 - '@vercel/blob': '>=0.27.3' - '@vercel/functions': ^2.2.12 || ^3.0.0 - '@vercel/kv': ^1.0.1 - aws4fetch: ^1.0.20 - chokidar: ^4 || ^5 - db0: '>=0.3.4' - idb-keyval: ^6.2.2 - ioredis: ^5.9.3 - lru-cache: ^11.2.6 - mongodb: ^6 || ^7 - ofetch: '*' - uploadthing: ^7.7.4 - peerDependenciesMeta: - '@azure/app-configuration': - optional: true - '@azure/cosmos': - optional: true - '@azure/data-tables': - optional: true - '@azure/identity': - optional: true - '@azure/keyvault-secrets': - optional: true - '@azure/storage-blob': - optional: true - '@capacitor/preferences': - optional: true - '@deno/kv': - optional: true - '@netlify/blobs': - optional: true - '@planetscale/database': - optional: true - '@upstash/redis': - optional: true - '@vercel/blob': - optional: true - '@vercel/functions': - optional: true - '@vercel/kv': - optional: true - aws4fetch: - optional: true - chokidar: - optional: true - db0: - optional: true - idb-keyval: - optional: true - ioredis: - optional: true - lru-cache: - optional: true - mongodb: - optional: true - ofetch: - optional: true - uploadthing: - optional: true + unstorage@2.0.0-alpha.10: + resolution: {integrity: sha512-6h1veZp8gnp4dGllf0tDijoXxDYymJu251IpKKkrSVH+QHL6tXFbwG85KM+CBHSgpkkgtPuIiZ9oLCLP5+1Evw==} until-async@3.0.2: resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==} @@ -29480,7 +28982,7 @@ packages: engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: typescript: '*' - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: vite: optional: true @@ -29488,14 +28990,14 @@ packages: vite-plugin-externalize-deps@0.10.0: resolution: {integrity: sha512-eQrtpT/Do7AvDn76l1yL6ZHyXJ+UWH2LaHVqhAes9go54qaAnPZuMbgxcroQ/7WY3ZyetZzYW2quQnDF0DV5qg==} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 vite-plugin-solid@2.11.10: resolution: {integrity: sha512-Yr1dQybmtDtDAHkii6hXuc1oVH9CPcS/Zb2jN/P36qqcrkNnVPsMTzQ06jyzFPFjj3U1IYKMVt/9ZqcwGCEbjw==} peerDependencies: '@testing-library/jest-dom': ^5.16.6 || ^5.17.0 || ^6.* solid-js: 1.9.12 - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: '@testing-library/jest-dom': optional: true @@ -29505,7 +29007,7 @@ packages: peerDependencies: '@testing-library/jest-dom': ^5.16.6 || ^5.17.0 || ^6.* solid-js: 1.9.12 - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: '@testing-library/jest-dom': optional: true @@ -29513,15 +29015,15 @@ packages: vite-tsconfig-paths@6.1.1: resolution: {integrity: sha512-2cihq7zliibCCZ8P9cKJrQBkfgdvcFkOOc3Y02o3GWUDLgqjWsZudaoiuOwO/gzTzy17cS5F7ZPo4bsnS4DGkg==} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 - vite@8.0.14: - resolution: {integrity: sha512-s4BJJ+5y1pYL6Otw51FHhVJQhPnuRinKig64g/1+EUNaJsd3gCKdD31IPFvswUgW9/60QT9oFHbZHbQK5imcxw==} + vite@8.3.4: + resolution: {integrity: sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: '@types/node': 25.0.9 - '@vitejs/devtools': ^0.1.18 + '@vitejs/devtools': ^0.7.1 esbuild: ^0.27.0 || ^0.28.0 jiti: '>=1.21.0' less: ^4.0.0 @@ -29561,7 +29063,7 @@ packages: vitefu@1.1.1: resolution: {integrity: sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: vite: optional: true @@ -29569,7 +29071,7 @@ packages: vitefu@1.1.3: resolution: {integrity: sha512-ub4okH7Z5KLjb6hDyjqrGXqWtWvoYdU3IGm/NorpgHncKoLTCfRIbvlhBm7r0YstIaQRYlp4yEbFqDcKSzXSSg==} peerDependencies: - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: vite: optional: true @@ -29590,7 +29092,7 @@ packages: '@vitest/ui': 4.1.4 happy-dom: '*' jsdom: '*' - vite: ^8.0.14 + vite: ^8.3.4 peerDependenciesMeta: '@edge-runtime/vm': optional: true @@ -31132,12 +30634,12 @@ snapshots: optionalDependencies: workerd: 1.20260317.1 - '@cloudflare/vite-plugin@1.29.1(vite@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.9.0))(workerd@1.20260317.1)(wrangler@4.75.0)': + '@cloudflare/vite-plugin@1.29.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0)': dependencies: '@cloudflare/unenv-preset': 2.15.0(unenv@2.0.0-rc.24)(workerd@1.20260317.1) miniflare: 4.20260317.0 unenv: 2.0.0-rc.24 - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) wrangler: 4.75.0 ws: 8.18.0 transitivePeerDependencies: @@ -31171,12 +30673,12 @@ snapshots: - debug - supports-color - '@codspeed/vitest-plugin@5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@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.9.0))(vitest@4.1.4)': + '@codspeed/vitest-plugin@5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(tinybench@2.9.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vitest@4.1.4)': dependencies: '@codspeed/core': 5.7.1(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2) tinybench: 2.9.0 - vite: 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.9.0) - vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) transitivePeerDependencies: - debug - supports-color @@ -33292,13 +32794,6 @@ snapshots: '@tybys/wasm-util': 0.10.3 optional: true - '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@tybys/wasm-util': 0.10.3 - optional: true - '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': dependencies: '@emnapi/core': 1.11.3 @@ -33403,7 +32898,7 @@ snapshots: parse-gitignore: 2.0.0 semver: 7.8.5 - '@netlify/dev@5.1.0(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)': + '@netlify/dev@5.1.0(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)': dependencies: '@netlify/ai': 1.0.1 '@netlify/blobs': 11.0.3(supports-color@10.2.2) @@ -33413,7 +32908,7 @@ snapshots: '@netlify/edge-functions-dev': 2.0.1 '@netlify/functions-dev': 2.0.5(rollup@4.63.1)(supports-color@10.2.2) '@netlify/headers': 3.0.1 - '@netlify/images': 2.0.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) + '@netlify/images': 2.0.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2)) '@netlify/redirects': 4.0.2 '@netlify/runtime': 5.0.3(supports-color@10.2.2) '@netlify/server-dev': 0.1.1 @@ -33516,9 +33011,9 @@ snapshots: dependencies: '@netlify/headers-parser': 10.1.1 - '@netlify/images@2.0.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))': + '@netlify/images@2.0.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))': dependencies: - ipx: 3.1.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) + ipx: 3.1.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2)) transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -33603,10 +33098,10 @@ snapshots: '@netlify/types@3.0.0': {} - '@netlify/vite-plugin-tanstack-start@1.3.19(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0))': + '@netlify/vite-plugin-tanstack-start@1.3.19(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: - '@netlify/vite-plugin': 3.0.1(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) - vite: 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.9.0) + '@netlify/vite-plugin': 3.0.1(babel-plugin-macros@3.1.0)(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) optionalDependencies: '@tanstack/solid-start': link:packages/solid-start transitivePeerDependencies: @@ -33637,12 +33132,12 @@ snapshots: - supports-color - uploadthing - '@netlify/vite-plugin@3.0.1(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0))': + '@netlify/vite-plugin@3.0.1(babel-plugin-macros@3.1.0)(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: - '@netlify/dev': 5.1.0(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2) + '@netlify/dev': 5.1.0(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2))(rollup@4.63.1)(supports-color@10.2.2) '@netlify/dev-utils': 6.0.1 dedent: 1.7.2(babel-plugin-macros@3.1.0) - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -33882,74 +33377,7 @@ snapshots: '@opentelemetry/semantic-conventions@1.41.1': {} - '@oxc-minify/binding-android-arm-eabi@0.110.0': - optional: true - - '@oxc-minify/binding-android-arm64@0.110.0': - optional: true - - '@oxc-minify/binding-darwin-arm64@0.110.0': - optional: true - - '@oxc-minify/binding-darwin-x64@0.110.0': - optional: true - - '@oxc-minify/binding-freebsd-x64@0.110.0': - optional: true - - '@oxc-minify/binding-linux-arm-gnueabihf@0.110.0': - optional: true - - '@oxc-minify/binding-linux-arm-musleabihf@0.110.0': - optional: true - - '@oxc-minify/binding-linux-arm64-gnu@0.110.0': - optional: true - - '@oxc-minify/binding-linux-arm64-musl@0.110.0': - optional: true - - '@oxc-minify/binding-linux-ppc64-gnu@0.110.0': - optional: true - - '@oxc-minify/binding-linux-riscv64-gnu@0.110.0': - optional: true - - '@oxc-minify/binding-linux-riscv64-musl@0.110.0': - optional: true - - '@oxc-minify/binding-linux-s390x-gnu@0.110.0': - optional: true - - '@oxc-minify/binding-linux-x64-gnu@0.110.0': - optional: true - - '@oxc-minify/binding-linux-x64-musl@0.110.0': - optional: true - - '@oxc-minify/binding-openharmony-arm64@0.110.0': - optional: true - - '@oxc-minify/binding-wasm32-wasi@0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': - dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - transitivePeerDependencies: - - '@emnapi/core' - - '@emnapi/runtime' - optional: true - - '@oxc-minify/binding-win32-arm64-msvc@0.110.0': - optional: true - - '@oxc-minify/binding-win32-ia32-msvc@0.110.0': - optional: true - - '@oxc-minify/binding-win32-x64-msvc@0.110.0': - optional: true - - '@oxc-project/types@0.115.0': {} - - '@oxc-project/types@0.132.0': {} + '@oxc-project/types@0.153.0': {} '@oxc-resolver/binding-android-arm-eabi@11.19.1': optional: true @@ -34016,71 +33444,6 @@ snapshots: '@oxc-resolver/binding-win32-x64-msvc@11.19.1': optional: true - '@oxc-transform/binding-android-arm-eabi@0.110.0': - optional: true - - '@oxc-transform/binding-android-arm64@0.110.0': - optional: true - - '@oxc-transform/binding-darwin-arm64@0.110.0': - optional: true - - '@oxc-transform/binding-darwin-x64@0.110.0': - optional: true - - '@oxc-transform/binding-freebsd-x64@0.110.0': - optional: true - - '@oxc-transform/binding-linux-arm-gnueabihf@0.110.0': - optional: true - - '@oxc-transform/binding-linux-arm-musleabihf@0.110.0': - optional: true - - '@oxc-transform/binding-linux-arm64-gnu@0.110.0': - optional: true - - '@oxc-transform/binding-linux-arm64-musl@0.110.0': - optional: true - - '@oxc-transform/binding-linux-ppc64-gnu@0.110.0': - optional: true - - '@oxc-transform/binding-linux-riscv64-gnu@0.110.0': - optional: true - - '@oxc-transform/binding-linux-riscv64-musl@0.110.0': - optional: true - - '@oxc-transform/binding-linux-s390x-gnu@0.110.0': - optional: true - - '@oxc-transform/binding-linux-x64-gnu@0.110.0': - optional: true - - '@oxc-transform/binding-linux-x64-musl@0.110.0': - optional: true - - '@oxc-transform/binding-openharmony-arm64@0.110.0': - optional: true - - '@oxc-transform/binding-wasm32-wasi@0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': - dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - transitivePeerDependencies: - - '@emnapi/core' - - '@emnapi/runtime' - optional: true - - '@oxc-transform/binding-win32-arm64-msvc@0.110.0': - optional: true - - '@oxc-transform/binding-win32-ia32-msvc@0.110.0': - optional: true - - '@oxc-transform/binding-win32-x64-msvc@0.110.0': - optional: true - '@panva/hkdf@1.2.1': {} '@parcel/watcher-android-arm64@2.5.1': @@ -35116,129 +34479,66 @@ snapshots: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@rolldown/binding-android-arm64@1.0.0-rc.9': + '@rolldown/binding-android-arm-eabi@1.2.13': optional: true - '@rolldown/binding-android-arm64@1.0.2': + '@rolldown/binding-android-arm64@1.2.13': optional: true - '@rolldown/binding-darwin-arm64@1.0.0-rc.9': + '@rolldown/binding-darwin-arm64@1.2.13': optional: true - '@rolldown/binding-darwin-arm64@1.0.2': + '@rolldown/binding-darwin-x64@1.2.13': optional: true - '@rolldown/binding-darwin-x64@1.0.0-rc.9': + '@rolldown/binding-freebsd-x64@1.2.13': optional: true - '@rolldown/binding-darwin-x64@1.0.2': + '@rolldown/binding-linux-arm-gnueabihf@1.2.13': optional: true - '@rolldown/binding-freebsd-x64@1.0.0-rc.9': + '@rolldown/binding-linux-arm64-gnu@1.2.13': optional: true - '@rolldown/binding-freebsd-x64@1.0.2': + '@rolldown/binding-linux-arm64-musl@1.2.13': optional: true - '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.9': + '@rolldown/binding-linux-ppc64-gnu@1.2.13': optional: true - '@rolldown/binding-linux-arm-gnueabihf@1.0.2': + '@rolldown/binding-linux-s390x-gnu@1.2.13': optional: true - '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.9': + '@rolldown/binding-linux-x64-gnu@1.2.13': optional: true - '@rolldown/binding-linux-arm64-gnu@1.0.2': + '@rolldown/binding-linux-x64-musl@1.2.13': optional: true - '@rolldown/binding-linux-arm64-musl@1.0.0-rc.9': + '@rolldown/binding-openharmony-arm64@1.2.13': optional: true - '@rolldown/binding-linux-arm64-musl@1.0.2': + '@rolldown/binding-win32-arm64-msvc@1.2.13': optional: true - '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.9': + '@rolldown/binding-win32-x64-msvc@1.2.13': optional: true - '@rolldown/binding-linux-ppc64-gnu@1.0.2': - optional: true - - '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.9': - optional: true - - '@rolldown/binding-linux-s390x-gnu@1.0.2': - optional: true - - '@rolldown/binding-linux-x64-gnu@1.0.0-rc.9': - optional: true - - '@rolldown/binding-linux-x64-gnu@1.0.2': - optional: true - - '@rolldown/binding-linux-x64-musl@1.0.0-rc.9': - optional: true - - '@rolldown/binding-linux-x64-musl@1.0.2': - optional: true - - '@rolldown/binding-openharmony-arm64@1.0.0-rc.9': - optional: true - - '@rolldown/binding-openharmony-arm64@1.0.2': - optional: true - - '@rolldown/binding-wasm32-wasi@1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': - dependencies: - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - transitivePeerDependencies: - - '@emnapi/core' - - '@emnapi/runtime' - optional: true - - '@rolldown/binding-wasm32-wasi@1.0.2': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) - optional: true - - '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.9': - optional: true - - '@rolldown/binding-win32-arm64-msvc@1.0.2': - optional: true - - '@rolldown/binding-win32-x64-msvc@1.0.0-rc.9': - optional: true - - '@rolldown/binding-win32-x64-msvc@1.0.2': - optional: true - - '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0))': + '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@babel/core': 7.29.0(supports-color@10.2.2) picomatch: 4.0.7 - rolldown: 1.0.2 + rolldown: 1.2.13 optionalDependencies: - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0))': + '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) picomatch: 4.0.7 - rolldown: 1.0.2 + rolldown: 1.2.13 optionalDependencies: - vite: 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.9.0) - optional: true - - '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': - dependencies: - '@babel/core': 7.29.7(supports-color@10.2.2) - picomatch: 4.0.7 - rolldown: 1.0.2 - optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) optional: true '@rolldown/pluginutils@1.0.0-beta.27': {} @@ -36293,12 +35593,12 @@ snapshots: postcss: 8.5.8 tailwindcss: 4.2.2 - '@tailwindcss/vite@4.2.2(vite@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.9.0))': + '@tailwindcss/vite@4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@tailwindcss/node': 4.2.2 '@tailwindcss/oxide': 4.2.2 tailwindcss: 4.2.2 - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) '@tailwindcss/webpack@4.3.1(@rspack/core@2.2.7(@swc/helpers@0.5.23))(webpack@5.110.3)': dependencies: @@ -36308,7 +35608,7 @@ snapshots: tailwindcss: 4.3.1 optionalDependencies: '@rspack/core': 2.2.7(@swc/helpers@0.5.23) - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) '@tanstack/devtools-client@0.0.4': dependencies: @@ -36495,36 +35795,48 @@ snapshots: '@tanstack/virtual-core@3.13.13': {} - '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0))': + '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: - vite: 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.9.0) - vite-plugin-dts: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)) - vite-plugin-externalize-deps: 0.10.0(vite@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.9.0)) - vite-tsconfig-paths: 6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite-plugin-dts: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-plugin-externalize-deps: 0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-tsconfig-paths: 6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) transitivePeerDependencies: - '@types/node' - rollup - supports-color - typescript - '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vite-plugin-dts: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - vite-plugin-externalize-deps: 0.10.0(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - vite-tsconfig-paths: 6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite-plugin-dts: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-plugin-externalize-deps: 0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-tsconfig-paths: 6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) transitivePeerDependencies: - '@types/node' - rollup - supports-color - typescript - '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vite-plugin-dts: 4.2.3(@types/node@25.0.9)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - vite-plugin-externalize-deps: 0.10.0(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - vite-tsconfig-paths: 6.1.1(supports-color@10.2.2)(typescript@5.9.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite-plugin-dts: 4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-plugin-externalize-deps: 0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-tsconfig-paths: 6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + transitivePeerDependencies: + - '@types/node' + - rollup + - supports-color + - typescript + + '@tanstack/vite-config@0.5.2(@types/node@25.0.9)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + dependencies: + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite-plugin-dts: 4.2.3(@types/node@25.0.9)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-plugin-externalize-deps: 0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + vite-tsconfig-paths: 6.1.1(supports-color@10.2.2)(typescript@5.9.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) transitivePeerDependencies: - '@types/node' - rollup @@ -37578,7 +36890,7 @@ snapshots: - rollup - supports-color - '@vitejs/plugin-react@4.7.0(supports-color@10.2.2)(vite@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.9.0))': + '@vitejs/plugin-react@4.7.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2)) @@ -37586,47 +36898,27 @@ snapshots: '@rolldown/pluginutils': 1.0.0-beta.27 '@types/babel__core': 7.20.5 react-refresh: 0.17.0 - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - supports-color - '@vitejs/plugin-react@4.7.0(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': - dependencies: - '@babel/core': 7.29.7(supports-color@10.2.2) - '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2)) - '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.7(supports-color@10.2.2)) - '@rolldown/pluginutils': 1.0.0-beta.27 - '@types/babel__core': 7.20.5 - react-refresh: 0.17.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - transitivePeerDependencies: - - supports-color - - '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0))': + '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.7 - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) optionalDependencies: - '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)) + '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.0(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) babel-plugin-react-compiler: 1.0.0 - '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@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.9.0))': + '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.7 - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) optionalDependencies: - '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@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.9.0)) + '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.2.13)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) babel-plugin-react-compiler: 1.0.0 - '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': - dependencies: - '@rolldown/pluginutils': 1.0.0-rc.7 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - optionalDependencies: - '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@10.2.2))(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - babel-plugin-react-compiler: 1.0.0 - - '@vitejs/plugin-rsc@0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@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.9.0))': + '@vitejs/plugin-rsc@0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@rolldown/pluginutils': 1.0.1 es-module-lexer: 2.3.1 @@ -37637,128 +36929,114 @@ snapshots: srvx: 0.11.22 strip-literal: 3.1.0 turbo-stream: 3.2.0 - vite: 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.9.0) - vitefu: 1.1.3(vite@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.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitefu: 1.1.3(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - '@vitejs/plugin-rsc@0.5.30(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': - dependencies: - '@rolldown/pluginutils': 1.0.1 - es-module-lexer: 2.3.1 - estree-walker: 3.0.3 - magic-string: 0.30.21 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - srvx: 0.11.22 - strip-literal: 3.1.0 - turbo-stream: 3.2.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vitefu: 1.1.3(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) - - '@vitejs/plugin-vue-jsx@4.2.0(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@vitejs/plugin-vue-jsx@4.2.0(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) '@rolldown/pluginutils': 1.0.1 '@vue/babel-plugin-jsx': 1.5.0(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(@typescript/typescript6@6.0.2) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue-jsx@5.1.5(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@vitejs/plugin-vue-jsx@5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2)) '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) '@rolldown/pluginutils': 1.0.0-rc.9 '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(@typescript/typescript6@6.0.2) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue-jsx@5.1.5(supports-color@10.2.2)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3))': + '@vitejs/plugin-vue-jsx@5.1.5(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3))': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2)) '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) '@rolldown/pluginutils': 1.0.0-rc.9 '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2) - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(typescript@5.8.3) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue-jsx@5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@vitejs/plugin-vue-jsx@5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: '@babel/core': 7.29.7(supports-color@7.2.0) '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0)) '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) '@rolldown/pluginutils': 1.0.0-rc.9 '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(@typescript/typescript6@6.0.2) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue-jsx@5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.8.3))': + '@vitejs/plugin-vue-jsx@5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3))': dependencies: '@babel/core': 7.29.7(supports-color@7.2.0) '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0)) '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) '@rolldown/pluginutils': 1.0.0-rc.9 '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(typescript@5.8.3) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue-jsx@5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@5.9.3))': + '@vitejs/plugin-vue-jsx@5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.9.3))': dependencies: '@babel/core': 7.29.7(supports-color@7.2.0) '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0)) '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) '@rolldown/pluginutils': 1.0.0-rc.9 '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(typescript@5.9.3) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue-jsx@5.1.5(supports-color@7.2.0)(vite@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.9.0))(vue@3.5.25(typescript@7.0.2))': + '@vitejs/plugin-vue-jsx@5.1.5(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@7.0.2))': dependencies: '@babel/core': 7.29.7(supports-color@7.2.0) '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0)) '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) '@rolldown/pluginutils': 1.0.0-rc.9 '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0) - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(typescript@7.0.2) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@6.0.5(vite@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.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@vitejs/plugin-vue@6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(@typescript/typescript6@6.0.2) - '@vitejs/plugin-vue@6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.8.3))': + '@vitejs/plugin-vue@6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.8.3))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(typescript@5.8.3) - '@vitejs/plugin-vue@6.0.5(vite@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.9.0))(vue@3.5.25(typescript@5.9.3))': + '@vitejs/plugin-vue@6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@5.9.3))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(typescript@5.9.3) - '@vitejs/plugin-vue@6.0.5(vite@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.9.0))(vue@3.5.25(typescript@7.0.2))': + '@vitejs/plugin-vue@6.0.5(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(vue@3.5.25(typescript@7.0.2))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) vue: 3.5.25(typescript@7.0.2) '@vitest/expect@4.1.4': @@ -37770,32 +37048,32 @@ snapshots: chai: 6.2.2 tinyrainbow: 3.1.0 - '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0))': + '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@vitest/spy': 4.1.4 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@vitest/spy': 4.1.4 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': + '@vitest/mocker@4.1.4(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))': dependencies: '@vitest/spy': 4.1.4 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: msw: 2.15.0(@types/node@25.0.9)(typescript@5.9.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) '@vitest/pretty-format@4.1.4': dependencies: @@ -37824,7 +37102,7 @@ snapshots: sirv: 3.0.2 tinyglobby: 0.2.17 tinyrainbow: 3.1.0 - vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitest/utils@4.1.4': dependencies: @@ -37975,7 +37253,7 @@ snapshots: '@vue/shared': 3.5.25 entities: 4.5.0 estree-walker: 2.0.2 - source-map-js: 1.2.1 + source-map-js: 1.2.2 '@vue/compiler-dom@3.5.25': dependencies: @@ -37991,8 +37269,8 @@ snapshots: '@vue/shared': 3.5.25 estree-walker: 2.0.2 magic-string: 0.30.21 - postcss: 8.5.23 - source-map-js: 1.2.1 + postcss: 8.5.29 + source-map-js: 1.2.2 '@vue/compiler-ssr@3.5.25': dependencies: @@ -38167,7 +37445,7 @@ snapshots: '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.110.3)': dependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.110.3) optional: true @@ -38178,7 +37456,7 @@ snapshots: '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.110.3)': dependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.110.3) optional: true @@ -38189,7 +37467,7 @@ snapshots: '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.2.4)(webpack@5.110.3)': dependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.110.3) optionalDependencies: webpack-dev-server: 5.2.4(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.110.3) @@ -38736,7 +38014,7 @@ snapshots: react: 19.2.3 react-dom: 19.2.3(react@19.2.3) solid-js: 1.9.12 - vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) vue: 3.5.25(@typescript/typescript6@6.0.2) transitivePeerDependencies: - '@cloudflare/workers-types' @@ -39369,17 +38647,9 @@ snapshots: optionalDependencies: srvx: 0.11.22 - crossws@0.4.3(srvx@0.10.1): + crossws@0.4.12(srvx@1.0.5): optionalDependencies: - srvx: 0.10.1 - - crossws@0.4.4(srvx@0.11.22): - optionalDependencies: - srvx: 0.11.22 - - crossws@0.4.5(srvx@0.11.22): - optionalDependencies: - srvx: 0.11.22 + srvx: 1.0.5 css-loader@7.1.2(webpack@5.97.1): dependencies: @@ -39413,7 +38683,7 @@ snapshots: css-tree@2.2.1: dependencies: mdn-data: 2.0.28 - source-map-js: 1.2.1 + source-map-js: 1.2.2 css-tree@3.2.1: dependencies: @@ -39472,18 +38742,14 @@ snapshots: dependencies: '@babel/runtime': 7.26.7 - db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3): - optionalDependencies: - '@electric-sql/pglite': 0.3.16 - '@libsql/client': 0.15.15 - mysql2: 3.15.3 - db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3): optionalDependencies: '@electric-sql/pglite': 0.3.2 '@libsql/client': 0.15.15 mysql2: 3.15.3 + db0@0.4.1: {} + de-indent@1.0.2: {} debug@2.6.9(supports-color@10.2.2): @@ -39626,11 +38892,11 @@ snapshots: dependencies: node-source-walk: 7.0.1 - detective-postcss@7.0.1(postcss@8.5.23): + detective-postcss@7.0.1(postcss@8.5.29): dependencies: is-url: 1.2.4 - postcss: 8.5.23 - postcss-values-parser: 6.0.2(postcss@8.5.23) + postcss: 8.5.29 + postcss-values-parser: 6.0.2(postcss@8.5.29) detective-sass@6.0.1: dependencies: @@ -39850,13 +39116,12 @@ snapshots: env-paths@3.0.0: {} - env-runner@0.1.6(miniflare@4.20260317.0): + env-runner@0.2.3: dependencies: - crossws: 0.4.5(srvx@0.11.22) - httpxy: 0.3.1 - srvx: 0.11.22 - optionalDependencies: - miniflare: 4.20260317.0 + crossws: 0.4.12(srvx@1.0.5) + exsolve: 1.1.1 + httpxy: 0.5.5 + srvx: 1.0.5 envinfo@7.14.0: {} @@ -41084,26 +40349,20 @@ snapshots: ufo: 1.6.4 uncrypto: 0.1.3 - h3@2.0.1-rc.14(crossws@0.4.3(srvx@0.10.1)): - dependencies: - rou3: 0.7.12 - srvx: 0.11.22 - optionalDependencies: - crossws: 0.4.3(srvx@0.10.1) - - h3@2.0.1-rc.16(crossws@0.4.4(srvx@0.11.22)): + h3@2.0.1-rc.20(crossws@0.4.12(srvx@1.0.5)): dependencies: rou3: 0.8.1 srvx: 0.11.22 optionalDependencies: - crossws: 0.4.4(srvx@0.11.22) + crossws: 0.4.12(srvx@1.0.5) - h3@2.0.1-rc.20(crossws@0.4.12(srvx@0.11.22)): + h3@2.0.1-rc.32(crossws@0.4.12(srvx@1.0.5))(ocache@0.3.0): dependencies: - rou3: 0.8.1 - srvx: 0.11.22 + rou3: 0.9.2 + srvx: 1.0.5 optionalDependencies: - crossws: 0.4.12(srvx@0.11.22) + crossws: 0.4.12(srvx@1.0.5) + ocache: 0.3.0 handle-thing@2.0.1: {} @@ -41162,7 +40421,7 @@ snapshots: hookable@5.5.3: {} - hookable@6.1.0: {} + hookable@6.1.2: {} hosted-git-info@7.0.2: dependencies: @@ -41329,8 +40588,6 @@ snapshots: transitivePeerDependencies: - supports-color - httpxy@0.3.1: {} - httpxy@0.5.5: {} human-id@4.1.1: {} @@ -41436,7 +40693,7 @@ snapshots: ipaddr.js@2.2.0: {} - ipx@3.1.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)): + ipx@3.1.1(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2)): dependencies: '@fastify/accept-negotiator': 2.0.1 citty: 0.1.6 @@ -41446,13 +40703,13 @@ snapshots: etag: 1.8.1 h3: 1.15.11 image-meta: 0.2.2 - listhen: 1.10.1(srvx@0.11.22) + listhen: 1.10.1 ofetch: 1.5.1 pathe: 2.0.3 sharp: 0.34.5 svgo: 4.0.0 ufo: 1.6.4 - unstorage: 1.17.5(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) + unstorage: 1.17.5(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2)) xss: 1.0.15 transitivePeerDependencies: - '@azure/app-configuration' @@ -42053,6 +41310,27 @@ snapshots: lines-and-columns@2.0.3: {} + listhen@1.10.1: + dependencies: + '@parcel/watcher-wasm': 2.6.0 + citty: 0.2.2 + consola: 3.4.2 + crossws: 0.4.12(srvx@1.0.5) + defu: 6.1.7 + get-port-please: 3.2.0 + h3: 1.15.11 + http-shutdown: 1.2.2 + jiti: 2.7.0 + node-forge: 1.4.0 + pathe: 2.0.3 + std-env: 4.2.0 + tinyclip: 0.1.15 + ufo: 1.6.4 + untun: 0.2.2 + uqr: 0.1.3 + transitivePeerDependencies: + - srvx + listhen@1.10.1(srvx@0.11.22): dependencies: '@parcel/watcher-wasm': 2.6.0 @@ -42319,13 +41597,13 @@ snapshots: minimist@1.2.8: {} - minimizer-webpack-plugin@5.10.0(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack@5.110.3): + minimizer-webpack-plugin@5.10.0(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack@5.110.3): dependencies: '@jridgewell/trace-mapping': 0.3.31 jest-worker: 27.5.1 schema-utils: 4.3.3 terser: 5.51.2 - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) optionalDependencies: '@swc/core': 1.15.33(@swc/helpers@0.5.23) clean-css: 5.3.3 @@ -42333,7 +41611,7 @@ snapshots: esbuild: 0.28.2 html-minifier-terser: 6.1.0 lightningcss: 1.33.0 - postcss: 8.5.23 + postcss: 8.5.29 sharp: 0.35.4(@types/node@25.0.9) svgo: 4.0.0 @@ -42496,10 +41774,10 @@ snapshots: nanoid@3.3.11: {} - nanoid@3.3.12: {} - nanoid@3.3.18: {} + nanoid@3.3.19: {} + nanostores@1.3.0: {} napi-postinstall@0.3.3: {} @@ -42545,224 +41823,25 @@ snapshots: - '@types/node' - babel-plugin-macros - nf3@0.3.11: {} + nf3@0.3.24: {} - nf3@0.3.6: {} - - nitro@3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0)): + nitro@3.0.260903-beta: dependencies: consola: 3.4.2 - crossws: 0.4.3(srvx@0.10.1) - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) - h3: 2.0.1-rc.14(crossws@0.4.3(srvx@0.10.1)) - jiti: 2.6.1 - nf3: 0.3.6 - ofetch: 2.0.0-alpha.3 - ohash: 2.0.11 - oxc-minify: 0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - oxc-transform: 0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - srvx: 0.10.1 - undici: 7.24.4 + crossws: 0.4.12(srvx@1.0.5) + db0: 0.4.1 + env-runner: 0.2.3 + h3: 2.0.1-rc.32(crossws@0.4.12(srvx@1.0.5))(ocache@0.3.0) + hookable: 6.1.2 + nf3: 0.3.24 + ocache: 0.3.0 + rolldown: 1.2.13 + rou3: 0.9.2 + srvx: 1.0.5 unenv: 2.0.0-rc.24 - unstorage: 2.0.0-alpha.5(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) - optionalDependencies: - rolldown: 1.0.2 - rollup: 4.63.1 - vite: 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.9.0) - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@emnapi/core' - - '@emnapi/runtime' - - '@libsql/client' - - '@netlify/blobs' - - '@planetscale/database' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/functions' - - '@vercel/kv' - - aws4fetch - - better-sqlite3 - - chokidar - - drizzle-orm - - idb-keyval - - ioredis - - lru-cache - - mongodb - - mysql2 - - sqlite3 - - uploadthing + unstorage: 2.0.0-alpha.10 - nitro@3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)): - dependencies: - consola: 3.4.2 - crossws: 0.4.4(srvx@0.11.22) - db0: 0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3) - env-runner: 0.1.6(miniflare@4.20260317.0) - h3: 2.0.1-rc.16(crossws@0.4.4(srvx@0.11.22)) - hookable: 6.1.0 - nf3: 0.3.11 - ocache: 0.1.2 - ofetch: 2.0.0-alpha.3 - ohash: 2.0.11 - rolldown: 1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - srvx: 0.11.22 - unenv: 2.0.0-rc.24 - unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) - optionalDependencies: - dotenv: 17.4.2 - giget: 2.0.0 - jiti: 2.7.0 - rollup: 4.63.1 - vite: 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.9.0) - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@emnapi/core' - - '@emnapi/runtime' - - '@libsql/client' - - '@netlify/blobs' - - '@planetscale/database' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/functions' - - '@vercel/kv' - - aws4fetch - - better-sqlite3 - - chokidar - - drizzle-orm - - idb-keyval - - ioredis - - lru-cache - - miniflare - - mongodb - - mysql2 - - sqlite3 - - uploadthing - - nitro@3.0.260311-beta(@electric-sql/pglite@0.3.16)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): - dependencies: - consola: 3.4.2 - crossws: 0.4.4(srvx@0.11.22) - db0: 0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3) - env-runner: 0.1.6(miniflare@4.20260317.0) - h3: 2.0.1-rc.16(crossws@0.4.4(srvx@0.11.22)) - hookable: 6.1.0 - nf3: 0.3.11 - ocache: 0.1.2 - ofetch: 2.0.0-alpha.3 - ohash: 2.0.11 - rolldown: 1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - srvx: 0.11.22 - unenv: 2.0.0-rc.24 - unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) - optionalDependencies: - dotenv: 17.4.2 - giget: 3.3.1 - jiti: 2.7.0 - rollup: 4.63.1 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@emnapi/core' - - '@emnapi/runtime' - - '@libsql/client' - - '@netlify/blobs' - - '@planetscale/database' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/functions' - - '@vercel/kv' - - aws4fetch - - better-sqlite3 - - chokidar - - drizzle-orm - - idb-keyval - - ioredis - - lru-cache - - miniflare - - mongodb - - mysql2 - - sqlite3 - - uploadthing - - nitro@3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(ioredis@5.11.1(supports-color@10.2.2))(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(rollup@4.63.1)(vite@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.9.0)): - dependencies: - consola: 3.4.2 - crossws: 0.4.4(srvx@0.11.22) - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) - env-runner: 0.1.6(miniflare@4.20260317.0) - h3: 2.0.1-rc.16(crossws@0.4.4(srvx@0.11.22)) - hookable: 6.1.0 - nf3: 0.3.11 - ocache: 0.1.2 - ofetch: 2.0.0-alpha.3 - ohash: 2.0.11 - rolldown: 1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - srvx: 0.11.22 - unenv: 2.0.0-rc.24 - unstorage: 2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3) - optionalDependencies: - dotenv: 17.4.2 - giget: 2.0.0 - jiti: 2.7.0 - rollup: 4.63.1 - vite: 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.9.0) - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@emnapi/core' - - '@emnapi/runtime' - - '@libsql/client' - - '@netlify/blobs' - - '@planetscale/database' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/functions' - - '@vercel/kv' - - aws4fetch - - better-sqlite3 - - chokidar - - drizzle-orm - - idb-keyval - - ioredis - - lru-cache - - miniflare - - mongodb - - mysql2 - - sqlite3 - - uploadthing - - nitropack@2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.2.7(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.0.2)(srvx@0.11.22)(supports-color@10.2.2)(vite@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.9.0))(webpack@5.110.3): + nitropack@2.13.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(@rspack/core@2.2.7(@swc/helpers@0.5.23))(mysql2@3.15.3)(rolldown@1.2.13)(srvx@0.11.22)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3): dependencies: '@cloudflare/kv-asset-handler': 0.4.2 '@rollup/plugin-alias': 6.0.0(rollup@4.63.1) @@ -42815,7 +41894,7 @@ snapshots: pretty-bytes: 7.1.0 radix3: 1.1.2 rollup: 4.63.1 - rollup-plugin-visualizer: 7.1.1(rolldown@1.0.2)(rollup@4.63.1) + rollup-plugin-visualizer: 7.1.1(rolldown@1.2.13)(rollup@4.63.1) scule: 1.3.0 semver: 7.8.2 serve-placeholder: 2.0.2 @@ -42827,7 +41906,7 @@ snapshots: uncrypto: 0.1.3 unctx: 2.5.0 unenv: 2.0.0-rc.24 - unimport: 6.4.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) + unimport: 6.4.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.2.13)(rollup@4.63.1)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3) unplugin-utils: 0.3.1 unstorage: 1.17.5(@netlify/blobs@10.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)) untyped: 2.0.0 @@ -43136,9 +42215,7 @@ snapshots: obug@2.1.1: {} - ocache@0.1.2: - dependencies: - ohash: 2.0.11 + ocache@0.3.0: {} ofetch@1.5.1: dependencies: @@ -43146,8 +42223,6 @@ snapshots: node-fetch-native: 1.6.7 ufo: 1.6.4 - ofetch@2.0.0-alpha.3: {} - ohash@2.0.11: {} on-exit-leak-free@2.1.2: {} @@ -43219,32 +42294,6 @@ snapshots: outvariant@1.4.3: {} - oxc-minify@0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3): - optionalDependencies: - '@oxc-minify/binding-android-arm-eabi': 0.110.0 - '@oxc-minify/binding-android-arm64': 0.110.0 - '@oxc-minify/binding-darwin-arm64': 0.110.0 - '@oxc-minify/binding-darwin-x64': 0.110.0 - '@oxc-minify/binding-freebsd-x64': 0.110.0 - '@oxc-minify/binding-linux-arm-gnueabihf': 0.110.0 - '@oxc-minify/binding-linux-arm-musleabihf': 0.110.0 - '@oxc-minify/binding-linux-arm64-gnu': 0.110.0 - '@oxc-minify/binding-linux-arm64-musl': 0.110.0 - '@oxc-minify/binding-linux-ppc64-gnu': 0.110.0 - '@oxc-minify/binding-linux-riscv64-gnu': 0.110.0 - '@oxc-minify/binding-linux-riscv64-musl': 0.110.0 - '@oxc-minify/binding-linux-s390x-gnu': 0.110.0 - '@oxc-minify/binding-linux-x64-gnu': 0.110.0 - '@oxc-minify/binding-linux-x64-musl': 0.110.0 - '@oxc-minify/binding-openharmony-arm64': 0.110.0 - '@oxc-minify/binding-wasm32-wasi': 0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - '@oxc-minify/binding-win32-arm64-msvc': 0.110.0 - '@oxc-minify/binding-win32-ia32-msvc': 0.110.0 - '@oxc-minify/binding-win32-x64-msvc': 0.110.0 - transitivePeerDependencies: - - '@emnapi/core' - - '@emnapi/runtime' - oxc-resolver@11.19.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3): optionalDependencies: '@oxc-resolver/binding-android-arm-eabi': 11.19.1 @@ -43271,32 +42320,6 @@ snapshots: - '@emnapi/core' - '@emnapi/runtime' - oxc-transform@0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3): - optionalDependencies: - '@oxc-transform/binding-android-arm-eabi': 0.110.0 - '@oxc-transform/binding-android-arm64': 0.110.0 - '@oxc-transform/binding-darwin-arm64': 0.110.0 - '@oxc-transform/binding-darwin-x64': 0.110.0 - '@oxc-transform/binding-freebsd-x64': 0.110.0 - '@oxc-transform/binding-linux-arm-gnueabihf': 0.110.0 - '@oxc-transform/binding-linux-arm-musleabihf': 0.110.0 - '@oxc-transform/binding-linux-arm64-gnu': 0.110.0 - '@oxc-transform/binding-linux-arm64-musl': 0.110.0 - '@oxc-transform/binding-linux-ppc64-gnu': 0.110.0 - '@oxc-transform/binding-linux-riscv64-gnu': 0.110.0 - '@oxc-transform/binding-linux-riscv64-musl': 0.110.0 - '@oxc-transform/binding-linux-s390x-gnu': 0.110.0 - '@oxc-transform/binding-linux-x64-gnu': 0.110.0 - '@oxc-transform/binding-linux-x64-musl': 0.110.0 - '@oxc-transform/binding-openharmony-arm64': 0.110.0 - '@oxc-transform/binding-wasm32-wasi': 0.110.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - '@oxc-transform/binding-win32-arm64-msvc': 0.110.0 - '@oxc-transform/binding-win32-ia32-msvc': 0.110.0 - '@oxc-transform/binding-win32-x64-msvc': 0.110.0 - transitivePeerDependencies: - - '@emnapi/core' - - '@emnapi/runtime' - p-event@6.0.1: dependencies: p-timeout: 6.1.4 @@ -43575,25 +42598,25 @@ snapshots: postcss-value-parser@4.2.0: {} - postcss-values-parser@6.0.2(postcss@8.5.23): + postcss-values-parser@6.0.2(postcss@8.5.29): dependencies: color-name: 1.1.4 is-url-superb: 4.0.0 - postcss: 8.5.23 + postcss: 8.5.29 quote-unquote: 1.0.0 - postcss@8.5.15: - dependencies: - nanoid: 3.3.12 - picocolors: 1.1.1 - source-map-js: 1.2.1 - postcss@8.5.23: dependencies: nanoid: 3.3.18 picocolors: 1.1.1 source-map-js: 1.2.1 + postcss@8.5.29: + dependencies: + nanoid: 3.3.19 + picocolors: 1.1.1 + source-map-js: 1.2.2 + postcss@8.5.3: dependencies: nanoid: 3.3.11 @@ -43639,7 +42662,7 @@ snapshots: detective-amd: 6.0.1 detective-cjs: 6.0.1 detective-es6: 5.0.1 - detective-postcss: 7.0.1(postcss@8.5.23) + detective-postcss: 7.0.1(postcss@8.5.29) detective-sass: 6.0.1 detective-scss: 5.0.1 detective-stylus: 5.0.1 @@ -43647,7 +42670,7 @@ snapshots: detective-vue2: 2.2.0(supports-color@10.2.2)(typescript@5.9.3) module-definition: 6.0.1 node-source-walk: 7.0.1 - postcss: 8.5.23 + postcss: 8.5.29 typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -44175,59 +43198,35 @@ snapshots: glob: 13.0.0 package-json-from-dist: 1.0.1 - rolldown@1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3): + rolldown@1.2.13: dependencies: - '@oxc-project/types': 0.115.0 - '@rolldown/pluginutils': 1.0.0-rc.9 - optionalDependencies: - '@rolldown/binding-android-arm64': 1.0.0-rc.9 - '@rolldown/binding-darwin-arm64': 1.0.0-rc.9 - '@rolldown/binding-darwin-x64': 1.0.0-rc.9 - '@rolldown/binding-freebsd-x64': 1.0.0-rc.9 - '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-rc.9 - '@rolldown/binding-linux-arm64-gnu': 1.0.0-rc.9 - '@rolldown/binding-linux-arm64-musl': 1.0.0-rc.9 - '@rolldown/binding-linux-ppc64-gnu': 1.0.0-rc.9 - '@rolldown/binding-linux-s390x-gnu': 1.0.0-rc.9 - '@rolldown/binding-linux-x64-gnu': 1.0.0-rc.9 - '@rolldown/binding-linux-x64-musl': 1.0.0-rc.9 - '@rolldown/binding-openharmony-arm64': 1.0.0-rc.9 - '@rolldown/binding-wasm32-wasi': 1.0.0-rc.9(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) - '@rolldown/binding-win32-arm64-msvc': 1.0.0-rc.9 - '@rolldown/binding-win32-x64-msvc': 1.0.0-rc.9 - transitivePeerDependencies: - - '@emnapi/core' - - '@emnapi/runtime' - - rolldown@1.0.2: - dependencies: - '@oxc-project/types': 0.132.0 + '@oxc-project/types': 0.153.0 '@rolldown/pluginutils': 1.0.1 optionalDependencies: - '@rolldown/binding-android-arm64': 1.0.2 - '@rolldown/binding-darwin-arm64': 1.0.2 - '@rolldown/binding-darwin-x64': 1.0.2 - '@rolldown/binding-freebsd-x64': 1.0.2 - '@rolldown/binding-linux-arm-gnueabihf': 1.0.2 - '@rolldown/binding-linux-arm64-gnu': 1.0.2 - '@rolldown/binding-linux-arm64-musl': 1.0.2 - '@rolldown/binding-linux-ppc64-gnu': 1.0.2 - '@rolldown/binding-linux-s390x-gnu': 1.0.2 - '@rolldown/binding-linux-x64-gnu': 1.0.2 - '@rolldown/binding-linux-x64-musl': 1.0.2 - '@rolldown/binding-openharmony-arm64': 1.0.2 - '@rolldown/binding-wasm32-wasi': 1.0.2 - '@rolldown/binding-win32-arm64-msvc': 1.0.2 - '@rolldown/binding-win32-x64-msvc': 1.0.2 + '@rolldown/binding-android-arm-eabi': 1.2.13 + '@rolldown/binding-android-arm64': 1.2.13 + '@rolldown/binding-darwin-arm64': 1.2.13 + '@rolldown/binding-darwin-x64': 1.2.13 + '@rolldown/binding-freebsd-x64': 1.2.13 + '@rolldown/binding-linux-arm-gnueabihf': 1.2.13 + '@rolldown/binding-linux-arm64-gnu': 1.2.13 + '@rolldown/binding-linux-arm64-musl': 1.2.13 + '@rolldown/binding-linux-ppc64-gnu': 1.2.13 + '@rolldown/binding-linux-s390x-gnu': 1.2.13 + '@rolldown/binding-linux-x64-gnu': 1.2.13 + '@rolldown/binding-linux-x64-musl': 1.2.13 + '@rolldown/binding-openharmony-arm64': 1.2.13 + '@rolldown/binding-win32-arm64-msvc': 1.2.13 + '@rolldown/binding-win32-x64-msvc': 1.2.13 - rollup-plugin-visualizer@7.1.1(rolldown@1.0.2)(rollup@4.63.1): + rollup-plugin-visualizer@7.1.1(rolldown@1.2.13)(rollup@4.63.1): dependencies: open: 11.0.0 picomatch: 4.0.7 source-map: 0.8.0 yargs: 18.1.0 optionalDependencies: - rolldown: 1.0.2 + rolldown: 1.2.13 rollup: 4.63.1 rollup@4.63.1: @@ -44266,6 +43265,8 @@ snapshots: rou3@0.8.1: {} + rou3@0.9.2: {} + router@2.2.0(supports-color@10.2.2): dependencies: debug: 4.4.3(supports-color@10.2.2) @@ -44331,7 +43332,7 @@ snapshots: dependencies: chokidar: 4.0.3 immutable: 5.1.4 - source-map-js: 1.2.1 + source-map-js: 1.2.2 optionalDependencies: '@parcel/watcher': 2.5.1 @@ -44684,6 +43685,8 @@ snapshots: source-map-js@1.2.1: {} + source-map-js@1.2.2: {} + source-map-support@0.5.21: dependencies: buffer-from: 1.1.2 @@ -44762,6 +43765,8 @@ snapshots: srvx@0.11.22: {} + srvx@1.0.5: {} + stable-hash-x@0.2.0: {} stack-trace@0.0.10: {} @@ -45339,7 +44344,7 @@ snapshots: unicorn-magic@0.4.0: {} - unimport@6.4.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3): + unimport@6.4.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.2.13)(rollup@4.63.1)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3): dependencies: acorn: 8.18.0 escape-string-regexp: 5.0.0 @@ -45353,10 +44358,10 @@ snapshots: scule: 1.3.0 strip-literal: 4.0.0 tinyglobby: 0.2.17 - unplugin: 3.3.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3) + unplugin: 3.3.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.2.13)(rollup@4.63.1)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3) unplugin-utils: 0.3.2 optionalDependencies: - rolldown: 1.0.2 + rolldown: 1.2.13 transitivePeerDependencies: - '@farmfe/core' - '@rspack/core' @@ -45401,7 +44406,7 @@ snapshots: picomatch: 4.0.7 webpack-virtual-modules: 0.6.2 - unplugin@3.3.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.0.2)(rollup@4.63.1)(vite@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.9.0))(webpack@5.110.3): + unplugin@3.3.0(@rspack/core@2.2.7(@swc/helpers@0.5.23))(esbuild@0.28.2)(rolldown@1.2.13)(rollup@4.63.1)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0))(webpack@5.110.3): dependencies: '@jridgewell/remapping': 2.3.5 picomatch: 4.0.7 @@ -45409,10 +44414,10 @@ snapshots: optionalDependencies: '@rspack/core': 2.2.7(@swc/helpers@0.5.23) esbuild: 0.28.2 - rolldown: 1.0.2 + rolldown: 1.2.13 rollup: 4.63.1 - vite: 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.9.0) - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) unrs-resolver@1.11.1: dependencies: @@ -45453,7 +44458,7 @@ snapshots: db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) ioredis: 5.11.1(supports-color@10.2.2) - unstorage@1.17.5(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2)): + unstorage@1.17.5(@netlify/blobs@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2)): dependencies: anymatch: 3.1.3 chokidar: 5.0.0 @@ -45465,35 +44470,10 @@ snapshots: ufo: 1.6.4 optionalDependencies: '@netlify/blobs': 11.0.3(supports-color@10.2.2) - db0: 0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3) + db0: 0.4.1 ioredis: 5.11.1(supports-color@10.2.2) - unstorage@2.0.0-alpha.5(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3): - optionalDependencies: - '@netlify/blobs': 10.1.0 - chokidar: 5.0.0 - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) - ioredis: 5.11.1(supports-color@10.2.2) - lru-cache: 11.5.1 - ofetch: 2.0.0-alpha.3 - - unstorage@2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3): - optionalDependencies: - '@netlify/blobs': 10.1.0 - chokidar: 5.0.0 - db0: 0.3.4(@electric-sql/pglite@0.3.16)(@libsql/client@0.15.15)(mysql2@3.15.3) - ioredis: 5.11.1(supports-color@10.2.2) - lru-cache: 11.5.1 - ofetch: 2.0.0-alpha.3 - - unstorage@2.0.0-alpha.6(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.11.1(supports-color@10.2.2))(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3): - optionalDependencies: - '@netlify/blobs': 10.1.0 - chokidar: 5.0.0 - db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3) - ioredis: 5.11.1(supports-color@10.2.2) - lru-cache: 11.5.1 - ofetch: 2.0.0-alpha.3 + unstorage@2.0.0-alpha.10: {} until-async@3.0.2: {} @@ -45598,7 +44578,7 @@ snapshots: vary@1.1.2: {} - vite-plugin-dts@4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@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.9.0)): + vite-plugin-dts@4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(rollup@4.63.1)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) '@rollup/pluginutils': 5.1.4(rollup@4.63.1) @@ -45611,13 +44591,13 @@ snapshots: magic-string: 0.30.21 typescript: '@typescript/typescript6@6.0.2' optionalDependencies: - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-dts@4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vite-plugin-dts@4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) '@rollup/pluginutils': 5.1.4(rollup@4.63.1) @@ -45630,13 +44610,32 @@ snapshots: magic-string: 0.30.21 typescript: '@typescript/typescript6@6.0.2' optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-dts@4.2.3(@types/node@25.0.9)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vite-plugin-dts@4.2.3(@types/node@25.0.9)(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + dependencies: + '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) + '@rollup/pluginutils': 5.1.4(rollup@4.63.1) + '@volar/typescript': 2.4.26(@typescript/typescript6@6.0.2) + '@vue/language-core': 2.1.6(@typescript/typescript6@6.0.2) + compare-versions: 6.1.1 + debug: 4.4.3(supports-color@10.2.2) + kolorist: 1.8.0 + local-pkg: 0.5.1 + magic-string: 0.30.21 + typescript: '@typescript/typescript6@6.0.2' + optionalDependencies: + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + transitivePeerDependencies: + - '@types/node' + - rollup + - supports-color + + vite-plugin-dts@4.2.3(@types/node@25.0.9)(supports-color@10.2.2)(typescript@5.9.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) '@rollup/pluginutils': 5.1.4(rollup@4.63.1) @@ -45649,21 +44648,21 @@ snapshots: magic-string: 0.30.21 typescript: 5.9.2 optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-externalize-deps@0.10.0(vite@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.9.0)): + vite-plugin-externalize-deps@0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vite-plugin-externalize-deps@0.10.0(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vite-plugin-externalize-deps@0.10.0(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)): + vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@types/babel__core': 7.20.5 @@ -45671,14 +44670,14 @@ snapshots: merge-anything: 5.1.7 solid-js: 1.9.12 solid-refresh: 0.6.3(solid-js@1.9.12)(supports-color@10.2.2) - vite: 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.9.0) - vitefu: 1.1.3(vite@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.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitefu: 1.1.3(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) optionalDependencies: '@testing-library/jest-dom': 6.6.3 transitivePeerDependencies: - supports-color - vite-plugin-solid@2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@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.9.0)): + vite-plugin-solid@2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@types/babel__core': 7.20.5 @@ -45686,14 +44685,14 @@ snapshots: merge-anything: 5.1.7 solid-js: 1.9.12 solid-refresh: 0.6.3(solid-js@1.9.12)(supports-color@10.2.2) - vite: 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.9.0) - vitefu: 1.1.1(vite@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.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitefu: 1.1.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) optionalDependencies: '@testing-library/jest-dom': 6.6.3 transitivePeerDependencies: - supports-color - vite-plugin-solid@2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@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.9.0)): + vite-plugin-solid@2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(supports-color@7.2.0)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@babel/core': 7.29.7(supports-color@7.2.0) '@types/babel__core': 7.20.5 @@ -45701,67 +44700,67 @@ snapshots: merge-anything: 5.1.7 solid-js: 1.9.12 solid-refresh: 0.6.3(solid-js@1.9.12)(supports-color@7.2.0) - vite: 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.9.0) - vitefu: 1.1.1(vite@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.9.0)) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vitefu: 1.1.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) optionalDependencies: '@testing-library/jest-dom': 6.6.3 transitivePeerDependencies: - supports-color - vite-tsconfig-paths@6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@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.9.0)): + vite-tsconfig-paths@6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: debug: 4.4.3(supports-color@10.2.2) globrex: 0.1.2 tsconfck: 3.1.4(@typescript/typescript6@6.0.2) - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - supports-color - typescript - vite-tsconfig-paths@6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vite-tsconfig-paths@6.1.1(@typescript/typescript6@6.0.2)(supports-color@10.2.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: debug: 4.4.3(supports-color@10.2.2) globrex: 0.1.2 tsconfck: 3.1.4(@typescript/typescript6@6.0.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - supports-color - typescript - vite-tsconfig-paths@6.1.1(supports-color@10.2.2)(typescript@5.9.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vite-tsconfig-paths@6.1.1(supports-color@10.2.2)(typescript@5.9.2)(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: debug: 4.4.3(supports-color@10.2.2) globrex: 0.1.2 tsconfck: 3.1.4(typescript@5.9.2) - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) transitivePeerDependencies: - supports-color - typescript - vite@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.9.0): + vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0): dependencies: - lightningcss: 1.32.0 - picomatch: 4.0.4 - postcss: 8.5.15 - rolldown: 1.0.2 - tinyglobby: 0.2.16 + lightningcss: 1.33.0 + picomatch: 4.0.7 + postcss: 8.5.29 + rolldown: 1.2.13 + tinyglobby: 0.2.17 optionalDependencies: '@types/node': 25.0.9 esbuild: 0.27.4 fsevents: 2.3.3 jiti: 2.7.0 sass: 1.97.2 - terser: 5.37.0 + terser: 5.51.2 tsx: 4.20.3 yaml: 2.9.0 - vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0): + vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0): dependencies: - lightningcss: 1.32.0 - picomatch: 4.0.4 - postcss: 8.5.15 - rolldown: 1.0.2 - tinyglobby: 0.2.16 + lightningcss: 1.33.0 + picomatch: 4.0.7 + postcss: 8.5.29 + rolldown: 1.2.13 + tinyglobby: 0.2.17 optionalDependencies: '@types/node': 25.0.9 esbuild: 0.28.2 @@ -45772,22 +44771,18 @@ snapshots: tsx: 4.20.3 yaml: 2.9.0 - vitefu@1.1.1(vite@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.9.0)): + vitefu@1.1.1(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): optionalDependencies: - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vitefu@1.1.3(vite@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.9.0)): + vitefu@1.1.3(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): optionalDependencies: - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - vitefu@1.1.3(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): - optionalDependencies: - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) - - vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): + vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitest/pretty-format': 4.1.4 '@vitest/runner': 4.1.4 '@vitest/snapshot': 4.1.4 @@ -45804,7 +44799,7 @@ snapshots: tinyexec: 1.0.2 tinyglobby: 0.2.16 tinyrainbow: 3.1.0 - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) why-is-node-running: 2.3.0 optionalDependencies: '@opentelemetry/api': 1.9.1 @@ -45814,10 +44809,10 @@ snapshots: transitivePeerDependencies: - msw - vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitest/pretty-format': 4.1.4 '@vitest/runner': 4.1.4 '@vitest/snapshot': 4.1.4 @@ -45834,7 +44829,7 @@ snapshots: tinyexec: 1.0.2 tinyglobby: 0.2.16 tinyrainbow: 3.1.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) why-is-node-running: 2.3.0 optionalDependencies: '@opentelemetry/api': 1.9.1 @@ -45844,10 +44839,10 @@ snapshots: transitivePeerDependencies: - msw - vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): + vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitest/pretty-format': 4.1.4 '@vitest/runner': 4.1.4 '@vitest/snapshot': 4.1.4 @@ -45864,7 +44859,7 @@ snapshots: tinyexec: 1.0.2 tinyglobby: 0.2.16 tinyrainbow: 3.1.0 - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) why-is-node-running: 2.3.0 optionalDependencies: '@opentelemetry/api': 1.9.1 @@ -45874,10 +44869,10 @@ snapshots: transitivePeerDependencies: - msw - vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)): + vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@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.9.0)) + '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitest/pretty-format': 4.1.4 '@vitest/runner': 4.1.4 '@vitest/snapshot': 4.1.4 @@ -45894,7 +44889,7 @@ snapshots: tinyexec: 1.0.2 tinyglobby: 0.2.16 tinyrainbow: 3.1.0 - vite: 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.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) why-is-node-running: 2.3.0 optionalDependencies: '@opentelemetry/api': 1.9.1 @@ -45904,10 +44899,10 @@ snapshots: transitivePeerDependencies: - msw - vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): + vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)): dependencies: '@vitest/expect': 4.1.4 - '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + '@vitest/mocker': 4.1.4(msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@vitest/pretty-format': 4.1.4 '@vitest/runner': 4.1.4 '@vitest/snapshot': 4.1.4 @@ -45924,7 +44919,7 @@ snapshots: tinyexec: 1.0.2 tinyglobby: 0.2.16 tinyrainbow: 3.1.0 - vite: 8.0.14(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) why-is-node-running: 2.3.0 optionalDependencies: '@opentelemetry/api': 1.9.1 @@ -46092,7 +45087,7 @@ snapshots: import-local: 3.2.0 interpret: 3.1.1 rechoir: 0.8.0 - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-merge: 5.10.0 optionalDependencies: webpack-dev-server: 5.2.4(debug@4.4.3(supports-color@7.2.0))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.110.3) @@ -46126,7 +45121,7 @@ snapshots: range-parser: 1.2.1 schema-utils: 4.3.3 optionalDependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) optional: true webpack-dev-middleware@7.4.2(webpack@5.97.1): @@ -46171,7 +45166,7 @@ snapshots: webpack-dev-middleware: 7.4.2(webpack@5.110.3) ws: 8.20.0 optionalDependencies: - webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) + webpack: 5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.4)(webpack@5.110.3) transitivePeerDependencies: - bufferutil @@ -46235,7 +45230,7 @@ snapshots: webpack-virtual-modules@0.6.2: {} - webpack@5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4): + webpack@5.110.3(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack-cli@5.1.4): dependencies: '@types/estree': 1.0.9 '@types/json-schema': 7.0.15 @@ -46250,7 +45245,7 @@ snapshots: events: 3.3.0 graceful-fs: 4.2.11 mime-db: 1.54.0 - minimizer-webpack-plugin: 5.10.0(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.23)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack@5.110.3) + minimizer-webpack-plugin: 5.10.0(@swc/core@1.15.33(@swc/helpers@0.5.23))(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.28.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.29)(sharp@0.35.4(@types/node@25.0.9))(svgo@4.0.0)(webpack@5.110.3) neo-async: 2.6.2 schema-utils: 4.3.3 tapable: 2.3.3 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 89a2478792..5319b48a69 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -59,7 +59,7 @@ catalog: rimraf: ^6.1.2 solid-js: 1.9.12 tinyglobby: ^0.2.17 - vite: ^8.0.14 + vite: ^8.3.4 vite-plugin-solid: 2.11.10 vitest: ^4.1.4 vue: ^3.5.25 From c79c620bf479cf53d64fb301407c2206922c0b4a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 10 Oct 2026 09:25:30 +0200 Subject: [PATCH 097/175] ci: Version Packages (#8580) ci: changeset release Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/build-location-one-liners.md | 6 -- .changeset/cold-icons-teach.md | 5 - .changeset/fix-dev-ssr-css-order.md | 7 -- .changeset/history-hash-allocations.md | 5 - .changeset/history-leading-query-pathname.md | 5 - .changeset/link-departing-scope.md | 8 -- .changeset/link-followup-react-core.md | 7 -- .changeset/ordered-slice-bounds.md | 6 -- .changeset/quick-links-cancel.md | 7 -- .changeset/solid-link-single-memo.md | 5 - .changeset/solid-vue-link-follow-up.md | 6 -- .changeset/ssr-match-id-null-byte.md | 5 - .../package.json | 4 +- .../react/authenticated-routes/package.json | 4 +- .../basic-default-search-params/package.json | 2 +- .../react/basic-devtools-panel/package.json | 2 +- examples/react/basic-file-based/package.json | 4 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-react-query-file-based/package.json | 4 +- examples/react/basic-react-query/package.json | 2 +- .../react/basic-ssr-file-based/package.json | 4 +- .../package.json | 4 +- .../basic-virtual-file-based/package.json | 4 +- .../package.json | 4 +- examples/react/basic/package.json | 2 +- examples/react/deferred-data/package.json | 2 +- examples/react/i18n-paraglide/package.json | 4 +- .../kitchen-sink-file-based/package.json | 4 +- .../package.json | 4 +- .../kitchen-sink-react-query/package.json | 2 +- examples/react/kitchen-sink/package.json | 2 +- examples/react/large-file-based/package.json | 4 +- examples/react/location-masking/package.json | 2 +- .../react/navigation-blocking/package.json | 2 +- .../package.json | 4 +- .../react/quickstart-file-based/package.json | 4 +- .../quickstart-rspack-file-based/package.json | 4 +- .../package.json | 4 +- examples/react/quickstart/package.json | 2 +- .../router-monorepo-react-query/package.json | 4 +- .../packages/router/package.json | 6 +- .../router-monorepo-simple-lazy/package.json | 4 +- .../packages/router/package.json | 6 +- .../react/router-monorepo-simple/package.json | 4 +- .../packages/router/package.json | 6 +- .../react/scroll-restoration/package.json | 2 +- .../search-validator-adapters/package.json | 4 +- examples/react/start-bare/package.json | 4 +- examples/react/start-basic-auth/package.json | 4 +- .../react/start-basic-authjs/package.json | 4 +- .../react/start-basic-cloudflare/package.json | 4 +- .../start-basic-react-query/package.json | 4 +- .../react/start-basic-rsbuild/package.json | 4 +- .../react/start-basic-static/package.json | 6 +- examples/react/start-basic/package.json | 4 +- examples/react/start-bun/package.json | 6 +- examples/react/start-clerk-basic/package.json | 4 +- .../react/start-convex-trellaux/package.json | 4 +- examples/react/start-counter/package.json | 4 +- .../react/start-i18n-paraglide/package.json | 4 +- examples/react/start-large/package.json | 4 +- examples/react/start-material-ui/package.json | 4 +- .../react/start-next-migration/package.json | 4 +- examples/react/start-rscs/package.json | 4 +- .../package.json | 4 +- .../react/start-supabase-basic/package.json | 4 +- examples/react/start-tailwind-v4/package.json | 4 +- examples/react/start-trellaux/package.json | 4 +- examples/react/start-workos/package.json | 4 +- examples/react/view-transitions/package.json | 4 +- .../react/with-framer-motion/package.json | 2 +- .../react/with-trpc-react-query/package.json | 4 +- examples/react/with-trpc/package.json | 4 +- .../package.json | 4 +- .../solid/authenticated-routes/package.json | 4 +- .../basic-default-search-params/package.json | 2 +- .../solid/basic-devtools-panel/package.json | 2 +- examples/solid/basic-file-based/package.json | 4 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-solid-query-file-based/package.json | 4 +- examples/solid/basic-solid-query/package.json | 4 +- .../solid/basic-ssr-file-based/package.json | 4 +- .../package.json | 4 +- .../basic-virtual-file-based/package.json | 4 +- .../package.json | 4 +- examples/solid/basic/package.json | 2 +- examples/solid/deferred-data/package.json | 2 +- examples/solid/i18n-paraglide/package.json | 4 +- .../kitchen-sink-file-based/package.json | 4 +- .../package.json | 4 +- .../kitchen-sink-solid-query/package.json | 2 +- examples/solid/kitchen-sink/package.json | 2 +- examples/solid/large-file-based/package.json | 4 +- examples/solid/location-masking/package.json | 2 +- .../solid/navigation-blocking/package.json | 2 +- .../package.json | 4 +- .../solid/quickstart-file-based/package.json | 4 +- .../quickstart-rspack-file-based/package.json | 4 +- .../package.json | 4 +- examples/solid/quickstart/package.json | 2 +- .../router-monorepo-simple-lazy/package.json | 4 +- .../packages/router/package.json | 6 +- .../solid/router-monorepo-simple/package.json | 4 +- .../packages/router/package.json | 6 +- .../router-monorepo-solid-query/package.json | 4 +- .../packages/router/package.json | 6 +- .../solid/scroll-restoration/package.json | 2 +- .../search-validator-adapters/package.json | 4 +- examples/solid/start-basic-auth/package.json | 4 +- .../solid/start-basic-authjs/package.json | 4 +- .../solid/start-basic-cloudflare/package.json | 4 +- .../solid/start-basic-netlify/package.json | 4 +- examples/solid/start-basic-nitro/package.json | 4 +- .../start-basic-solid-query/package.json | 4 +- .../solid/start-basic-static/package.json | 6 +- examples/solid/start-basic/package.json | 4 +- examples/solid/start-bun/package.json | 6 +- .../start-convex-better-auth/package.json | 4 +- examples/solid/start-counter/package.json | 4 +- .../solid/start-i18n-paraglide/package.json | 4 +- examples/solid/start-large/package.json | 4 +- .../package.json | 4 +- .../solid/start-supabase-basic/package.json | 4 +- examples/solid/start-tailwind-v4/package.json | 4 +- examples/solid/view-transitions/package.json | 4 +- .../solid/with-framer-motion/package.json | 2 +- examples/solid/with-trpc/package.json | 4 +- .../vue/basic-file-based-jsx/package.json | 4 +- .../vue/basic-file-based-sfc/package.json | 4 +- examples/vue/basic/package.json | 2 +- packages/history/CHANGELOG.md | 14 +++ packages/history/package.json | 2 +- packages/react-router/CHANGELOG.md | 16 +++ packages/react-router/package.json | 2 +- packages/react-start-client/CHANGELOG.md | 9 ++ packages/react-start-client/package.json | 2 +- packages/react-start-rsc/CHANGELOG.md | 11 ++ packages/react-start-rsc/package.json | 2 +- packages/react-start-server/CHANGELOG.md | 9 ++ packages/react-start-server/package.json | 2 +- packages/react-start/CHANGELOG.md | 13 +++ packages/react-start/package.json | 2 +- packages/router-cli/CHANGELOG.md | 7 ++ packages/router-cli/package.json | 2 +- packages/router-core/CHANGELOG.md | 17 +++ packages/router-core/package.json | 2 +- packages/router-generator/CHANGELOG.md | 7 ++ packages/router-generator/package.json | 2 +- packages/router-plugin/CHANGELOG.md | 9 ++ packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/CHANGELOG.md | 7 ++ packages/router-vite-plugin/package.json | 2 +- packages/solid-router/CHANGELOG.md | 16 +++ packages/solid-router/package.json | 2 +- packages/solid-start-client/CHANGELOG.md | 9 ++ packages/solid-start-client/package.json | 2 +- packages/solid-start-server/CHANGELOG.md | 9 ++ packages/solid-start-server/package.json | 2 +- packages/solid-start/CHANGELOG.md | 12 +++ packages/solid-start/package.json | 2 +- packages/start-client-core/CHANGELOG.md | 8 ++ packages/start-client-core/package.json | 2 +- packages/start-plugin-core/CHANGELOG.md | 14 +++ packages/start-plugin-core/package.json | 2 +- packages/start-server-core/CHANGELOG.md | 10 ++ packages/start-server-core/package.json | 2 +- .../CHANGELOG.md | 9 ++ .../package.json | 2 +- packages/start-storage-context/CHANGELOG.md | 7 ++ packages/start-storage-context/package.json | 2 +- packages/vue-router/CHANGELOG.md | 14 +++ packages/vue-router/package.json | 2 +- packages/vue-start-client/CHANGELOG.md | 9 ++ packages/vue-start-client/package.json | 2 +- packages/vue-start-server/CHANGELOG.md | 9 ++ packages/vue-start-server/package.json | 2 +- packages/vue-start/CHANGELOG.md | 12 +++ packages/vue-start/package.json | 2 +- pnpm-lock.yaml | 102 +++++++++--------- 179 files changed, 552 insertions(+), 367 deletions(-) delete mode 100644 .changeset/build-location-one-liners.md delete mode 100644 .changeset/cold-icons-teach.md delete mode 100644 .changeset/fix-dev-ssr-css-order.md delete mode 100644 .changeset/history-hash-allocations.md delete mode 100644 .changeset/history-leading-query-pathname.md delete mode 100644 .changeset/link-departing-scope.md delete mode 100644 .changeset/link-followup-react-core.md delete mode 100644 .changeset/ordered-slice-bounds.md delete mode 100644 .changeset/quick-links-cancel.md delete mode 100644 .changeset/solid-link-single-memo.md delete mode 100644 .changeset/solid-vue-link-follow-up.md delete mode 100644 .changeset/ssr-match-id-null-byte.md diff --git a/.changeset/build-location-one-liners.md b/.changeset/build-location-one-liners.md deleted file mode 100644 index 6986df6704..0000000000 --- a/.changeset/build-location-one-liners.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/history': patch -'@tanstack/router-core': patch ---- - -Drop a duplicated current-location flag and a redundant `createHref` wrapper. diff --git a/.changeset/cold-icons-teach.md b/.changeset/cold-icons-teach.md deleted file mode 100644 index 71d89d79d2..0000000000 --- a/.changeset/cold-icons-teach.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/react-router': patch ---- - -reduce component nesting per route match diff --git a/.changeset/fix-dev-ssr-css-order.md b/.changeset/fix-dev-ssr-css-order.md deleted file mode 100644 index 9c522e448d..0000000000 --- a/.changeset/fix-dev-ssr-css-order.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@tanstack/start-plugin-core': patch ---- - -Fix dev SSR style collection to preserve CSS order without duplicating imported styles, while retaining styles from code-split routes. Keep layered imports from inline styles out of the global dev stylesheet. In bundled development, collect styles from a complete client bundle and load compiler dependencies through the bundler to avoid restarting client plugins. Preserve client hydration and reload SSR modules on file changes instead of clearing them on every request. - -Support newer Vite bundled dev versions by loading their separate client runtime before hydration and awaiting the client build through the updated environment API. diff --git a/.changeset/history-hash-allocations.md b/.changeset/history-hash-allocations.md deleted file mode 100644 index ba8755bb97..0000000000 --- a/.changeset/history-hash-allocations.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/history': patch ---- - -Avoid temporary arrays when reading hash-history locations. diff --git a/.changeset/history-leading-query-pathname.md b/.changeset/history-leading-query-pathname.md deleted file mode 100644 index 5eef2604d0..0000000000 --- a/.changeset/history-leading-query-pathname.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/history': patch ---- - -Keep a leading query or fragment out of the parsed pathname, so hash-history URLs like `/#?x=1` no longer repeat the query in the router location. diff --git a/.changeset/link-departing-scope.md b/.changeset/link-departing-scope.md deleted file mode 100644 index a7d9119959..0000000000 --- a/.changeset/link-departing-scope.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'@tanstack/react-router': patch -'@tanstack/router-core': patch -'@tanstack/solid-router': patch -'@tanstack/vue-router': patch ---- - -Links of a route that the pending navigation leaves skip deriving the destination location, and clicks and preloads follow the href a Link displays. `buildLocation` now builds `mask` and `routeMasks` locations from the same `_fromLocation` as the destination. diff --git a/.changeset/link-followup-react-core.md b/.changeset/link-followup-react-core.md deleted file mode 100644 index defe64eb4a..0000000000 --- a/.changeset/link-followup-react-core.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@tanstack/react-router': patch -'@tanstack/router-core': patch -'@tanstack/history': patch ---- - -Fixed Link destinations that resolve to a route mask are now reused across navigations instead of being rebuilt every time. A mounted Link now follows changes to its `href` and `reloadDocument` props, and React Links no longer each subscribe to a hydration flag. diff --git a/.changeset/ordered-slice-bounds.md b/.changeset/ordered-slice-bounds.md deleted file mode 100644 index 0838a6aee8..0000000000 --- a/.changeset/ordered-slice-bounds.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/history': patch -'@tanstack/router-core': patch ---- - -Use `slice` instead of `substring` where the bounds are always ordered and non-negative. diff --git a/.changeset/quick-links-cancel.md b/.changeset/quick-links-cancel.md deleted file mode 100644 index 0c0dab233a..0000000000 --- a/.changeset/quick-links-cancel.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@tanstack/react-router': patch -'@tanstack/solid-router': patch -'@tanstack/vue-router': patch ---- - -Cancel pending link preload timers when starting navigation to avoid redundant preloading while the destination is loading. diff --git a/.changeset/solid-link-single-memo.md b/.changeset/solid-link-single-memo.md deleted file mode 100644 index 8e3bb1f085..0000000000 --- a/.changeset/solid-link-single-memo.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/solid-router': patch ---- - -Solid Links resolve their own props through one reactive memo instead of two, which makes mounting and updating many Links slightly faster. diff --git a/.changeset/solid-vue-link-follow-up.md b/.changeset/solid-vue-link-follow-up.md deleted file mode 100644 index fee693f84f..0000000000 --- a/.changeset/solid-vue-link-follow-up.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@tanstack/solid-router': patch -'@tanstack/vue-router': patch ---- - -Solid and Vue Links reuse the router's built destination across navigations and derive their state through fewer reactive nodes. Solid Links call a user `ref` once per element and create no reactive nodes on the server. diff --git a/.changeset/ssr-match-id-null-byte.md b/.changeset/ssr-match-id-null-byte.md deleted file mode 100644 index 870b9f93de..0000000000 --- a/.changeset/ssr-match-id-null-byte.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/router-core': patch ---- - -Encode slashes in dehydrated SSR match IDs with `#` instead of a null byte, so the inlined hydration payload no longer contains U+0000 (which is invalid in HTML and rejected by markup validators) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index d004ca1ef8..e83808259d 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "firebase": "^11.4.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 7a0cc86f74..b62319636c 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index f0bb6a799e..43e2cfbbb3 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 78adb70017..04339fa276 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.67.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 45a3b81f56..fe1eb665a4 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 87f10c282f..5c7547a3c8 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 7fa657f708..c9fa1f0c1d 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 92fbe68771..75b8a401eb 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.json index 6298367f2e..388f98c441 100644 --- a/examples/react/basic-ssr-file-based/package.json +++ b/examples/react/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/react-router": "^1.170.42", + "@tanstack/router-plugin": "^1.168.43", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/react/basic-ssr-streaming-file-based/package.json b/examples/react/basic-ssr-streaming-file-based/package.json index 7fe0401001..0c23005553 100644 --- a/examples/react/basic-ssr-streaming-file-based/package.json +++ b/examples/react/basic-ssr-streaming-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/react-router": "^1.170.42", + "@tanstack/router-plugin": "^1.168.43", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 722e1e5435..115395a864 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index f7e7840df1..29d71c2730 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index be0d99ea7f..48b2bf641d 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index c5c60c9db3..fb089cc985 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/i18n-paraglide/package.json b/examples/react/i18n-paraglide/package.json index f9c5517f5f..3c35be9150 100644 --- a/examples/react/i18n-paraglide/package.json +++ b/examples/react/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/react-router": "^1.170.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 85ffa317d5..854875e80d 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 36cad3b0ae..1c9fff3cc4 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 6d9224d95a..048171f259 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 8e10ec0ae1..ea2201fe09 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 78a52e2aa5..cef2281e96 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -13,9 +13,9 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 1971a8587a..6c494b9249 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -12,7 +12,7 @@ "@radix-ui/react-dialog": "^1.1.6", "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 6366890725..e019817e16 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index bc71ef0f9d..2c8249a762 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 9f332b3ad0..9429f927b7 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 43eb7e0452..79f4dc8507 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "postcss": "^8.5.1", "react": "^19.0.0", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 11bce91420..29133b6a85 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.15.33", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 628f7c37fe..f684da773e 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 394fa70001..404ef261b9 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 77e00b2305..805be8ea7f 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -9,10 +9,10 @@ "types": "./dist/index.d.ts", "dependencies": { "@router-mono-react-query/post-query": "workspace:*", - "@tanstack/history": "^1.162.4", + "@tanstack/history": "^1.162.5", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.41", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/react-router": "^1.170.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index a0b2d9cc20..d64f0c246d 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 51f91b1bdb..9ee1e90948 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.41", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/history": "^1.162.5", + "@tanstack/react-router": "^1.170.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 4d506c30ed..0f42d3fe2a 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index b4a607f882..c2d224b7e4 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.4", - "@tanstack/react-router": "^1.170.41", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/history": "^1.162.5", + "@tanstack/react-router": "^1.170.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 1757b8e59a..ca15f551d6 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-virtual": "^3.13.0", "react": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index c70fefb31e..6d3837ca0c 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 6db668ac66..916bf280b6 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "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 7e7ced3576..2286f06c1b 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index 76abc1f98f..5a5327b9a9 100644 --- a/examples/react/start-basic-authjs/package.json +++ b/examples/react/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "react": "^19.0.0", "react-dom": "^19.0.0", "start-authjs": "^1.0.0", diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index d3a5a81a5e..b7d119c273 100644 --- a/examples/react/start-basic-cloudflare/package.json +++ b/examples/react/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 568aa7d943..909f1c63d3 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -13,10 +13,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json index 168c78a008..220dfcfa7b 100644 --- a/examples/react/start-basic-rsbuild/package.json +++ b/examples/react/start-basic-rsbuild/package.json @@ -10,9 +10,9 @@ "start": "srvx --prod -s ../client dist/server/index.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "react": "^19.2.3", "react-dom": "^19.2.3", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index fdfa825ed7..e85469f3fd 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", - "@tanstack/start-static-server-functions": "^1.167.39", + "@tanstack/react-start": "^1.168.61", + "@tanstack/start-static-server-functions": "^1.167.40", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index dc5fa52bfe..8e074e46a0 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index 911b8ab47e..465a79f661 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.60", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/react-start": "^1.168.61", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 90991d624e..8b84230124 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "^0.27.14", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 3e28d116fa..6496f419ad 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -15,10 +15,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index b650b73513..498867d361 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "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 09b096be25..8db6f591cc 100644 --- a/examples/react/start-i18n-paraglide/package.json +++ b/examples/react/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "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 d00d93cd83..8a8922f18f 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "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 90c205f860..dab36527b9 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,9 +15,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json index 70430d51dc..ecad32ce6c 100644 --- a/examples/react/start-next-migration/package.json +++ b/examples/react/start-next-migration/package.json @@ -12,8 +12,8 @@ "test:e2e": "playwright test" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-router": "^1.170.42", + "@tanstack/react-start": "^1.168.61", "iron-session": "^9.0.0", "next": "16.3.4", "react": "^19.2.3", diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index 5081da7126..6202aa2457 100644 --- a/examples/react/start-rscs/package.json +++ b/examples/react/start-rscs/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "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 5150636f76..90cdf22448 100644 --- a/examples/react/start-streaming-data-from-server-functions/package.json +++ b/examples/react/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "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 a210f757eb..3e20bdbe53 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index d10a003749..3fe0751385 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "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 3648fbebaa..7d9f31e1f2 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index f499975cf7..25631bbd0b 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.3.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.60", + "@tanstack/react-start": "^1.168.61", "@workos/authkit-tanstack-react-start": "^0.5.0", "react": "^19.0.0", "react-dom": "^19.0.0" diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 77d36aebb8..a68bfb1d76 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 4afbcb19c0..57941619a3 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", "framer-motion": "^11.18.2", "react": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 231cfa78ce..9b0714b67a 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "@trpc/tanstack-react-query": "^11.4.3", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 1802a9bc67..1d9c7d2841 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.41", + "@tanstack/react-router": "^1.170.42", "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "express": "^5.2.1", diff --git a/examples/solid/authenticated-routes-firebase/package.json b/examples/solid/authenticated-routes-firebase/package.json index 6c2a3c8c6f..741028bab0 100644 --- a/examples/solid/authenticated-routes-firebase/package.json +++ b/examples/solid/authenticated-routes-firebase/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.42", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "firebase": "^11.4.0", "redaxios": "^0.5.1", diff --git a/examples/solid/authenticated-routes/package.json b/examples/solid/authenticated-routes/package.json index 0cd8c0934b..12a1f94d93 100644 --- a/examples/solid/authenticated-routes/package.json +++ b/examples/solid/authenticated-routes/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.42", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-default-search-params/package.json b/examples/solid/basic-default-search-params/package.json index 9ea4a4e70f..d30af995f0 100644 --- a/examples/solid/basic-default-search-params/package.json +++ b/examples/solid/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 504b5c1a72..4a21323cce 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index 5d2d8aae0c..d7aa324fa9 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -18,7 +18,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index e83d0d4163..3e8d94ce0c 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 187d822d88..2251a71b4e 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -13,7 +13,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -21,7 +21,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 9984bf0e16..8e1e17a0f6 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -12,14 +12,14 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-ssr-file-based/package.json b/examples/solid/basic-ssr-file-based/package.json index 42b026beee..3feefcfae1 100644 --- a/examples/solid/basic-ssr-file-based/package.json +++ b/examples/solid/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/solid-router": "^1.170.38", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/solid-router": "^1.170.39", + "@tanstack/router-plugin": "^1.168.43", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json index bf5aa4efbe..b1c9711894 100644 --- a/examples/solid/basic-ssr-streaming-file-based/package.json +++ b/examples/solid/basic-ssr-streaming-file-based/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "compression": "^1.8.0", "express": "^5.2.1", @@ -24,7 +24,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@types/express": "^5.0.6", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/solid/basic-virtual-file-based/package.json b/examples/solid/basic-virtual-file-based/package.json index 7ec4c48f5f..4002486492 100644 --- a/examples/solid/basic-virtual-file-based/package.json +++ b/examples/solid/basic-virtual-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.42", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", diff --git a/examples/solid/basic-virtual-inside-file-based/package.json b/examples/solid/basic-virtual-inside-file-based/package.json index b8aadff060..0afc4dc6b6 100644 --- a/examples/solid/basic-virtual-inside-file-based/package.json +++ b/examples/solid/basic-virtual-inside-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.42", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index 89be1c3c6d..4fe458cd5d 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/deferred-data/package.json b/examples/solid/deferred-data/package.json index 139c02172f..7848331338 100644 --- a/examples/solid/deferred-data/package.json +++ b/examples/solid/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json index efd32a9ebd..66c93a9bc7 100644 --- a/examples/solid/i18n-paraglide/package.json +++ b/examples/solid/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/solid-router": "^1.170.39", + "@tanstack/router-plugin": "^1.168.43", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index c0b6d196e1..8a95f34113 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/kitchen-sink-solid-query-file-based/package.json b/examples/solid/kitchen-sink-solid-query-file-based/package.json index ae6308b47f..32cbb958e3 100644 --- a/examples/solid/kitchen-sink-solid-query-file-based/package.json +++ b/examples/solid/kitchen-sink-solid-query-file-based/package.json @@ -10,10 +10,10 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json index d5d4925716..be51044166 100644 --- a/examples/solid/kitchen-sink-solid-query/package.json +++ b/examples/solid/kitchen-sink-solid-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/kitchen-sink/package.json b/examples/solid/kitchen-sink/package.json index f5937ce601..ebb328ce0b 100644 --- a/examples/solid/kitchen-sink/package.json +++ b/examples/solid/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/large-file-based/package.json b/examples/solid/large-file-based/package.json index 11f47616b1..8a50a6ad90 100644 --- a/examples/solid/large-file-based/package.json +++ b/examples/solid/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/location-masking/package.json b/examples/solid/location-masking/package.json index 4695c1ef13..863e823e16 100644 --- a/examples/solid/location-masking/package.json +++ b/examples/solid/location-masking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/navigation-blocking/package.json b/examples/solid/navigation-blocking/package.json index 37ce89e6a8..b3c0f5fdfb 100644 --- a/examples/solid/navigation-blocking/package.json +++ b/examples/solid/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json index 1618a02dc1..9266ab58ec 100644 --- a/examples/solid/quickstart-esbuild-file-based/package.json +++ b/examples/solid/quickstart-esbuild-file-based/package.json @@ -9,8 +9,8 @@ "start": "dev" }, "dependencies": { - "@tanstack/router-plugin": "^1.168.42", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index 491f241f6c..cb8f13a504 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -18,7 +18,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/quickstart-rspack-file-based/package.json b/examples/solid/quickstart-rspack-file-based/package.json index da3ed69cca..daf73f7e4f 100644 --- a/examples/solid/quickstart-rspack-file-based/package.json +++ b/examples/solid/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "postcss": "^8.5.1", "solid-js": "^1.9.10", @@ -19,7 +19,7 @@ "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2" } diff --git a/examples/solid/quickstart-webpack-file-based/package.json b/examples/solid/quickstart-webpack-file-based/package.json index 9cf3451821..3f1c6fc568 100644 --- a/examples/solid/quickstart-webpack-file-based/package.json +++ b/examples/solid/quickstart-webpack-file-based/package.json @@ -7,7 +7,7 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" @@ -15,7 +15,7 @@ "devDependencies": { "@babel/core": "^7.28.5", "@babel/preset-typescript": "^7.27.1", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "babel-loader": "^10.0.0", "babel-preset-solid": "^1.9.10", "css-loader": "^7.1.2", diff --git a/examples/solid/quickstart/package.json b/examples/solid/quickstart/package.json index c5980947c5..8dd43e583e 100644 --- a/examples/solid/quickstart/package.json +++ b/examples/solid/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/router-monorepo-simple-lazy/package.json b/examples/solid/router-monorepo-simple-lazy/package.json index 0049aad99d..081c17871c 100644 --- a/examples/solid/router-monorepo-simple-lazy/package.json +++ b/examples/solid/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json index 906f2d666d..a837ea03d5 100644 --- a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.4", - "@tanstack/solid-router": "^1.170.38", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/history": "^1.162.5", + "@tanstack/solid-router": "^1.170.39", + "@tanstack/router-plugin": "^1.168.43", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json index 90261498eb..6b699785dc 100644 --- a/examples/solid/router-monorepo-simple/package.json +++ b/examples/solid/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple/packages/router/package.json b/examples/solid/router-monorepo-simple/packages/router/package.json index 5d4fcba6e4..ea0e23fc57 100644 --- a/examples/solid/router-monorepo-simple/packages/router/package.json +++ b/examples/solid/router-monorepo-simple/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.4", - "@tanstack/solid-router": "^1.170.38", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/history": "^1.162.5", + "@tanstack/solid-router": "^1.170.39", + "@tanstack/router-plugin": "^1.168.43", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json index 169e5af341..a95915667e 100644 --- a/examples/solid/router-monorepo-solid-query/package.json +++ b/examples/solid/router-monorepo-solid-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-solid-query/packages/router/package.json b/examples/solid/router-monorepo-solid-query/packages/router/package.json index 381898acfd..b324f6300f 100644 --- a/examples/solid/router-monorepo-solid-query/packages/router/package.json +++ b/examples/solid/router-monorepo-solid-query/packages/router/package.json @@ -8,10 +8,10 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.162.4", + "@tanstack/history": "^1.162.5", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.38", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/solid-router": "^1.170.39", + "@tanstack/router-plugin": "^1.168.43", "@router-solid-mono-solid-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^4.4.3", diff --git a/examples/solid/scroll-restoration/package.json b/examples/solid/scroll-restoration/package.json index 0c133651bd..88e83522bf 100644 --- a/examples/solid/scroll-restoration/package.json +++ b/examples/solid/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-virtual": "^3.13.0", "solid-js": "^1.9.10", diff --git a/examples/solid/search-validator-adapters/package.json b/examples/solid/search-validator-adapters/package.json index 747e982935..d364db425e 100644 --- a/examples/solid/search-validator-adapters/package.json +++ b/examples/solid/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/router-plugin": "^1.168.43", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json index 78cb5db303..54eed098ae 100644 --- a/examples/solid/start-basic-auth/package.json +++ b/examples/solid/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index fd03336a33..8704cfa3fb 100644 --- a/examples/solid/start-basic-authjs/package.json +++ b/examples/solid/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "solid-js": "^1.9.10", "start-authjs": "^1.0.0", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json index 2651bb9e54..1509d37fcc 100644 --- a/examples/solid/start-basic-cloudflare/package.json +++ b/examples/solid/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json index eccedc8782..4a9f23a22a 100644 --- a/examples/solid/start-basic-netlify/package.json +++ b/examples/solid/start-basic-netlify/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json index 665387c2c0..2d27ea5111 100644 --- a/examples/solid/start-basic-nitro/package.json +++ b/examples/solid/start-basic-nitro/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json index d4ed4ded06..06c10bade1 100644 --- a/examples/solid/start-basic-solid-query/package.json +++ b/examples/solid/start-basic-solid-query/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 25580202aa..bbd49252bc 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", - "@tanstack/start-static-server-functions": "^1.167.39", + "@tanstack/solid-start": "^1.168.58", + "@tanstack/start-static-server-functions": "^1.167.40", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 4d5b939e3c..6d29c027f3 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index cf8300ceb0..1a17de205a 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.57", - "@tanstack/router-plugin": "^1.168.42", + "@tanstack/solid-start": "^1.168.58", + "@tanstack/router-plugin": "^1.168.43", "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 939d2fd018..918658480b 100644 --- a/examples/solid/start-convex-better-auth/package.json +++ b/examples/solid/start-convex-better-auth/package.json @@ -13,9 +13,9 @@ "dependencies": { "@convex-dev/better-auth": "^0.9.7", "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "better-auth": "^1.6.19", "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 bcb22e5d03..25ea8d95b6 100644 --- a/examples/solid/start-counter/package.json +++ b/examples/solid/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "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 54c9e4e41c..824c904371 100644 --- a/examples/solid/start-i18n-paraglide/package.json +++ b/examples/solid/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index cd940c026a..7d186c8a53 100644 --- a/examples/solid/start-large/package.json +++ b/examples/solid/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "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 47b8e00770..ac6f60d2c7 100644 --- a/examples/solid/start-streaming-data-from-server-functions/package.json +++ b/examples/solid/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "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 1f1fec3d4a..c8f3e888d8 100644 --- a/examples/solid/start-supabase-basic/package.json +++ b/examples/solid/start-supabase-basic/package.json @@ -14,9 +14,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "solid-js": "^1.9.9", "redaxios": "^0.5.1" }, diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json index 5e68861a9d..4a29a5477f 100644 --- a/examples/solid/start-tailwind-v4/package.json +++ b/examples/solid/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.57", + "@tanstack/solid-start": "^1.168.58", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json index 8c67d0ba78..eecdf6dd1b 100644 --- a/examples/solid/view-transitions/package.json +++ b/examples/solid/view-transitions/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.42", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json index f3fe96c08a..8d536271de 100644 --- a/examples/solid/with-framer-motion/package.json +++ b/examples/solid/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json index 2cf06b137a..ad3b9f4798 100644 --- a/examples/solid/with-trpc/package.json +++ b/examples/solid/with-trpc/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.42", - "@tanstack/solid-router": "^1.170.38", + "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.39", "@tanstack/solid-router-devtools": "^1.167.2", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", diff --git a/examples/vue/basic-file-based-jsx/package.json b/examples/vue/basic-file-based-jsx/package.json index 16788d6320..25540d1e9f 100644 --- a/examples/vue/basic-file-based-jsx/package.json +++ b/examples/vue/basic-file-based-jsx/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.42", - "@tanstack/vue-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.43", + "@tanstack/vue-router": "^1.170.38", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", diff --git a/examples/vue/basic-file-based-sfc/package.json b/examples/vue/basic-file-based-sfc/package.json index de28937097..9028ad5c22 100644 --- a/examples/vue/basic-file-based-sfc/package.json +++ b/examples/vue/basic-file-based-sfc/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.42", - "@tanstack/vue-router": "^1.170.37", + "@tanstack/router-plugin": "^1.168.43", + "@tanstack/vue-router": "^1.170.38", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", diff --git a/examples/vue/basic/package.json b/examples/vue/basic/package.json index 9416d216b8..528b59db7b 100644 --- a/examples/vue/basic/package.json +++ b/examples/vue/basic/package.json @@ -9,7 +9,7 @@ "start": "vite" }, "dependencies": { - "@tanstack/vue-router": "^1.170.37", + "@tanstack/vue-router": "^1.170.38", "@tanstack/vue-router-devtools": "^1.167.2", "redaxios": "^0.5.1", "vue": "^3.5.13", diff --git a/packages/history/CHANGELOG.md b/packages/history/CHANGELOG.md index ae0e23af42..ca3341088c 100644 --- a/packages/history/CHANGELOG.md +++ b/packages/history/CHANGELOG.md @@ -1,5 +1,19 @@ # @tanstack/history +## 1.162.5 + +### Patch Changes + +- [#8605](https://github.com/TanStack/router/pull/8605) [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2) - Drop a duplicated current-location flag and a redundant `createHref` wrapper. + +- [#8605](https://github.com/TanStack/router/pull/8605) [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2) - Avoid temporary arrays when reading hash-history locations. + +- [#8605](https://github.com/TanStack/router/pull/8605) [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2) - Keep a leading query or fragment out of the parsed pathname, so hash-history URLs like `/#?x=1` no longer repeat the query in the router location. + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Fixed Link destinations that resolve to a route mask are now reused across navigations instead of being rebuilt every time. A mounted Link now follows changes to its `href` and `reloadDocument` props, and React Links no longer each subscribe to a hydration flag. + +- [#8605](https://github.com/TanStack/router/pull/8605) [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2) - Use `slice` instead of `substring` where the bounds are always ordered and non-negative. + ## 1.162.4 ### Patch Changes diff --git a/packages/history/package.json b/packages/history/package.json index 24987d12c7..d09c710d2f 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/history", - "version": "1.162.4", + "version": "1.162.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index f610095b28..4c4b343b32 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,21 @@ # @tanstack/react-router +## 1.170.42 + +### Patch Changes + +- [#8594](https://github.com/TanStack/router/pull/8594) [`2413cc0`](https://github.com/TanStack/router/commit/2413cc009826fba4f97b166a35a8a50a4a8fe4bb) - reduce component nesting per route match + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Links of a route that the pending navigation leaves skip deriving the destination location, and clicks and preloads follow the href a Link displays. `buildLocation` now builds `mask` and `routeMasks` locations from the same `_fromLocation` as the destination. + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Fixed Link destinations that resolve to a route mask are now reused across navigations instead of being rebuilt every time. A mounted Link now follows changes to its `href` and `reloadDocument` props, and React Links no longer each subscribe to a hydration flag. + +- [#8579](https://github.com/TanStack/router/pull/8579) [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b) - Cancel pending link preload timers when starting navigation to avoid redundant preloading while the destination is loading. + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/history@1.162.5 + - @tanstack/router-core@1.171.35 + ## 1.170.41 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 4b004dd879..fca9731bde 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.170.41", + "version": "1.170.42", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/CHANGELOG.md b/packages/react-start-client/CHANGELOG.md index 1629dec515..1089a0f391 100644 --- a/packages/react-start-client/CHANGELOG.md +++ b/packages/react-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-start-client +## 1.168.40 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`2413cc0`](https://github.com/TanStack/router/commit/2413cc009826fba4f97b166a35a8a50a4a8fe4bb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/react-router@1.170.42 + - @tanstack/start-client-core@1.170.35 + ## 1.168.39 ### Patch Changes diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 0d41558a1f..349e703263 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.168.39", + "version": "1.168.40", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index f911c0307e..0c26745c27 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,5 +1,16 @@ # @tanstack/react-start-rsc +## 0.1.60 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`2413cc0`](https://github.com/TanStack/router/commit/2413cc009826fba4f97b166a35a8a50a4a8fe4bb), [`4191640`](https://github.com/TanStack/router/commit/41916400b93fdb62189722266ed1d77ba9c26be9), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/react-router@1.170.42 + - @tanstack/start-plugin-core@1.171.50 + - @tanstack/start-client-core@1.170.35 + - @tanstack/start-storage-context@1.167.37 + ## 0.1.59 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index 0be518d39e..63c3b04318 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.59", + "version": "0.1.60", "description": "React Server Components support for TanStack Start", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/CHANGELOG.md b/packages/react-start-server/CHANGELOG.md index 758053adb5..97f2468575 100644 --- a/packages/react-start-server/CHANGELOG.md +++ b/packages/react-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/react-start-server +## 1.167.47 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`2413cc0`](https://github.com/TanStack/router/commit/2413cc009826fba4f97b166a35a8a50a4a8fe4bb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/react-router@1.170.42 + - @tanstack/start-server-core@1.169.40 + ## 1.167.46 ### Patch Changes diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 76b1aa7eb3..f3d0818119 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.167.46", + "version": "1.167.47", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/CHANGELOG.md b/packages/react-start/CHANGELOG.md index 5fcfc22f08..4151be61f4 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,5 +1,18 @@ # @tanstack/react-start +## 1.168.61 + +### Patch Changes + +- Updated dependencies [[`2413cc0`](https://github.com/TanStack/router/commit/2413cc009826fba4f97b166a35a8a50a4a8fe4bb), [`4191640`](https://github.com/TanStack/router/commit/41916400b93fdb62189722266ed1d77ba9c26be9), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b)]: + - @tanstack/react-router@1.170.42 + - @tanstack/start-plugin-core@1.171.50 + - @tanstack/start-server-core@1.169.40 + - @tanstack/react-start-client@1.168.40 + - @tanstack/react-start-rsc@0.1.60 + - @tanstack/react-start-server@1.167.47 + - @tanstack/start-client-core@1.170.35 + ## 1.168.60 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 7edacd9d72..925b4232dc 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.168.60", + "version": "1.168.61", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/CHANGELOG.md b/packages/router-cli/CHANGELOG.md index deba113f88..3601bd3f99 100644 --- a/packages/router-cli/CHANGELOG.md +++ b/packages/router-cli/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-cli +## 1.167.41 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-generator@1.167.41 + ## 1.167.40 ### Patch Changes diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 63e1f1a52a..19f4811dee 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.167.40", + "version": "1.167.41", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/CHANGELOG.md b/packages/router-core/CHANGELOG.md index 146d5ceb44..e416caa2c5 100644 --- a/packages/router-core/CHANGELOG.md +++ b/packages/router-core/CHANGELOG.md @@ -1,5 +1,22 @@ # @tanstack/router-core +## 1.171.35 + +### Patch Changes + +- [#8605](https://github.com/TanStack/router/pull/8605) [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2) - Drop a duplicated current-location flag and a redundant `createHref` wrapper. + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Links of a route that the pending navigation leaves skip deriving the destination location, and clicks and preloads follow the href a Link displays. `buildLocation` now builds `mask` and `routeMasks` locations from the same `_fromLocation` as the destination. + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Fixed Link destinations that resolve to a route mask are now reused across navigations instead of being rebuilt every time. A mounted Link now follows changes to its `href` and `reloadDocument` props, and React Links no longer each subscribe to a hydration flag. + +- [#8605](https://github.com/TanStack/router/pull/8605) [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2) - Use `slice` instead of `substring` where the bounds are always ordered and non-negative. + +- [#7654](https://github.com/TanStack/router/pull/7654) [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e) - Encode slashes in dehydrated SSR match IDs with `#` instead of a null byte, so the inlined hydration payload no longer contains U+0000 (which is invalid in HTML and rejected by markup validators) + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2)]: + - @tanstack/history@1.162.5 + ## 1.171.34 ### Patch Changes diff --git a/packages/router-core/package.json b/packages/router-core/package.json index b4e6fd6e75..36b91956ca 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.171.34", + "version": "1.171.35", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/CHANGELOG.md b/packages/router-generator/CHANGELOG.md index b686f27dc6..e3b74d16c2 100644 --- a/packages/router-generator/CHANGELOG.md +++ b/packages/router-generator/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-generator +## 1.167.41 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + ## 1.167.40 ### Patch Changes diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index 351589e5e9..ac9225ea42 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.167.40", + "version": "1.167.41", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/CHANGELOG.md b/packages/router-plugin/CHANGELOG.md index 00ec297c09..5ef324812f 100644 --- a/packages/router-plugin/CHANGELOG.md +++ b/packages/router-plugin/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/router-plugin +## 1.168.43 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`2413cc0`](https://github.com/TanStack/router/commit/2413cc009826fba4f97b166a35a8a50a4a8fe4bb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/react-router@1.170.42 + - @tanstack/router-generator@1.167.41 + ## 1.168.42 ### Patch Changes diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 7a36e2c7f4..9e20d6d308 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.168.42", + "version": "1.168.43", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/CHANGELOG.md b/packages/router-vite-plugin/CHANGELOG.md index 3344a1135f..084c222143 100644 --- a/packages/router-vite-plugin/CHANGELOG.md +++ b/packages/router-vite-plugin/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-vite-plugin +## 1.167.43 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-plugin@1.168.43 + ## 1.167.42 ### Patch Changes diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index b98a0cdc32..f33d83250b 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.167.42", + "version": "1.167.43", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/CHANGELOG.md b/packages/solid-router/CHANGELOG.md index 239f34bc88..9cacc2b47f 100644 --- a/packages/solid-router/CHANGELOG.md +++ b/packages/solid-router/CHANGELOG.md @@ -1,5 +1,21 @@ # @tanstack/solid-router +## 1.170.39 + +### Patch Changes + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Links of a route that the pending navigation leaves skip deriving the destination location, and clicks and preloads follow the href a Link displays. `buildLocation` now builds `mask` and `routeMasks` locations from the same `_fromLocation` as the destination. + +- [#8579](https://github.com/TanStack/router/pull/8579) [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b) - Cancel pending link preload timers when starting navigation to avoid redundant preloading while the destination is loading. + +- [#8619](https://github.com/TanStack/router/pull/8619) [`e7ab157`](https://github.com/TanStack/router/commit/e7ab1570ec3ba461cd1ef2c75d5fab2011cf1043) - Solid Links resolve their own props through one reactive memo instead of two, which makes mounting and updating many Links slightly faster. + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Solid and Vue Links reuse the router's built destination across navigations and derive their state through fewer reactive nodes. Solid Links call a user `ref` once per element and create no reactive nodes on the server. + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/history@1.162.5 + - @tanstack/router-core@1.171.35 + ## 1.170.38 ### Patch Changes diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index d8ffcd2f31..488ac3fd42 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.170.38", + "version": "1.170.39", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/CHANGELOG.md b/packages/solid-start-client/CHANGELOG.md index 608534af4a..3761db8cfd 100644 --- a/packages/solid-start-client/CHANGELOG.md +++ b/packages/solid-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start-client +## 1.168.38 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`e7ab157`](https://github.com/TanStack/router/commit/e7ab1570ec3ba461cd1ef2c75d5fab2011cf1043), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/solid-router@1.170.39 + - @tanstack/start-client-core@1.170.35 + ## 1.168.37 ### Patch Changes diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 5cde7dc982..8a1bfb4d84 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.168.37", + "version": "1.168.38", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/CHANGELOG.md b/packages/solid-start-server/CHANGELOG.md index 334ebf7c15..1aa6201382 100644 --- a/packages/solid-start-server/CHANGELOG.md +++ b/packages/solid-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start-server +## 1.167.45 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`e7ab157`](https://github.com/TanStack/router/commit/e7ab1570ec3ba461cd1ef2c75d5fab2011cf1043), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/solid-router@1.170.39 + - @tanstack/start-server-core@1.169.40 + ## 1.167.44 ### Patch Changes diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 04cff794d7..f0484e9c22 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.167.44", + "version": "1.167.45", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/CHANGELOG.md b/packages/solid-start/CHANGELOG.md index da089aa385..58a2873232 100644 --- a/packages/solid-start/CHANGELOG.md +++ b/packages/solid-start/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/solid-start +## 1.168.58 + +### Patch Changes + +- Updated dependencies [[`4191640`](https://github.com/TanStack/router/commit/41916400b93fdb62189722266ed1d77ba9c26be9), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`e7ab157`](https://github.com/TanStack/router/commit/e7ab1570ec3ba461cd1ef2c75d5fab2011cf1043), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb)]: + - @tanstack/start-plugin-core@1.171.50 + - @tanstack/solid-router@1.170.39 + - @tanstack/start-server-core@1.169.40 + - @tanstack/solid-start-client@1.168.38 + - @tanstack/solid-start-server@1.167.45 + - @tanstack/start-client-core@1.170.35 + ## 1.168.57 ### Patch Changes diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index ecda690bc3..09b54efa46 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.168.57", + "version": "1.168.58", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/CHANGELOG.md b/packages/start-client-core/CHANGELOG.md index d97716d8ee..9df3cb2783 100644 --- a/packages/start-client-core/CHANGELOG.md +++ b/packages/start-client-core/CHANGELOG.md @@ -1,5 +1,13 @@ # @tanstack/start-client-core +## 1.170.35 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/start-storage-context@1.167.37 + ## 1.170.34 ### Patch Changes diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 9e911146a8..cff8e5a0f7 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.170.34", + "version": "1.170.35", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/CHANGELOG.md b/packages/start-plugin-core/CHANGELOG.md index 58d85a47c3..7a5dfbb34b 100644 --- a/packages/start-plugin-core/CHANGELOG.md +++ b/packages/start-plugin-core/CHANGELOG.md @@ -1,5 +1,19 @@ # @tanstack/start-plugin-core +## 1.171.50 + +### Patch Changes + +- [#7830](https://github.com/TanStack/router/pull/7830) [`4191640`](https://github.com/TanStack/router/commit/41916400b93fdb62189722266ed1d77ba9c26be9) - Fix dev SSR style collection to preserve CSS order without duplicating imported styles, while retaining styles from code-split routes. Keep layered imports from inline styles out of the global dev stylesheet. In bundled development, collect styles from a complete client bundle and load compiler dependencies through the bundler to avoid restarting client plugins. Preserve client hydration and reload SSR modules on file changes instead of clearing them on every request. + + Support newer Vite bundled dev versions by loading their separate client runtime before hydration and awaiting the client build through the updated environment API. + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/start-server-core@1.169.40 + - @tanstack/router-generator@1.167.41 + - @tanstack/router-plugin@1.168.43 + ## 1.171.49 ### Patch Changes diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 46336e366b..6ab02f91e5 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.49", + "version": "1.171.50", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/CHANGELOG.md b/packages/start-server-core/CHANGELOG.md index 81b9ea6dfb..451b78fd36 100644 --- a/packages/start-server-core/CHANGELOG.md +++ b/packages/start-server-core/CHANGELOG.md @@ -1,5 +1,15 @@ # @tanstack/start-server-core +## 1.169.40 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/history@1.162.5 + - @tanstack/router-core@1.171.35 + - @tanstack/start-client-core@1.170.35 + - @tanstack/start-storage-context@1.167.37 + ## 1.169.39 ### Patch Changes diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index dd4b15506e..1dd2e0e483 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.169.39", + "version": "1.169.40", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-static-server-functions/CHANGELOG.md b/packages/start-static-server-functions/CHANGELOG.md index b212575d5e..b5a680607f 100644 --- a/packages/start-static-server-functions/CHANGELOG.md +++ b/packages/start-static-server-functions/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/start-static-server-functions +## 1.167.40 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/start-client-core@1.170.35 + - @tanstack/react-start@1.168.61 + - @tanstack/solid-start@1.168.58 + ## 1.167.39 ### Patch Changes diff --git a/packages/start-static-server-functions/package.json b/packages/start-static-server-functions/package.json index f18c4a6588..109b84eed6 100644 --- a/packages/start-static-server-functions/package.json +++ b/packages/start-static-server-functions/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-static-server-functions", - "version": "1.167.39", + "version": "1.167.40", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-storage-context/CHANGELOG.md b/packages/start-storage-context/CHANGELOG.md index 6a6d0e4002..7ef32b7300 100644 --- a/packages/start-storage-context/CHANGELOG.md +++ b/packages/start-storage-context/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/start-storage-context +## 1.167.37 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + ## 1.167.36 ### Patch Changes diff --git a/packages/start-storage-context/package.json b/packages/start-storage-context/package.json index 2e8033123f..622c607422 100644 --- a/packages/start-storage-context/package.json +++ b/packages/start-storage-context/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-storage-context", - "version": "1.167.36", + "version": "1.167.37", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-router/CHANGELOG.md b/packages/vue-router/CHANGELOG.md index 4d27c2d8ad..3585481849 100644 --- a/packages/vue-router/CHANGELOG.md +++ b/packages/vue-router/CHANGELOG.md @@ -1,5 +1,19 @@ # @tanstack/vue-router +## 1.170.38 + +### Patch Changes + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Links of a route that the pending navigation leaves skip deriving the destination location, and clicks and preloads follow the href a Link displays. `buildLocation` now builds `mask` and `routeMasks` locations from the same `_fromLocation` as the destination. + +- [#8579](https://github.com/TanStack/router/pull/8579) [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b) - Cancel pending link preload timers when starting navigation to avoid redundant preloading while the destination is loading. + +- [#8602](https://github.com/TanStack/router/pull/8602) [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb) - Solid and Vue Links reuse the router's built destination across navigations and derive their state through fewer reactive nodes. Solid Links call a user `ref` once per element and create no reactive nodes on the server. + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/history@1.162.5 + - @tanstack/router-core@1.171.35 + ## 1.170.37 ### Patch Changes diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index e02f7aa4af..3585f2e596 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-router", - "version": "1.170.37", + "version": "1.170.38", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-client/CHANGELOG.md b/packages/vue-start-client/CHANGELOG.md index 8e4ff25b0c..f83d3c73ba 100644 --- a/packages/vue-start-client/CHANGELOG.md +++ b/packages/vue-start-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-start-client +## 1.167.41 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/vue-router@1.170.38 + - @tanstack/start-client-core@1.170.35 + ## 1.167.40 ### Patch Changes diff --git a/packages/vue-start-client/package.json b/packages/vue-start-client/package.json index 58b878b841..832c46970a 100644 --- a/packages/vue-start-client/package.json +++ b/packages/vue-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-client", - "version": "1.167.40", + "version": "1.167.41", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-server/CHANGELOG.md b/packages/vue-start-server/CHANGELOG.md index 209d848178..ca8e1135ed 100644 --- a/packages/vue-start-server/CHANGELOG.md +++ b/packages/vue-start-server/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/vue-start-server +## 1.167.45 + +### Patch Changes + +- Updated dependencies [[`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`dfe3dea`](https://github.com/TanStack/router/commit/dfe3dea88a28400db1677111e2b15ae7914782c2), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`663282b`](https://github.com/TanStack/router/commit/663282b0ebbc494aee3595ed95867ee29d01938e)]: + - @tanstack/router-core@1.171.35 + - @tanstack/vue-router@1.170.38 + - @tanstack/start-server-core@1.169.40 + ## 1.167.44 ### Patch Changes diff --git a/packages/vue-start-server/package.json b/packages/vue-start-server/package.json index de1d4abbbd..e15bcedea0 100644 --- a/packages/vue-start-server/package.json +++ b/packages/vue-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start-server", - "version": "1.167.44", + "version": "1.167.45", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start/CHANGELOG.md b/packages/vue-start/CHANGELOG.md index 7d3317a376..f875a4a9c7 100644 --- a/packages/vue-start/CHANGELOG.md +++ b/packages/vue-start/CHANGELOG.md @@ -1,5 +1,17 @@ # @tanstack/vue-start +## 1.168.57 + +### Patch Changes + +- Updated dependencies [[`4191640`](https://github.com/TanStack/router/commit/41916400b93fdb62189722266ed1d77ba9c26be9), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb), [`d35aab4`](https://github.com/TanStack/router/commit/d35aab425b07b46e222a507c0f0239644669757b), [`efc2042`](https://github.com/TanStack/router/commit/efc2042c2d02a9780c3e7efe81f123d066a869eb)]: + - @tanstack/start-plugin-core@1.171.50 + - @tanstack/vue-router@1.170.38 + - @tanstack/start-server-core@1.169.40 + - @tanstack/start-client-core@1.170.35 + - @tanstack/vue-start-client@1.167.41 + - @tanstack/vue-start-server@1.167.45 + ## 1.168.56 ### Patch Changes diff --git a/packages/vue-start/package.json b/packages/vue-start/package.json index 6e3c35d44f..3e2e2de24f 100644 --- a/packages/vue-start/package.json +++ b/packages/vue-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start", - "version": "1.168.56", + "version": "1.168.57", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 15ee79ec63..bacfddc710 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11373,7 +11373,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11413,7 +11413,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11456,7 +11456,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11499,7 +11499,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11536,7 +11536,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11570,7 +11570,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11610,7 +11610,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11656,7 +11656,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11699,7 +11699,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11739,7 +11739,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router compression: specifier: ^1.8.0 @@ -11782,7 +11782,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11840,7 +11840,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11883,7 +11883,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11923,7 +11923,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11963,7 +11963,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router solid-js: specifier: 1.9.12 @@ -11997,7 +11997,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12037,7 +12037,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12086,7 +12086,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12135,7 +12135,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12181,7 +12181,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12221,7 +12221,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12258,7 +12258,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12292,7 +12292,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12323,7 +12323,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12354,7 +12354,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12394,7 +12394,7 @@ importers: specifier: ^4.2.2 version: 4.2.2 '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12431,7 +12431,7 @@ importers: examples/solid/quickstart-webpack-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12495,7 +12495,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12532,7 +12532,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12575,7 +12575,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12612,7 +12612,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12655,7 +12655,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12710,7 +12710,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12765,7 +12765,7 @@ importers: specifier: ^7.0.0 version: 7.0.0(@typescript/typescript6@6.0.2)(prisma@7.0.0(@types/react@19.2.9)(@typescript/typescript6@6.0.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12817,7 +12817,7 @@ importers: specifier: ^0.41.1 version: 0.41.1 '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12860,7 +12860,7 @@ importers: examples/solid/start-basic-cloudflare: dependencies: '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12903,7 +12903,7 @@ importers: examples/solid/start-basic-netlify: dependencies: '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12943,7 +12943,7 @@ importers: examples/solid/start-basic-nitro: dependencies: '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12989,7 +12989,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.102.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13035,7 +13035,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13090,7 +13090,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13157,7 +13157,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13215,7 +13215,7 @@ importers: examples/solid/start-counter: dependencies: '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13261,7 +13261,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13304,7 +13304,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13350,7 +13350,7 @@ importers: examples/solid/start-streaming-data-from-server-functions: dependencies: '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13390,7 +13390,7 @@ importers: specifier: ^2.48.1 version: 2.48.1 '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13430,7 +13430,7 @@ importers: examples/solid/start-tailwind-v4: dependencies: '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13479,7 +13479,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13516,7 +13516,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13559,7 +13559,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.38 + specifier: ^1.170.39 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From 42a7914cd5ebcb9fedd07b9bbab8f2b7a92bc579 Mon Sep 17 00:00:00 2001 From: Flo Date: Sat, 10 Oct 2026 14:09:42 +0200 Subject: [PATCH 098/175] test: format compiler output before comparing snapshots (#8658) * test: format compiler output before comparing file snapshots The router-plugin and start-plugin-core compiler snapshots record the layout choices of the code generator (object wrapping, blank lines, parentheses around JSX) along with the emitted program, so swapping the code generator rewrites most snapshot files even when the output is the same. Format the output with Prettier before comparing it: fixed options, `objectWrap: 'collapse'`, and blank lines outside template literals removed. Comments are kept. Output that does not parse is compared as is. Co-Authored-By: Claude Opus 5.5 * test: regenerate compiler snapshots with formatted output Co-Authored-By: Claude Opus 5.5 * test: format inline compiler snapshots before comparing them Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- packages/router-plugin/package.json | 1 + packages/router-plugin/tests/add-hmr.test.ts | 13 +- .../snapshots/react/arrow-function@false.tsx | 15 +- .../snapshots/react/arrow-function@true.tsx | 164 ++++++------ .../react/arrow-function@webpack-hot.tsx | 142 ++++++----- ...teFileRoute-lowercase-components@false.tsx | 23 +- ...ateFileRoute-lowercase-components@true.tsx | 182 +++++++------- ...createRootRoute-inline-component@false.tsx | 5 +- .../createRootRoute-inline-component@true.tsx | 148 +++++------ ...teRootRoute-lowercase-components@false.tsx | 5 - ...ateRootRoute-lowercase-components@true.tsx | 160 ++++++------ .../snapshots/react/createRootRoute@false.tsx | 6 +- .../snapshots/react/createRootRoute@true.tsx | 145 +++++------ ...teRootRouteWithContext-type-args@false.tsx | 3 - ...ateRootRouteWithContext-type-args@true.tsx | 150 +++++------ .../snapshots/react/destructuring@false.tsx | 2 - .../snapshots/react/destructuring@true.tsx | 2 - .../explicit-undefined-component@false.tsx | 5 +- .../explicit-undefined-component@true.tsx | 145 +++++------ .../react/function-declaration@false.tsx | 15 +- .../react/function-declaration@true.tsx | 164 ++++++------ .../snapshots/react/multi-component@false.tsx | 21 +- .../snapshots/react/multi-component@true.tsx | 181 +++++++------- .../react/string-literal-keys@false.tsx | 23 +- .../react/string-literal-keys@true.tsx | 183 +++++++------- .../snapshots/solid/arrow-function@false.tsx | 13 +- .../snapshots/solid/arrow-function@true.tsx | 112 ++++----- .../router-plugin/tests/code-splitter.test.ts | 17 +- .../react/1-default/arrow-function.tsx | 15 +- .../1-default/arrow-function@component.tsx | 44 ++-- .../arrow-function@errorComponent.tsx | 2 +- .../arrow-function@notFoundComponent.tsx | 2 +- .../react/1-default/boolean-null-literals.tsx | 14 +- .../boolean-null-literals@component.tsx | 4 +- .../snapshots/react/1-default/chinese.tsx | 16 +- .../react/1-default/chinese@component.tsx | 34 +-- .../1-default/chinese@errorComponent.tsx | 6 +- .../1-default/chinese@notFoundComponent.tsx | 6 +- .../circular-reference-arrow-function.tsx | 11 +- ...lar-reference-arrow-function@component.tsx | 24 +- .../1-default/circular-reference-function.tsx | 11 +- .../circular-reference-function@component.tsx | 20 +- .../1-default/conditional-properties.tsx | 17 +- .../conditional-properties@component.tsx | 10 +- .../destructured-export-multiple.tsx | 22 +- ...destructured-export-multiple@component.tsx | 10 +- .../1-default/destructured-export-nested.tsx | 25 +- .../destructured-export-nested@component.tsx | 10 +- .../react/1-default/destructured-export.tsx | 22 +- .../destructured-export@component.tsx | 15 +- .../destructured-export@errorComponent.tsx | 9 +- .../destructured-export@notFoundComponent.tsx | 9 +- ...ructured-react-memo-imported-component.tsx | 13 +- ...eact-memo-imported-component@component.tsx | 8 +- .../destructured-route-options-defaults.tsx | 13 +- ...tured-route-options-defaults@component.tsx | 4 +- ...ructured-route-options-defaults@shared.tsx | 29 +-- .../react/1-default/destructuring.tsx | 2 - .../1-default/destructuring@component.tsx | 14 +- .../destructuring@errorComponent.tsx | 14 +- .../destructuring@notFoundComponent.tsx | 14 +- .../react/1-default/directive-prologue.tsx | 14 +- .../directive-prologue@component.tsx | 9 +- .../explicit-undefined-component.tsx | 5 +- ...explicit-undefined-component@component.tsx | 2 +- ...cit-undefined-component@errorComponent.tsx | 2 +- ...-undefined-component@notFoundComponent.tsx | 2 +- ...-default-component-and-normal-notFound.tsx | 30 ++- ...omponent-and-normal-notFound@component.tsx | 2 +- ...ent-and-normal-notFound@errorComponent.tsx | 2 +- ...-and-normal-notFound@notFoundComponent.tsx | 6 +- .../1-default/export-default-component.tsx | 7 +- .../export-default-component@component.tsx | 2 +- ...xport-default-component@errorComponent.tsx | 2 +- ...rt-default-component@notFoundComponent.tsx | 2 +- .../react/1-default/function-as-parameter.tsx | 9 - .../function-as-parameter@component.tsx | 30 +-- .../function-as-parameter@errorComponent.tsx | 30 +-- ...unction-as-parameter@notFoundComponent.tsx | 30 +-- .../react/1-default/function-declaration.tsx | 15 +- .../function-declaration@component.tsx | 42 ++-- .../function-declaration@errorComponent.tsx | 2 +- ...function-declaration@notFoundComponent.tsx | 2 +- .../react/1-default/importAttribute.tsx | 11 +- .../1-default/importAttribute@component.tsx | 6 +- ...-default-component-destructured-loader.tsx | 13 +- ...omponent-destructured-loader@component.tsx | 6 +- .../1-default/imported-default-component.tsx | 11 +- .../imported-default-component@component.tsx | 6 +- .../1-default/imported-errorComponent.tsx | 17 +- .../imported-errorComponent@component.tsx | 6 +- ...imported-errorComponent@errorComponent.tsx | 6 +- .../1-default/imported-notFoundComponent.tsx | 17 +- .../imported-notFoundComponent@component.tsx | 6 +- ...ed-notFoundComponent@notFoundComponent.tsx | 6 +- .../1-default/imported-pendingComponent.tsx | 13 +- .../imported-pendingComponent@component.tsx | 6 +- .../snapshots/react/1-default/imported.tsx | 13 +- .../react/1-default/imported@component.tsx | 6 +- .../snapshots/react/1-default/inline.tsx | 16 +- .../react/1-default/inline@component.tsx | 34 +-- .../react/1-default/inline@errorComponent.tsx | 4 +- .../1-default/inline@notFoundComponent.tsx | 4 +- .../lowercase-function-declaration.tsx | 21 +- ...wercase-function-declaration@component.tsx | 4 +- ...se-function-declaration@errorComponent.tsx | 4 +- .../react/1-default/random-number.tsx | 67 +++-- .../1-default/random-number@component.tsx | 93 +++---- .../random-number@errorComponent.tsx | 38 +-- .../random-number@notFoundComponent.tsx | 38 +-- .../react/1-default/react-memo-component.tsx | 13 +- .../react-memo-component@component.tsx | 8 +- .../react-memo-imported-component.tsx | 13 +- ...eact-memo-imported-component@component.tsx | 8 +- .../1-default/retain-export-component.tsx | 3 - .../retain-export-component@component.tsx | 6 +- ...retain-export-component@errorComponent.tsx | 6 +- ...ain-export-component@notFoundComponent.tsx | 6 +- .../react/1-default/retain-exports-const.tsx | 5 - .../retain-exports-const@component.tsx | 4 +- .../retain-exports-const@errorComponent.tsx | 4 +- ...retain-exports-const@notFoundComponent.tsx | 4 +- .../1-default/retain-exports-destructured.tsx | 8 +- .../retain-exports-destructured@component.tsx | 4 +- .../retain-exports-destructured@shared.tsx | 15 +- .../1-default/retain-exports-function.tsx | 5 - .../retain-exports-function@component.tsx | 4 +- ...retain-exports-function@errorComponent.tsx | 4 +- ...ain-exports-function@notFoundComponent.tsx | 4 +- .../react/1-default/retain-exports-loader.tsx | 23 +- .../retain-exports-loader@component.tsx | 22 +- .../retain-exports-loader@errorComponent.tsx | 4 +- ...etain-exports-loader@notFoundComponent.tsx | 4 +- .../react/1-default/shared-class.tsx | 15 +- .../1-default/shared-class@component.tsx | 6 +- .../react/1-default/shared-class@shared.tsx | 10 +- .../1-default/shared-destructured-export.tsx | 15 +- .../shared-destructured-export@component.tsx | 6 +- .../shared-destructured-export@shared.tsx | 12 +- .../react/1-default/shared-destructured.tsx | 13 +- .../shared-destructured@component.tsx | 6 +- .../1-default/shared-destructured@shared.tsx | 12 +- .../react/1-default/shared-exported.tsx | 19 +- .../1-default/shared-exported@component.tsx | 6 +- .../1-default/shared-exported@shared.tsx | 7 +- .../react/1-default/shared-function.tsx | 19 +- .../1-default/shared-function@component.tsx | 6 +- .../1-default/shared-function@shared.tsx | 6 +- .../1-default/shared-imported-binding.tsx | 13 +- .../shared-imported-binding@component.tsx | 6 +- .../react/1-default/shared-indirect-ref.tsx | 19 +- .../shared-indirect-ref@component.tsx | 10 +- .../1-default/shared-indirect-ref@shared.tsx | 8 +- .../1-default/shared-jsx-component-ref.tsx | 13 +- .../shared-jsx-component-ref@component.tsx | 6 +- .../shared-jsx-component-ref@shared.tsx | 5 +- .../snapshots/react/1-default/shared-none.tsx | 13 +- .../react/1-default/shared-none@component.tsx | 12 +- .../1-default/shared-referencing-route.tsx | 21 +- .../shared-referencing-route@component.tsx | 14 +- .../shared-referencing-route@shared.tsx | 4 +- .../react/1-default/shared-runtime.tsx | 40 +-- .../1-default/shared-runtime@component.tsx | 39 +-- .../shared-runtime@errorComponent.tsx | 18 +- .../shared-runtime@notFoundComponent.tsx | 18 +- .../react/1-default/shared-runtime@shared.tsx | 35 +-- .../react/1-default/shared-transitive.tsx | 17 +- .../1-default/shared-transitive@component.tsx | 6 +- .../1-default/shared-transitive@shared.tsx | 9 +- .../react/1-default/shared-variable.tsx | 19 +- .../1-default/shared-variable@component.tsx | 6 +- .../1-default/shared-variable@shared.tsx | 7 +- .../1-default/shared-with-side-effect.tsx | 17 +- .../shared-with-side-effect@component.tsx | 6 +- .../shared-with-side-effect@shared.tsx | 4 +- .../react/1-default/undefined-literals.tsx | 1 - .../react/1-default/useStateDestructure.tsx | 26 +- .../useStateDestructure@component.tsx | 4 +- .../useStateDestructure@errorComponent.tsx | 4 +- .../useStateDestructure@notFoundComponent.tsx | 4 +- .../arrow-function.tsx | 18 +- ...--notFoundComponent---pendingComponent.tsx | 44 ++-- .../arrow-function@loader.tsx | 8 +- .../boolean-null-literals.tsx | 17 +- ...--notFoundComponent---pendingComponent.tsx | 4 +- .../boolean-null-literals@loader.tsx | 6 +- .../chinese.tsx | 17 +- ...--notFoundComponent---pendingComponent.tsx | 34 +-- .../chinese@loader.tsx | 6 +- .../circular-reference-arrow-function.tsx | 11 +- ...--notFoundComponent---pendingComponent.tsx | 24 +- .../circular-reference-function.tsx | 11 +- ...--notFoundComponent---pendingComponent.tsx | 20 +- .../conditional-properties.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 10 +- .../conditional-properties@loader.tsx | 10 +- .../destructured-export-multiple.tsx | 22 +- ...--notFoundComponent---pendingComponent.tsx | 10 +- .../destructured-export-nested.tsx | 25 +- ...--notFoundComponent---pendingComponent.tsx | 10 +- .../destructured-export.tsx | 22 +- ...--notFoundComponent---pendingComponent.tsx | 15 +- .../destructured-export@loader.tsx | 9 +- ...ructured-react-memo-imported-component.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 8 +- ...d-react-memo-imported-component@loader.tsx | 6 +- .../destructured-route-options-defaults.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 4 +- ...ructured-route-options-defaults@loader.tsx | 4 +- ...ructured-route-options-defaults@shared.tsx | 29 +-- .../destructuring.tsx | 2 - ...--notFoundComponent---pendingComponent.tsx | 14 +- .../destructuring@loader.tsx | 14 +- .../directive-prologue.tsx | 14 +- ...--notFoundComponent---pendingComponent.tsx | 9 +- .../explicit-undefined-component.tsx | 5 +- ...--notFoundComponent---pendingComponent.tsx | 2 +- .../explicit-undefined-component@loader.tsx | 2 +- ...-default-component-and-normal-notFound.tsx | 30 ++- ...--notFoundComponent---pendingComponent.tsx | 6 +- ...t-component-and-normal-notFound@loader.tsx | 2 +- .../export-default-component.tsx | 7 +- ...--notFoundComponent---pendingComponent.tsx | 2 +- .../export-default-component@loader.tsx | 2 +- .../function-as-parameter.tsx | 9 - ...--notFoundComponent---pendingComponent.tsx | 30 +-- .../function-as-parameter@loader.tsx | 30 +-- .../function-declaration.tsx | 18 +- ...--notFoundComponent---pendingComponent.tsx | 42 ++-- .../function-declaration@loader.tsx | 8 +- .../importAttribute.tsx | 11 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- ...-default-component-destructured-loader.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- ...t-component-destructured-loader@loader.tsx | 6 +- .../imported-default-component.tsx | 11 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../imported-errorComponent.tsx | 17 +- ...--notFoundComponent---pendingComponent.tsx | 12 +- .../imported-notFoundComponent.tsx | 17 +- ...--notFoundComponent---pendingComponent.tsx | 12 +- .../imported-pendingComponent.tsx | 17 +- ...--notFoundComponent---pendingComponent.tsx | 12 +- .../imported.tsx | 15 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../imported@loader.tsx | 6 +- .../inline.tsx | 17 +- ...--notFoundComponent---pendingComponent.tsx | 34 +-- .../inline@loader.tsx | 4 +- .../lowercase-function-declaration.tsx | 25 +- ...--notFoundComponent---pendingComponent.tsx | 12 +- .../random-number.tsx | 65 +++-- ...--notFoundComponent---pendingComponent.tsx | 93 +++---- .../random-number@loader.tsx | 48 ++-- .../react-memo-component.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 8 +- .../react-memo-component@loader.tsx | 6 +- .../react-memo-imported-component.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 8 +- .../react-memo-imported-component@loader.tsx | 6 +- .../retain-export-component.tsx | 37 +-- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../retain-export-component@loader.tsx | 12 +- .../retain-exports-const.tsx | 5 - ...--notFoundComponent---pendingComponent.tsx | 4 +- .../retain-exports-const@loader.tsx | 4 +- .../retain-exports-destructured.tsx | 8 +- ...--notFoundComponent---pendingComponent.tsx | 4 +- .../retain-exports-destructured@loader.tsx | 4 +- .../retain-exports-destructured@shared.tsx | 15 +- .../retain-exports-function.tsx | 5 - ...--notFoundComponent---pendingComponent.tsx | 4 +- .../retain-exports-function@loader.tsx | 4 +- .../retain-exports-loader.tsx | 27 +- ...--notFoundComponent---pendingComponent.tsx | 22 +- .../retain-exports-loader@loader.tsx | 4 +- .../shared-class.tsx | 15 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../shared-class@loader.tsx | 8 +- .../shared-class@shared.tsx | 10 +- .../shared-destructured-export.tsx | 18 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../shared-destructured-export@loader.tsx | 6 +- .../shared-destructured-export@shared.tsx | 12 +- .../shared-destructured.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../shared-destructured@loader.tsx | 6 +- .../shared-destructured@shared.tsx | 12 +- .../shared-exported.tsx | 18 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../shared-exported@loader.tsx | 10 +- .../shared-exported@shared.tsx | 7 +- .../shared-function.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../shared-function@loader.tsx | 12 +- .../shared-function@shared.tsx | 6 +- .../shared-imported-binding.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../shared-imported-binding@loader.tsx | 6 +- .../shared-indirect-ref.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 10 +- .../shared-indirect-ref@loader.tsx | 12 +- .../shared-indirect-ref@shared.tsx | 8 +- .../shared-jsx-component-ref.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../shared-jsx-component-ref@loader.tsx | 6 +- .../shared-jsx-component-ref@shared.tsx | 5 +- .../shared-none.tsx | 15 +- ...--notFoundComponent---pendingComponent.tsx | 12 +- .../shared-none@loader.tsx | 6 +- .../shared-referencing-route.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 14 +- .../shared-referencing-route@loader.tsx | 16 +- .../shared-referencing-route@shared.tsx | 4 +- .../shared-runtime.tsx | 36 ++- ...--notFoundComponent---pendingComponent.tsx | 39 +-- .../shared-runtime@loader.tsx | 31 +-- .../shared-runtime@shared.tsx | 35 +-- .../shared-transitive.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../shared-transitive@loader.tsx | 10 +- .../shared-transitive@shared.tsx | 9 +- .../shared-variable.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../shared-variable@loader.tsx | 12 +- .../shared-variable@shared.tsx | 7 +- .../shared-with-side-effect.tsx | 18 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../shared-with-side-effect@loader.tsx | 8 +- .../shared-with-side-effect@shared.tsx | 4 +- .../undefined-literals.tsx | 1 - .../useStateDestructure.tsx | 26 +- ...--notFoundComponent---pendingComponent.tsx | 4 +- .../useStateDestructure@loader.tsx | 4 +- .../using.tsx | 8 +- .../using@loader.tsx | 24 +- .../arrow-function.tsx | 18 +- ...--notFoundComponent---pendingComponent.tsx | 50 ++-- .../arrow-function@errorComponent.tsx | 2 +- .../boolean-null-literals.tsx | 17 +- ...--notFoundComponent---pendingComponent.tsx | 10 +- .../chinese.tsx | 17 +- ...--notFoundComponent---pendingComponent.tsx | 34 +-- .../chinese@errorComponent.tsx | 6 +- .../circular-reference-arrow-function.tsx | 11 +- ...--notFoundComponent---pendingComponent.tsx | 24 +- .../circular-reference-function.tsx | 11 +- ...--notFoundComponent---pendingComponent.tsx | 20 +- .../conditional-properties.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 14 +- .../destructured-export-multiple.tsx | 22 +- ...--notFoundComponent---pendingComponent.tsx | 10 +- .../destructured-export-nested.tsx | 25 +- ...--notFoundComponent---pendingComponent.tsx | 10 +- .../destructured-export.tsx | 22 +- ...--notFoundComponent---pendingComponent.tsx | 15 +- .../destructured-export@errorComponent.tsx | 9 +- ...ructured-react-memo-imported-component.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 14 +- .../destructured-route-options-defaults.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 24 +- .../destructuring.tsx | 2 - ...--notFoundComponent---pendingComponent.tsx | 14 +- .../destructuring@errorComponent.tsx | 14 +- .../directive-prologue.tsx | 14 +- ...--notFoundComponent---pendingComponent.tsx | 9 +- .../explicit-undefined-component.tsx | 5 +- ...--notFoundComponent---pendingComponent.tsx | 2 +- ...cit-undefined-component@errorComponent.tsx | 2 +- ...-default-component-and-normal-notFound.tsx | 30 ++- ...--notFoundComponent---pendingComponent.tsx | 6 +- ...ent-and-normal-notFound@errorComponent.tsx | 2 +- .../export-default-component.tsx | 7 +- ...--notFoundComponent---pendingComponent.tsx | 2 +- ...xport-default-component@errorComponent.tsx | 2 +- .../function-as-parameter.tsx | 9 - ...--notFoundComponent---pendingComponent.tsx | 30 +-- .../function-as-parameter@errorComponent.tsx | 30 +-- .../function-declaration.tsx | 18 +- ...--notFoundComponent---pendingComponent.tsx | 48 ++-- .../function-declaration@errorComponent.tsx | 2 +- .../importAttribute.tsx | 11 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- ...-default-component-destructured-loader.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 10 +- .../imported-default-component.tsx | 11 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- .../imported-errorComponent.tsx | 17 +- ...--notFoundComponent---pendingComponent.tsx | 6 +- ...imported-errorComponent@errorComponent.tsx | 6 +- .../imported-notFoundComponent.tsx | 17 +- ...--notFoundComponent---pendingComponent.tsx | 12 +- .../imported-pendingComponent.tsx | 17 +- ...--notFoundComponent---pendingComponent.tsx | 12 +- .../imported.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 10 +- .../inline.tsx | 17 +- ...--notFoundComponent---pendingComponent.tsx | 34 +-- .../inline@errorComponent.tsx | 4 +- .../lowercase-function-declaration.tsx | 25 +- ...--notFoundComponent---pendingComponent.tsx | 8 +- ...se-function-declaration@errorComponent.tsx | 4 +- .../random-number.tsx | 66 +++-- ...--notFoundComponent---pendingComponent.tsx | 103 ++++---- .../random-number@errorComponent.tsx | 38 +-- .../react-memo-component.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 14 +- .../react-memo-imported-component.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 12 +- .../retain-export-component.tsx | 37 +-- ...--notFoundComponent---pendingComponent.tsx | 12 +- ...retain-export-component@errorComponent.tsx | 6 +- .../retain-exports-const.tsx | 5 - ...--notFoundComponent---pendingComponent.tsx | 4 +- .../retain-exports-const@errorComponent.tsx | 4 +- .../retain-exports-destructured.tsx | 8 +- ...--notFoundComponent---pendingComponent.tsx | 2 +- .../retain-exports-function.tsx | 5 - ...--notFoundComponent---pendingComponent.tsx | 4 +- ...retain-exports-function@errorComponent.tsx | 4 +- .../retain-exports-loader.tsx | 27 +- ...--notFoundComponent---pendingComponent.tsx | 22 +- .../retain-exports-loader@errorComponent.tsx | 4 +- .../shared-class.tsx | 22 +- ...--notFoundComponent---pendingComponent.tsx | 18 +- .../shared-class@errorComponent.tsx | 8 +- .../shared-destructured-export.tsx | 28 +-- ...--notFoundComponent---pendingComponent.tsx | 10 +- .../shared-destructured.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 18 +- .../shared-exported.tsx | 21 +- ...--notFoundComponent---pendingComponent.tsx | 14 +- .../shared-function.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 18 +- .../shared-imported-binding.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 10 +- .../shared-indirect-ref.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 24 +- .../shared-jsx-component-ref.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 11 +- .../shared-none.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 18 +- .../shared-referencing-route.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 24 +- .../shared-runtime.tsx | 36 ++- ...--notFoundComponent---pendingComponent.tsx | 48 ++-- .../shared-runtime@errorComponent.tsx | 18 +- .../shared-runtime@shared.tsx | 35 +-- .../shared-transitive.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 19 +- .../shared-variable.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 19 +- .../shared-with-side-effect.tsx | 18 +- ...--notFoundComponent---pendingComponent.tsx | 12 +- .../undefined-literals.tsx | 1 - .../useStateDestructure.tsx | 26 +- ...--notFoundComponent---pendingComponent.tsx | 4 +- .../useStateDestructure@errorComponent.tsx | 4 +- .../using.tsx | 9 +- ...--notFoundComponent---pendingComponent.tsx | 24 +- .../solid/1-default/arrow-function.tsx | 13 +- .../1-default/arrow-function@component.tsx | 39 +-- .../arrow-function.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 39 +-- .../arrow-function@loader.tsx | 6 +- .../arrow-function.tsx | 16 +- ...--notFoundComponent---pendingComponent.tsx | 45 ++-- .../router-plugin/tests/delete-nodes.test.ts | 5 +- .../createRootRoute-ssr-function.tsx | 1 - ...reateRootRouteWithContext-ssr-function.tsx | 1 - .../ssr-data-only.tsx | 1 - .../1-delete-nodes-undefined/ssr-false.tsx | 1 - .../createRootRoute-ssr-function.tsx | 1 - ...reateRootRouteWithContext-ssr-function.tsx | 1 - .../2-delete-nodes-empty/ssr-data-only.tsx | 1 - .../react/2-delete-nodes-empty/ssr-false.tsx | 1 - .../createRootRoute-ssr-function.tsx | 8 +- ...reateRootRouteWithContext-ssr-function.tsx | 8 +- .../3-delete-nodes-ssr/ssr-data-only.tsx | 8 +- .../react/3-delete-nodes-ssr/ssr-false.tsx | 8 +- .../react/3-delete-nodes-ssr/ssr-function.tsx | 8 +- .../ssr-data-only.tsx | 1 - .../1-delete-nodes-undefined/ssr-false.tsx | 1 - .../1-delete-nodes-undefined/ssr-function.tsx | 1 - .../2-delete-nodes-empty/ssr-data-only.tsx | 1 - .../solid/2-delete-nodes-empty/ssr-false.tsx | 1 - .../2-delete-nodes-empty/ssr-function.tsx | 1 - .../3-delete-nodes-ssr/ssr-data-only.tsx | 8 +- .../solid/3-delete-nodes-ssr/ssr-false.tsx | 8 +- .../solid/3-delete-nodes-ssr/ssr-function.tsx | 8 +- .../router-plugin/tests/format-snapshot.ts | 69 ++++++ packages/start-plugin-core/package.json | 1 + .../tests/clientOnlyJSX/clientOnlyJSX.test.ts | 7 +- .../snapshots/server/clientOnlyBasic.tsx | 10 +- .../snapshots/server/clientOnlyMultiple.tsx | 10 +- .../snapshots/server/clientOnlyNested.tsx | 10 +- .../snapshots/server/clientOnlyNoFallback.tsx | 10 +- .../snapshots/server/clientOnlyRenamed.tsx | 10 +- .../createIsomorphicFn.test.ts | 7 +- .../snapshots/client/call-at-module-level.ts | 8 +- .../client/createIsomorphicFnDestructured.tsx | 22 +- .../createIsomorphicFnDestructuredRename.tsx | 22 +- .../client/createIsomorphicFnFactory.tsx | 25 +- .../client/createIsomorphicFnInline.tsx | 40 ++- .../client/createIsomorphicFnStarImport.tsx | 22 +- .../snapshots/server/call-at-module-level.ts | 8 +- .../server/createIsomorphicFnDestructured.tsx | 22 +- .../createIsomorphicFnDestructuredRename.tsx | 22 +- .../server/createIsomorphicFnFactory.tsx | 25 +- .../server/createIsomorphicFnInline.tsx | 40 ++- .../server/createIsomorphicFnStarImport.tsx | 22 +- .../createMiddleware/createMiddleware.test.ts | 17 +- .../client/create-function-middleware.ts | 10 +- .../client/createMiddlewareDestructured.tsx | 18 +- .../createMiddlewareDestructuredRename.tsx | 18 +- .../client/createMiddlewareStarImport.tsx | 18 +- .../client/createMiddlewareValidator.tsx | 6 +- .../snapshots/client/createStart.tsx | 22 +- .../snapshots/client/middleware-factory.ts | 21 +- .../createServerFn/createServerFn.test.ts | 234 ++++++++++++------ .../client/createServerFnDestructured.tsx | 60 +++-- .../createServerFnDestructuredRename.tsx | 36 +-- .../client/createServerFnStarImport.tsx | 36 ++- .../client/createServerFnValidator.tsx | 12 +- .../snapshots/client/factory.tsx | 64 +++-- .../snapshots/client/isomorphic-fns.tsx | 81 +++--- .../createServerFnDestructured.tsx | 64 +++-- .../createServerFnDestructuredRename.tsx | 36 +-- .../createServerFnStarImport.tsx | 36 ++- .../server-caller/createServerFnValidator.tsx | 16 +- .../snapshots/server-caller/factory.tsx | 64 +++-- .../server-caller/isomorphic-fns.tsx | 83 ++++--- .../createServerFnDestructured.tsx | 204 +++++++++------ .../createServerFnDestructuredRename.tsx | 136 ++++++---- .../createServerFnStarImport.tsx | 134 ++++++---- .../createServerFnValidator.tsx | 29 +-- .../snapshots/server-provider/factory.tsx | 101 ++++---- .../server-provider/isomorphic-fns.tsx | 54 ++-- .../tests/envOnly/envOnly.test.ts | 7 +- .../snapshots/client/envOnlyDestructured.tsx | 8 +- .../client/envOnlyDestructuredRename.tsx | 8 +- .../snapshots/client/envOnlyExportedAlias.tsx | 12 +- .../snapshots/client/envOnlyFactory.tsx | 36 +-- .../snapshots/client/envOnlyStarImport.tsx | 8 +- .../snapshots/server/envOnlyDestructured.tsx | 8 +- .../server/envOnlyDestructuredRename.tsx | 8 +- .../snapshots/server/envOnlyExportedAlias.tsx | 4 +- .../snapshots/server/envOnlyFactory.tsx | 36 +-- .../snapshots/server/envOnlyStarImport.tsx | 8 +- .../tests/format-snapshot.ts | 69 ++++++ .../tests/hydrateWhen/hydrateWhen.test.ts | 26 +- .../snapshots/client/hydrateWhenBasic.tsx | 40 +-- .../snapshots/client/hydrateWhenMultiple.tsx | 44 ++-- .../snapshots/client/hydrateWhenNested.tsx | 34 ++- .../snapshots/client/hydrateWhenNever.tsx | 21 +- .../client/hydrateWhenObjectFallback.tsx | 65 +++-- .../client/hydrateWhenPrefetchState.tsx | 45 ++-- .../snapshots/client/hydrateWhenRenamed.tsx | 23 +- .../snapshots/server/hydrateWhenBasic.tsx | 29 +-- .../snapshots/server/hydrateWhenMultiple.tsx | 18 +- .../snapshots/server/hydrateWhenNested.tsx | 20 +- .../snapshots/server/hydrateWhenNever.tsx | 14 +- .../server/hydrateWhenObjectFallback.tsx | 26 +- .../server/hydrateWhenPrefetchState.tsx | 32 ++- .../snapshots/server/hydrateWhenRenamed.tsx | 16 +- .../server/hydrateWhenSplitFalse.tsx | 14 +- .../hydrateWhenNested.tsx.H0.client.tsx | 29 ++- .../virtual/hydrateWhenNested.tsx.H0.tsx | 24 +- .../virtual/hydrateWhenNested.tsx.H2.tsx | 6 +- pnpm-lock.yaml | 6 + 570 files changed, 5798 insertions(+), 5350 deletions(-) create mode 100644 packages/router-plugin/tests/format-snapshot.ts create mode 100644 packages/start-plugin-core/tests/format-snapshot.ts diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 9e20d6d308..da6fef091f 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -139,6 +139,7 @@ "react-dom": "catalog:", "@types/react": "catalog:", "@types/react-dom": "catalog:", + "prettier": "^3.9.6", "@arethetypeswrong/cli": "catalog:", "publint": "catalog:", "rimraf": "catalog:", diff --git a/packages/router-plugin/tests/add-hmr.test.ts b/packages/router-plugin/tests/add-hmr.test.ts index 98b3e61a5f..810f8e9b8d 100644 --- a/packages/router-plugin/tests/add-hmr.test.ts +++ b/packages/router-plugin/tests/add-hmr.test.ts @@ -7,6 +7,7 @@ import { defaultCodeSplitGroupings } from '../src/core/constants' import { getFrameworkHmrCompilerPlugins } from '../src/core/code-splitter/plugins/framework-plugins' import { createRouteHmrStatement } from '../src/core/hmr' import { frameworks } from './constants' +import { formatSnapshot } from './format-snapshot' function getFrameworkDir(framework: string) { const files = path.resolve(__dirname, `./add-hmr/test-files/${framework}`) @@ -37,7 +38,9 @@ describe('add-hmr works', () => { }), }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join(dirs.snapshots, filename.replace('.tsx', '@true.tsx')), ) }, @@ -58,7 +61,9 @@ describe('add-hmr works', () => { targetFramework: framework, }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join(dirs.snapshots, filename.replace('.tsx', '@false.tsx')), ) }, @@ -87,7 +92,9 @@ describe('add-hmr works', () => { }), }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join( getFrameworkDir(framework).snapshots, filename.replace('.tsx', '@webpack-hot.tsx'), diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@false.tsx index 48e3768224..994c89e7b2 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@false.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsx index 4f32369e8f..c771483895 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsx @@ -1,109 +1,117 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: TSRSplitComponent -}); -const hot = import.meta.hot; + component: TSRSplitComponent, +}) +const hot = import.meta.hot if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("arrow-function.tsx", ['Route']); + hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('arrow-function.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hot = import.meta.hot + const hotData = (hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsx index 12e47f429e..eb655d0287 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsx @@ -1,87 +1,107 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.webpackHot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.webpackHot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.webpackHot) { - (import.meta.webpackHot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.webpackHot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: TSRSplitComponent -}); + component: TSRSplitComponent, +}) if (import.meta.webpackHot) { - const hot = import.meta.webpackHot; - const hotData = hot.data ??= {}; - const routeId = hotData['tsr-route-id'] ?? Route.id ?? (Route.isRoot ? '__root__' : undefined); + const hot = import.meta.webpackHot + const hotData = (hot.data ??= {}) + const routeId = + hotData['tsr-route-id'] ?? + Route.id ?? + (Route.isRoot ? '__root__' : undefined) if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } - const existingRoute = typeof window !== 'undefined' && routeId ? window.__TSR_ROUTER__?.routesById?.[routeId] : undefined; + const existingRoute = + typeof window !== 'undefined' && routeId + ? window.__TSR_ROUTER__?.routesById?.[routeId] + : undefined if (routeId && existingRoute && existingRoute !== Route) { - (function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + ;(function handleRouteUpdate(routeId, newRoute) { + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - })(routeId, Route); + })(routeId, Route) try { - const tsrReactRefreshUtils = typeof __react_refresh_utils__ !== 'undefined' ? __react_refresh_utils__ : undefined; - const tsrEnqueueUpdate = tsrReactRefreshUtils && typeof tsrReactRefreshUtils.enqueueUpdate === 'function' ? tsrReactRefreshUtils.enqueueUpdate : undefined; + const tsrReactRefreshUtils = + typeof __react_refresh_utils__ !== 'undefined' + ? __react_refresh_utils__ + : undefined + const tsrEnqueueUpdate = + tsrReactRefreshUtils && + typeof tsrReactRefreshUtils.enqueueUpdate === 'function' + ? tsrReactRefreshUtils.enqueueUpdate + : undefined if (tsrEnqueueUpdate) { - tsrEnqueueUpdate(() => {}); + tsrEnqueueUpdate(() => {}) } } catch (_err) {} } - hot.dispose(data => { + hot.dispose((data) => { if (routeId) { - data['tsr-route-id'] = routeId; + data['tsr-route-id'] = routeId } - }); - hot.accept(); -} \ No newline at end of file + }) + hot.accept() +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@false.tsx index a2983e31bd..e0b52f6ad6 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@false.tsx @@ -1,12 +1,17 @@ -const $$splitComponentImporter = () => import('createFileRoute-lowercase-components.tsx?tsr-split=component'); -const $$splitErrorComponentImporter = () => import('createFileRoute-lowercase-components.tsx?tsr-split=errorComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('createFileRoute-lowercase-components.tsx?tsr-split=component') +const $$splitErrorComponentImporter = () => + import('createFileRoute-lowercase-components.tsx?tsr-split=errorComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/lowercase-components')({ pendingComponent: pendingComponent, - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) function pendingComponent() { - return
Pending
; -} \ No newline at end of file + return
Pending
+} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@true.tsx index 70c428363e..bf94d5d3fd 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@true.tsx @@ -1,120 +1,136 @@ -const $$splitComponentImporter = () => import('createFileRoute-lowercase-components.tsx?tsr-split=component'); -const $$splitErrorComponentImporter = () => import('createFileRoute-lowercase-components.tsx?tsr-split=errorComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('createFileRoute-lowercase-components.tsx?tsr-split=component') +const $$splitErrorComponentImporter = () => + import('createFileRoute-lowercase-components.tsx?tsr-split=errorComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' const TSRSplitErrorComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:errorComponent"] ?? lazyRouteComponent($$splitErrorComponentImporter, "errorComponent"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:errorComponent'] ?? + lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:errorComponent"] = TSRSplitErrorComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:errorComponent'] = + TSRSplitErrorComponent } const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } export const Route = createFileRoute('/lowercase-components')({ pendingComponent: TSRPendingComponent, errorComponent: TSRSplitErrorComponent, - component: TSRSplitComponent -}); + component: TSRSplitComponent, +}) function TSRPendingComponent() { - return
Pending
; + return
Pending
} -const hot = import.meta.hot; +const hot = import.meta.hot if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createFileRoute-lowercase-components.tsx", ['Route']); + hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set( + 'createFileRoute-lowercase-components.tsx', + ['Route'], + ) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hot = import.meta.hot + const hotData = (hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@false.tsx index 5daf018617..7e3ad124ae 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@false.tsx @@ -1,6 +1,3 @@ import * as React from 'react' import { createRootRoute } from '@tanstack/react-router' - -export const Route = createRootRoute({ - component: () =>
root hmr
, -}) +export const Route = createRootRoute({ component: () =>
root hmr
}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsx index e5a473dc14..f12187ccd1 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsx @@ -1,98 +1,102 @@ -import * as React from 'react'; -import { createRootRoute } from '@tanstack/react-router'; -const TSRComponent = () =>
root hmr
; -export const Route = createRootRoute({ - component: TSRComponent -}); -const hot = import.meta.hot; +import * as React from 'react' +import { createRootRoute } from '@tanstack/react-router' +const TSRComponent = () =>
root hmr
+export const Route = createRootRoute({ component: TSRComponent }) +const hot = import.meta.hot if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createRootRoute-inline-component.tsx", ['Route']); + hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set( + 'createRootRoute-inline-component.tsx', + ['Route'], + ) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hot = import.meta.hot + const hotData = (hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@false.tsx index 20c9a07798..6fac4df1f1 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@false.tsx @@ -1,25 +1,20 @@ import * as React from 'react' import { createRootRoute } from '@tanstack/react-router' - export const Route = createRootRoute({ shellComponent: shellComponent, pendingComponent: pendingComponent, errorComponent: errorComponent, component: component, }) - function shellComponent({ children }: { children: React.ReactNode }) { return {children} } - function pendingComponent() { return
Pending
} - function errorComponent() { return
Error
} - function component() { return
Hello
} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@true.tsx index cb5014cd35..9f8df0d43f 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@true.tsx @@ -1,116 +1,118 @@ -import * as React from 'react'; -import { createRootRoute } from '@tanstack/react-router'; +import * as React from 'react' +import { createRootRoute } from '@tanstack/react-router' export const Route = createRootRoute({ shellComponent: TSRShellComponent, pendingComponent: TSRPendingComponent, errorComponent: TSRErrorComponent, - component: TSRComponent -}); -function TSRShellComponent({ - children -}: { - children: React.ReactNode; -}) { - return {children}; + component: TSRComponent, +}) +function TSRShellComponent({ children }: { children: React.ReactNode }) { + return {children} } function TSRPendingComponent() { - return
Pending
; + return
Pending
} function TSRErrorComponent() { - return
Error
; + return
Error
} function TSRComponent() { - return
Hello
; + return
Hello
} -const hot = import.meta.hot; +const hot = import.meta.hot if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createRootRoute-lowercase-components.tsx", ['Route']); + hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set( + 'createRootRoute-lowercase-components.tsx', + ['Route'], + ) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hot = import.meta.hot + const hotData = (hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@false.tsx index e967791f8d..5c779d9876 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@false.tsx @@ -1,10 +1,6 @@ import * as React from 'react' import { createRootRoute } from '@tanstack/react-router' - -export const Route = createRootRoute({ - component: RootComponent, -}) - +export const Route = createRootRoute({ component: RootComponent }) function RootComponent() { return
Hello
} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsx index 7ba271c212..859380ef53 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsx @@ -1,100 +1,101 @@ -import * as React from 'react'; -import { createRootRoute } from '@tanstack/react-router'; -export const Route = createRootRoute({ - component: RootComponent -}); +import * as React from 'react' +import { createRootRoute } from '@tanstack/react-router' +export const Route = createRootRoute({ component: RootComponent }) function RootComponent() { - return
Hello
; + return
Hello
} -const hot = import.meta.hot; +const hot = import.meta.hot if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createRootRoute.tsx", ['Route']); + hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('createRootRoute.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hot = import.meta.hot + const hotData = (hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@false.tsx index 0feadacab5..43f27087a6 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@false.tsx @@ -1,14 +1,11 @@ import * as React from 'react' import { createRootRouteWithContext } from '@tanstack/react-router' - interface MyRouterContext { auth: boolean } - export const Route = createRootRouteWithContext()({ component: RootComponent, }) - function RootComponent() { return
Hello
} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsx index b66449aebf..9d942f65a2 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsx @@ -1,103 +1,109 @@ -import * as React from 'react'; -import { createRootRouteWithContext } from '@tanstack/react-router'; +import * as React from 'react' +import { createRootRouteWithContext } from '@tanstack/react-router' interface MyRouterContext { - auth: boolean; + auth: boolean } export const Route = createRootRouteWithContext()({ - component: RootComponent -}); + component: RootComponent, +}) function RootComponent() { - return
Hello
; + return
Hello
} -const hot = import.meta.hot; +const hot = import.meta.hot if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createRootRouteWithContext-type-args.tsx", ['Route']); + hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set( + 'createRootRouteWithContext-type-args.tsx', + ['Route'], + ) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hot = import.meta.hot + const hotData = (hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@false.tsx index d80f17484f..112fded569 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@false.tsx @@ -1,11 +1,9 @@ import thing from 'thing' - export function test() { const { foo: { bar: { destructured }, }, } = thing - return destructured } diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@true.tsx index d80f17484f..112fded569 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@true.tsx @@ -1,11 +1,9 @@ import thing from 'thing' - export function test() { const { foo: { bar: { destructured }, }, } = thing - return destructured } diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@false.tsx index 4fdd9d1c68..8109a89624 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@false.tsx @@ -1,6 +1,3 @@ import React from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ - component: undefined, -}) +export const Route = createFileRoute('/')({ component: undefined }) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsx index fee0b2f2e6..555c8fdd6c 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsx @@ -1,97 +1,100 @@ -import React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -export const Route = createFileRoute('/')({ - component: undefined -}); -const hot = import.meta.hot; +import React from 'react' +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/')({ component: undefined }) +const hot = import.meta.hot if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("explicit-undefined-component.tsx", ['Route']); + hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('explicit-undefined-component.tsx', [ + 'Route', + ]) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hot = import.meta.hot + const hotData = (hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@false.tsx index 5d7e2181f5..e2b672f7b8 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@false.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('function-declaration.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('function-declaration.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsx index 4a925828e2..9e27af7d69 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsx @@ -1,109 +1,117 @@ -const $$splitComponentImporter = () => import('function-declaration.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('function-declaration.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: TSRSplitComponent -}); -const hot = import.meta.hot; + component: TSRSplitComponent, +}) +const hot = import.meta.hot if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("function-declaration.tsx", ['Route']); + hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('function-declaration.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hot = import.meta.hot + const hotData = (hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@false.tsx index 653c0c21f5..456134aadc 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@false.tsx @@ -1,11 +1,16 @@ -const $$splitErrorComponentImporter = () => import('multi-component.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('multi-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitErrorComponentImporter = () => + import('multi-component.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('multi-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: lazyRouteComponent($$splitComponentImporter, 'component'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsx index ca2a7ab2e2..1a134b88da 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsx @@ -1,119 +1,132 @@ -const $$splitErrorComponentImporter = () => import('multi-component.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('multi-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitErrorComponentImporter = () => + import('multi-component.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('multi-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } const TSRSplitErrorComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:errorComponent"] ?? lazyRouteComponent($$splitErrorComponentImporter, "errorComponent"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:errorComponent'] ?? + lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:errorComponent"] = TSRSplitErrorComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:errorComponent'] = + TSRSplitErrorComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: TSRSplitComponent, - errorComponent: TSRSplitErrorComponent -}); -const hot = import.meta.hot; + errorComponent: TSRSplitErrorComponent, +}) +const hot = import.meta.hot if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("multi-component.tsx", ['Route']); + hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('multi-component.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hot = import.meta.hot + const hotData = (hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@false.tsx index 4fc3129e14..cfb23b03d2 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@false.tsx @@ -1,11 +1,16 @@ -const $$splitErrorComponentImporter = () => import('string-literal-keys.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('string-literal-keys.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitErrorComponentImporter = () => + import('string-literal-keys.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('string-literal-keys.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - 'component': lazyRouteComponent($$splitComponentImporter, 'component'), - 'errorComponent': lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsx index b6f67e67b1..b3bc82d69e 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsx @@ -1,119 +1,132 @@ -const $$splitErrorComponentImporter = () => import('string-literal-keys.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('string-literal-keys.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitErrorComponentImporter = () => + import('string-literal-keys.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('string-literal-keys.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } const TSRSplitErrorComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:errorComponent"] ?? lazyRouteComponent($$splitErrorComponentImporter, "errorComponent"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:errorComponent'] ?? + lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:errorComponent"] = TSRSplitErrorComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:errorComponent'] = + TSRSplitErrorComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, - 'component': TSRSplitComponent, - 'errorComponent': TSRSplitErrorComponent -}); -const hot = import.meta.hot; + component: TSRSplitComponent, + errorComponent: TSRSplitErrorComponent, +}) +const hot = import.meta.hot if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("string-literal-keys.tsx", ['Route']); + hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('string-literal-keys.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hot = import.meta.hot + const hotData = (hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@false.tsx index b09548da57..10bedc87f0 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@false.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/solid-router'; -import { createFileRoute } from '@tanstack/solid-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/solid-router' +import { createFileRoute } from '@tanstack/solid-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsx index 754da5c902..05fa745c4b 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsx @@ -1,80 +1,80 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/solid-router'; -import { createFileRoute } from '@tanstack/solid-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/solid-router' +import { createFileRoute } from '@tanstack/solid-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hot = import.meta.hot + const hotData = (hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = []; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/code-splitter.test.ts b/packages/router-plugin/tests/code-splitter.test.ts index 967f102e4d..96807e4d42 100644 --- a/packages/router-plugin/tests/code-splitter.test.ts +++ b/packages/router-plugin/tests/code-splitter.test.ts @@ -22,6 +22,7 @@ import { createIdentifier } from '@tanstack/router-utils' import { defaultCodeSplitGroupings } from '../src/core/constants' import { getFrameworkHmrCompilerPlugins } from '../src/core/code-splitter/plugins/framework-plugins' import { frameworks } from './constants' +import { formatSnapshot } from './format-snapshot' import type { CodeSplitGroupings } from '../src/core/constants' function getFrameworkDir(framework: string) { @@ -87,7 +88,9 @@ describe('code-splitter works', () => { sharedBindings.size > 0 ? sharedBindings : undefined, }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join(dirs.snapshots, groupName, filename), ) }, @@ -120,9 +123,9 @@ describe('code-splitter works', () => { groupName, `${filename.replace('.tsx', '')}@${ident}.tsx`, ) - await expect(splitResult.code).toMatchFileSnapshot( - snapshotFilename, - ) + await expect( + await formatSnapshot(splitResult.code, filename), + ).toMatchFileSnapshot(snapshotFilename) } }, ) @@ -156,9 +159,9 @@ describe('code-splitter works', () => { filename: `${filename}?tsr-shared=1`, }) - await expect(sharedResult.code).toMatchFileSnapshot( - snapshotFilename, - ) + await expect( + await formatSnapshot(sharedResult.code, filename), + ).toMatchFileSnapshot(snapshotFilename) }, ) }, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function.tsx index 48e3768224..994c89e7b2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@component.tsx index 7fe3edee11..e36e48f495 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@component.tsx @@ -1,27 +1,31 @@ -import * as React from 'react'; -import { Link, Outlet } from '@tanstack/react-router'; -import { Route } from "arrow-function.tsx"; +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { Route } from 'arrow-function.tsx' const PostsComponent = () => { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {[...posts, { - id: 'i-do-not-exist', - title: 'Non-existent Post' - }]?.map(post => { - return
  • - + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }]?.map( + (post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - })} + + ) + }, + )}

-
; -}; -export { PostsComponent as component }; \ No newline at end of file +
+ ) +} +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@errorComponent.tsx index 5f67a6fff1..371dc65868 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@errorComponent.tsx @@ -1 +1 @@ -import * as React from 'react'; \ No newline at end of file +import * as React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@notFoundComponent.tsx index 5f67a6fff1..371dc65868 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@notFoundComponent.tsx @@ -1 +1 @@ -import * as React from 'react'; \ No newline at end of file +import * as React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals.tsx index 771fd14f8b..5544bb15d4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals.tsx @@ -1,13 +1,11 @@ -const $$splitComponentImporter = () => import('boolean-null-literals.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/router'; - +const $$splitComponentImporter = () => + import('boolean-null-literals.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/router' // Test errorComponent with false literal export const Route = createFileRoute('/test')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), errorComponent: false, pendingComponent: null, - loader: async () => ({ - data: 'test' - }) -}); \ No newline at end of file + loader: async () => ({ data: 'test' }), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals@component.tsx index c49c9e93a3..557105b6a3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals@component.tsx @@ -1,3 +1,3 @@ // Test errorComponent with false literal -const SplitComponent = () =>
Test Component
; -export { SplitComponent as component }; \ No newline at end of file +const SplitComponent = () =>
Test Component
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese.tsx index 2ffcfaa9a2..35a6bda2b1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese.tsx @@ -1,10 +1,10 @@ -const $$splitComponentImporter = () => import('chinese.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => import('chinese.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@component.tsx index 003ca944a1..2ac1fa54ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@component.tsx @@ -1,23 +1,27 @@ -import * as React from 'react'; +import * as React from 'react' function HomeComponent() { - return
+ return ( +
-
; +
+ ) } interface DemoProps { - title: string; + title: string } -function Demo({ - title -}: DemoProps) { - return

+function Demo({ title }: DemoProps) { + return ( +

{title} -

; + + ) } -export { HomeComponent as component }; \ No newline at end of file +export { HomeComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@errorComponent.tsx index b4de370f4e..cbcea8cc40 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@errorComponent.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import * as React from 'react' interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@notFoundComponent.tsx index b4de370f4e..cbcea8cc40 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@notFoundComponent.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import * as React from 'react' interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function.tsx index 6ec23e8d1c..d367391005 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('circular-reference-arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('circular-reference-arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function@component.tsx index 39ace71ebe..59c5b5eec2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function@component.tsx @@ -1,19 +1,17 @@ function getComponentName(obj: Record): string { - return Object.keys(obj)[0]; + return Object.keys(obj)[0] } const App = () => { - const componentName = getComponentName({ - App - }); - return
+ const componentName = getComponentName({ App }) + return ( +
Component Name is {componentName} -
; -}; -function OtherComponent() { - const componentName = getComponentName({ - App - }); - return
App component name is {componentName}
; +
+ ) } -export { App as component }; \ No newline at end of file +function OtherComponent() { + const componentName = getComponentName({ App }) + return
App component name is {componentName}
+} +export { App as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function.tsx index 202ef21eb3..f2e0c96476 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('circular-reference-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('circular-reference-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function@component.tsx index 96a753ad8a..22fbb8669f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function@component.tsx @@ -1,19 +1,17 @@ function getComponentName(obj: Record): string { - return Object.keys(obj)[0]; + return Object.keys(obj)[0] } function App() { - const componentName = getComponentName({ - App - }); - return
+ const componentName = getComponentName({ App }) + return ( +
Component Name is {componentName} -
; +
+ ) } function OtherComponent() { - const componentName = getComponentName({ - App - }); - return
App component name is {componentName}
; + const componentName = getComponentName({ App }) + return
App component name is {componentName}
} -export { App as component }; \ No newline at end of file +export { App as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties.tsx index 70385cd749..927bb2e738 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties.tsx @@ -1,10 +1,11 @@ -const $$splitComponentImporter = () => import('conditional-properties.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { isEnabled } from '@features/feature-flags'; -import TrueImport from '@modules/true-component'; -import { falseLoader } from '@modules/false-component'; +const $$splitComponentImporter = () => + import('conditional-properties.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { isEnabled } from '@features/feature-flags' +import TrueImport from '@modules/true-component' +import { falseLoader } from '@modules/false-component' export const Route = createFileRoute('/posts')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: isEnabled ? TrueImport.loader : falseLoader -}); \ No newline at end of file + loader: isEnabled ? TrueImport.loader : falseLoader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties@component.tsx index aaf3410c69..e460c54467 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties@component.tsx @@ -1,5 +1,5 @@ -import { isEnabled } from '@features/feature-flags'; -import TrueImport from '@modules/true-component'; -import { FalseComponent } from '@modules/false-component'; -const SplitComponent = isEnabled ? TrueImport.Component : FalseComponent; -export { SplitComponent as component }; \ No newline at end of file +import { isEnabled } from '@features/feature-flags' +import TrueImport from '@modules/true-component' +import { FalseComponent } from '@modules/false-component' +const SplitComponent = isEnabled ? TrueImport.Component : FalseComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple.tsx index dcf67bfcb4..31c6033aae 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple.tsx @@ -1,15 +1,13 @@ -const $$splitComponentImporter = () => import('destructured-export-multiple.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export-multiple.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const getConfig = () => ({ baseUrl: 'https://api.example.com', - timeout: 5000 -}); -export const { - baseUrl, - timeout -} = getConfig(); -export const [first, second] = [1, 2]; + timeout: 5000, +}) +export const { baseUrl, timeout } = getConfig() +export const [first, second] = [1, 2] export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple@component.tsx index 9441b5a689..6a15a59c0a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple@component.tsx @@ -1,8 +1,10 @@ -import { baseUrl, timeout } from "destructured-export-multiple.tsx"; +import { baseUrl, timeout } from 'destructured-export-multiple.tsx' function AboutComponent() { - return
+ return ( +

Base URL: {baseUrl}

Timeout: {timeout}

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested.tsx index 6793123b2f..5022580478 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested.tsx @@ -1,19 +1,16 @@ -const $$splitComponentImporter = () => import('destructured-export-nested.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export-nested.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' const getConfig = () => ({ - api: { - baseUrl: 'https://api.example.com' - }, + api: { baseUrl: 'https://api.example.com' }, timeout: 5000, - extra: 'data' -}); + extra: 'data', +}) export const { - api: { - baseUrl - }, + api: { baseUrl }, ...rest -} = getConfig(); +} = getConfig() export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested@component.tsx index 8ba46e33e1..9bc538525f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested@component.tsx @@ -1,7 +1,9 @@ -import { baseUrl } from "destructured-export-nested.tsx"; +import { baseUrl } from 'destructured-export-nested.tsx' function AboutComponent() { - return
+ return ( +

Base URL: {baseUrl}

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export.tsx index 31b1bfbe8b..282110d045 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export.tsx @@ -1,17 +1,11 @@ -const $$splitComponentImporter = () => import('destructured-export.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; + return { getObject: () => ({ constA: 10, constB: 5 }) } } -export const { - getObject -} = getObjectCallback(); +export const { getObject } = getObjectCallback() export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@component.tsx index f58942d5af..b0abbd2e6e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@component.tsx @@ -1,14 +1,11 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; + return { getObject: () => ({ constA: 10, constB: 5 }) } } function AboutComponent() { - return
+ return ( +

About

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@errorComponent.tsx index 45fb19eecd..024e0e620e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@errorComponent.tsx @@ -1,8 +1,3 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; -} \ No newline at end of file + return { getObject: () => ({ constA: 10, constB: 5 }) } +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@notFoundComponent.tsx index 45fb19eecd..024e0e620e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@notFoundComponent.tsx @@ -1,8 +1,3 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; -} \ No newline at end of file + return { getObject: () => ({ constA: 10, constB: 5 }) } +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component.tsx index ee2af1cf9b..9ae1904cf4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('destructured-react-memo-imported-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { importedLoader } from '../../shared/imported'; +const $$splitComponentImporter = () => + import('destructured-react-memo-imported-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { importedLoader } from '../../shared/imported' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: importedLoader -}); \ No newline at end of file + loader: importedLoader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component@component.tsx index 446d55e26b..88dcdf6e48 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component@component.tsx @@ -1,6 +1,6 @@ -import { memo } from 'react'; +import { memo } from 'react' function Component() { - return
Component
; + return
Component
} -const SplitComponent = memo(Component); -export { SplitComponent as component }; \ No newline at end of file +const SplitComponent = memo(Component) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults.tsx index 7c54a2c145..c789ea861e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults.tsx @@ -1,8 +1,9 @@ -import { loader } from "destructured-route-options-defaults.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('destructured-route-options-defaults.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { loader } from 'destructured-route-options-defaults.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('destructured-route-options-defaults.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/about')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader -}); \ No newline at end of file + loader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@component.tsx index c73696ff32..c26d6be33d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@component.tsx @@ -1,2 +1,2 @@ -import { MyComponent } from "destructured-route-options-defaults.tsx?tsr-shared=1"; -export { MyComponent as component }; \ No newline at end of file +import { MyComponent } from 'destructured-route-options-defaults.tsx?tsr-shared=1' +export { MyComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@shared.tsx index fdc9acef5b..a7dee6af52 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@shared.tsx @@ -1,22 +1,23 @@ function defaultLoader() { - return { - message: 'default' - }; + return { message: 'default' } } function DefaultComponent() { - return
Default
; + return
Default
} const createBits = () => ({ component: ActualComponent, - loader: () => ({ - message: 'hello' - }) -}); -const { - component: MyComponent = DefaultComponent, - loader = defaultLoader -} = createBits(); + loader: () => ({ message: 'hello' }), +}) +const { component: MyComponent = DefaultComponent, loader = defaultLoader } = + createBits() function ActualComponent() { - return
About
; + return
About
+} +export { + ActualComponent, + createBits, + DefaultComponent, + defaultLoader, + loader, + MyComponent, } -export { ActualComponent, createBits, DefaultComponent, defaultLoader, loader, MyComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring.tsx index d80f17484f..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring.tsx @@ -1,11 +1,9 @@ import thing from 'thing' - export function test() { const { foo: { bar: { destructured }, }, } = thing - return destructured } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@component.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@component.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@errorComponent.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@errorComponent.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@notFoundComponent.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@notFoundComponent.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue.tsx index 68f8be0364..5a116073c1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue.tsx @@ -1,8 +1,8 @@ -'use client'; - -const $$splitComponentImporter = () => import('directive-prologue.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +'use client' +const $$splitComponentImporter = () => + import('directive-prologue.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/directive')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue@component.tsx index ce7cd5e5ee..9ee4bd8f4c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue@component.tsx @@ -1,6 +1,5 @@ -'use client'; - +'use client' const SplitComponent = () => { - return
directive preserved
; -}; -export { SplitComponent as component }; \ No newline at end of file + return
directive preserved
+} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component.tsx index 4fdd9d1c68..8109a89624 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component.tsx @@ -1,6 +1,3 @@ import React from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ - component: undefined, -}) +export const Route = createFileRoute('/')({ component: undefined }) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@component.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@component.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@errorComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@errorComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@notFoundComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@notFoundComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound.tsx index da4daa9a3f..7154b79acd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound.tsx @@ -1,15 +1,23 @@ -console.warn("[tanstack-router] These exports from \"export-default-component-and-normal-notFound.tsx\" will not be code-split and will increase your bundle size:\n- Home\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitNotFoundComponentImporter = () => import('export-default-component-and-normal-notFound.tsx?tsr-split=notFoundComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import React, { useState } from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +console.warn( + '[tanstack-router] These exports from "export-default-component-and-normal-notFound.tsx" will not be code-split and will increase your bundle size:\n- Home\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitNotFoundComponentImporter = () => + import('export-default-component-and-normal-notFound.tsx?tsr-split=notFoundComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import React, { useState } from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/home')({ component: Home, - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); + notFoundComponent: lazyRouteComponent( + $$splitNotFoundComponentImporter, + 'notFoundComponent', + ), +}) export default function Home() { - const [one, setOne] = useState('this is from a state'); - return
+ const [one, setOne] = useState('this is from a state') + return ( +

{one}

-
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@component.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@component.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@errorComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@errorComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@notFoundComponent.tsx index 62cd0a1036..3da924c04c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@notFoundComponent.tsx @@ -1,5 +1,5 @@ -import React from 'react'; +import React from 'react' function NotFoundComponent() { - return
Not Found
; + return
Not Found
} -export { NotFoundComponent as notFoundComponent }; \ No newline at end of file +export { NotFoundComponent as notFoundComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component.tsx index c5198b9e00..de2d748c91 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component.tsx @@ -1,13 +1,8 @@ import React, { useState } from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/home')({ - component: Home, -}) - +export const Route = createFileRoute('/home')({ component: Home }) export default function Home() { const [one, setOne] = useState('this is from a state') - return (

{one}

diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@component.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@component.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@errorComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@errorComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@notFoundComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@notFoundComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter.tsx index 3ae9710cd5..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter.tsx @@ -1,29 +1,20 @@ import * as React from 'react' // @ts-expect-error import { useMemo } from 'tan-react' - const useUsedVar = 'i-am-unused' - const ReactUseMemoCall1 = React.useMemo(function performAction() { return 'true' }, []) - console.info(ReactUseMemoCall1) - const ReactUseMemoCall2 = React.useMemo(() => { return 'true' }, []) - console.info(ReactUseMemoCall2) - const UseMemoCall1 = useMemo(function performAction() { return 'true' }, []) - console.info(UseMemoCall1) - const UseMemoCall2 = useMemo(() => { return 'true' }, []) - console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@component.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@component.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@errorComponent.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@errorComponent.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@notFoundComponent.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@notFoundComponent.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration.tsx index 5d7e2181f5..e2b672f7b8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('function-declaration.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('function-declaration.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@component.tsx index 3476c52d54..a0ebf07dee 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@component.tsx @@ -1,27 +1,31 @@ -import * as React from 'react'; -import { Link, Outlet } from '@tanstack/react-router'; -import { Route } from "function-declaration.tsx"; +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { Route } from 'function-declaration.tsx' function PostsComponent() { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {[...posts, { - id: 'i-do-not-exist', - title: 'Non-existent Post' - }]?.map(post => { - return
  • - + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }]?.map( + (post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - })} + + ) + }, + )}

-
; +
+ ) } -export { PostsComponent as component }; \ No newline at end of file +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@errorComponent.tsx index 5f67a6fff1..371dc65868 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@errorComponent.tsx @@ -1 +1 @@ -import * as React from 'react'; \ No newline at end of file +import * as React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@notFoundComponent.tsx index 5f67a6fff1..371dc65868 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@notFoundComponent.tsx @@ -1 +1 @@ -import * as React from 'react'; \ No newline at end of file +import * as React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute.tsx index df71217488..82d7bb0cad 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('importAttribute.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('importAttribute.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute@component.tsx index f34d3c6408..88abef0c00 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute@component.tsx @@ -1,3 +1,3 @@ -import { test } from './test' with { type: 'macro' }; -const SplitComponent = () => test; -export { SplitComponent as component }; \ No newline at end of file +import { test } from './test' with { type: 'macro' } +const SplitComponent = () => test +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader.tsx index 2271ab4454..4818827c9c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('imported-default-component-destructured-loader.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { importedLoader } from '../../shared/imported'; +const $$splitComponentImporter = () => + import('imported-default-component-destructured-loader.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { importedLoader } from '../../shared/imported' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: importedLoader -}); \ No newline at end of file + loader: importedLoader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader@component.tsx index d21b198c98..9350cda9e8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader@component.tsx @@ -1,3 +1,3 @@ -import importedComponent from '../../shared/imported'; -const SplitComponent = importedComponent; -export { SplitComponent as component }; \ No newline at end of file +import importedComponent from '../../shared/imported' +const SplitComponent = importedComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component.tsx index dcd6f3d5e0..d213c7c5af 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('imported-default-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('imported-default-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component@component.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component@component.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent.tsx index 898e1b3618..e3702ed63b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent.tsx @@ -1,8 +1,13 @@ -const $$splitErrorComponentImporter = () => import('imported-errorComponent.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('imported-errorComponent.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitErrorComponentImporter = () => + import('imported-errorComponent.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('imported-errorComponent.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@component.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@component.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@errorComponent.tsx index 7a8654fb94..3f20c3e485 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@errorComponent.tsx @@ -1,3 +1,3 @@ -import { importedErrorComponent } from '../../shared/imported'; -const SplitErrorComponent = importedErrorComponent; -export { SplitErrorComponent as errorComponent }; \ No newline at end of file +import { importedErrorComponent } from '../../shared/imported' +const SplitErrorComponent = importedErrorComponent +export { SplitErrorComponent as errorComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent.tsx index 4c5c19cfcf..0a203d3cf9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent.tsx @@ -1,8 +1,13 @@ -const $$splitNotFoundComponentImporter = () => import('imported-notFoundComponent.tsx?tsr-split=notFoundComponent'); -const $$splitComponentImporter = () => import('imported-notFoundComponent.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitNotFoundComponentImporter = () => + import('imported-notFoundComponent.tsx?tsr-split=notFoundComponent') +const $$splitComponentImporter = () => + import('imported-notFoundComponent.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); \ No newline at end of file + notFoundComponent: lazyRouteComponent( + $$splitNotFoundComponentImporter, + 'notFoundComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@component.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@component.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@notFoundComponent.tsx index c6cfd9797f..bfe9d4e1c9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@notFoundComponent.tsx @@ -1,3 +1,3 @@ -import { importedNotFoundComponent } from '../../shared/imported'; -const SplitNotFoundComponent = importedNotFoundComponent; -export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file +import { importedNotFoundComponent } from '../../shared/imported' +const SplitNotFoundComponent = importedNotFoundComponent +export { SplitNotFoundComponent as notFoundComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent.tsx index 17adf19f06..751e1c9a50 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('imported-pendingComponent.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { importedPendingComponent } from '../../shared/imported'; +const $$splitComponentImporter = () => + import('imported-pendingComponent.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { importedPendingComponent } from '../../shared/imported' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - pendingComponent: importedPendingComponent -}); \ No newline at end of file + pendingComponent: importedPendingComponent, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent@component.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent@component.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported.tsx index e92f76cf98..6ead4fbb5e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('imported.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { importedLoader } from '../../shared'; +const $$splitComponentImporter = () => + import('imported.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { importedLoader } from '../../shared' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: importedLoader -}); \ No newline at end of file + loader: importedLoader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported@component.tsx index 5bc9da8d43..e3c06dbe9e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported@component.tsx @@ -1,3 +1,3 @@ -import { importedComponent } from '../../shared'; -const SplitComponent = importedComponent; -export { SplitComponent as component }; \ No newline at end of file +import { importedComponent } from '../../shared' +const SplitComponent = importedComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline.tsx index c2b4dae416..7b39974d3a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline.tsx @@ -1,9 +1,9 @@ -const $$splitComponentImporter = () => import('inline.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => import('inline.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -Route.addChildren([]); -export const test = 'test'; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +Route.addChildren([]) +export const test = 'test' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@component.tsx index 58ccfb2903..d28b872634 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@component.tsx @@ -1,18 +1,18 @@ -import * as React from 'react'; -import * as styles from '../style.css'; -import { TEST_DATA } from '../test.const'; -const Button = (props: { - children: any; -}) => { - return ; -}; -import { Route } from "inline.tsx"; -import { test } from "inline.tsx"; +import * as React from 'react' +import * as styles from '../style.css' +import { TEST_DATA } from '../test.const' +const Button = (props: { children: any }) => { + return +} +import { Route } from 'inline.tsx' +import { test } from 'inline.tsx' const SplitComponent = () => { - return
- {test} -

{TEST_DATA.welcome}

- -
; -}; -export { SplitComponent as component }; \ No newline at end of file + return ( +
+ {test} +

{TEST_DATA.welcome}

+ +
+ ) +} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@errorComponent.tsx index 9236af6021..23fab71edc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -import { Route } from "inline.tsx"; \ No newline at end of file +import * as React from 'react' +import { Route } from 'inline.tsx' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@notFoundComponent.tsx index 9236af6021..23fab71edc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@notFoundComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -import { Route } from "inline.tsx"; \ No newline at end of file +import * as React from 'react' +import { Route } from 'inline.tsx' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration.tsx index b2f908ab45..13cb142f27 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration.tsx @@ -1,12 +1,17 @@ -const $$splitErrorComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitErrorComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), pendingComponent, - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) function pendingComponent() { - return
lowercase pending function declaration
; -} \ No newline at end of file + return
lowercase pending function declaration
+} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@component.tsx index 65735a0f20..e53a2acebf 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@component.tsx @@ -1,4 +1,4 @@ function component() { - return
lowercase function declaration
; + return
lowercase function declaration
} -export { component }; \ No newline at end of file +export { component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@errorComponent.tsx index acc1c0be8d..9d411c1f0f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@errorComponent.tsx @@ -1,4 +1,4 @@ function errorComponent() { - return
lowercase error function declaration
; + return
lowercase error function declaration
} -export { errorComponent }; \ No newline at end of file +export { errorComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number.tsx index 0cb0a2e13b..c9e47e1145 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number.tsx @@ -1,32 +1,45 @@ -const $$splitComponentImporter = () => import('random-number.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { Await, Link, createFileRoute, defer } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import { getSponsorsForSponsorPack } from '~/server/sponsors'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -export const textColors = [`text-rose-500`, `text-yellow-500`, `text-teal-500`, `text-blue-500`]; -export const gradients = [`from-rose-500 to-yellow-500`, `from-yellow-500 to-teal-500`, `from-teal-500 to-violet-500`, `from-blue-500 to-pink-500`]; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; +const $$splitComponentImporter = () => + import('random-number.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { Await, Link, createFileRoute, defer } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import { getSponsorsForSponsorPack } from '~/server/sponsors' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +export const textColors = [ + `text-rose-500`, + `text-yellow-500`, + `text-teal-500`, + `text-blue-500`, +] +export const gradients = [ + `from-rose-500 to-yellow-500`, + `from-yellow-500 to-teal-500`, + `from-teal-500 to-violet-500`, + `from-blue-500 to-pink-500`, +] +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] export const Route = createFileRoute('/')({ loader: () => { return { randomNumber: Math.random(), - sponsorsPromise: defer(getSponsorsForSponsorPack()) - }; + sponsorsPromise: defer(getSponsorsForSponsorPack()), + } }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@component.tsx index 9ed6d15184..26a9f9c142 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@component.tsx @@ -1,61 +1,48 @@ -import { Await, Link } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import discordImage from '~/images/discord-logo-white.svg'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -import { useMutation } from '~/hooks/useMutation'; -import { sample } from '~/utils/utils'; -import { textColors } from "random-number.tsx"; -import { gradients } from "random-number.tsx"; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; -import { Route } from "random-number.tsx"; -async function bytesSignupServerFn({ - email -}: { - email: string; -}) { - 'use server'; - +import { Await, Link } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import discordImage from '~/images/discord-logo-white.svg' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +import { useMutation } from '~/hooks/useMutation' +import { sample } from '~/utils/utils' +import { textColors } from 'random-number.tsx' +import { gradients } from 'random-number.tsx' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] +import { Route } from 'random-number.tsx' +async function bytesSignupServerFn({ email }: { email: string }) { + 'use server' return fetch(`https://bytes.dev/api/bytes-optin-cors`, { method: 'POST', - body: JSON.stringify({ - email, - influencer: 'tanstack' - }), - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json' - } - }); + body: JSON.stringify({ email, influencer: 'tanstack' }), + headers: { Accept: 'application/json', 'Content-Type': 'application/json' }, + }) } function Index() { - const bytesSignupMutation = useMutation({ - fn: bytesSignupServerFn - }); - const { - sponsorsPromise, - randomNumber, - testing2 - } = Route.useLoaderData(); - const gradient = sample(gradients, randomNumber); - const textColor = sample(textColors, randomNumber); - return <> + const bytesSignupMutation = useMutation({ fn: bytesSignupServerFn }) + const { sponsorsPromise, randomNumber, testing2 } = Route.useLoaderData() + const gradient = sample(gradients, randomNumber) + const textColor = sample(textColors, randomNumber) + return ( + <> {discordImage} {gradient} {textColor} - ; + + ) } -export { Index as component }; \ No newline at end of file +export { Index as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@errorComponent.tsx index cdf4d37891..8e156eca17 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@errorComponent.tsx @@ -1,18 +1,20 @@ -import { Await, Link } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; \ No newline at end of file +import { Await, Link } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@notFoundComponent.tsx index cdf4d37891..8e156eca17 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@notFoundComponent.tsx @@ -1,18 +1,20 @@ -import { Await, Link } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; \ No newline at end of file +import { Await, Link } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component.tsx index 5fd96f8da1..229a2d0f80 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('react-memo-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { importedLoader } from '../../shared/imported'; +const $$splitComponentImporter = () => + import('react-memo-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { importedLoader } from '../../shared/imported' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: importedLoader -}); \ No newline at end of file + loader: importedLoader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component@component.tsx index dfef29c9e3..6bdb537fe9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component@component.tsx @@ -1,6 +1,6 @@ -import React from 'react'; +import React from 'react' function Component() { - return
Component
; + return
Component
} -const SplitComponent = React.memo(Component); -export { SplitComponent as component }; \ No newline at end of file +const SplitComponent = React.memo(Component) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component.tsx index 69df0886db..701826b3f6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('react-memo-imported-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { importedLoader } from '../../shared/imported'; +const $$splitComponentImporter = () => + import('react-memo-imported-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { importedLoader } from '../../shared/imported' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: importedLoader -}); \ No newline at end of file + loader: importedLoader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component@component.tsx index 540812230e..d162a1aeaf 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component@component.tsx @@ -1,4 +1,4 @@ -import React from 'react'; -import { importedComponent } from '../../shared/imported'; -const SplitComponent = React.memo(importedComponent); -export { SplitComponent as component }; \ No newline at end of file +import React from 'react' +import { importedComponent } from '../../shared/imported' +const SplitComponent = React.memo(importedComponent) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component.tsx index 1ae234de6f..f2078a1757 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component.tsx @@ -4,7 +4,6 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export function Layout() { return (
@@ -22,12 +21,10 @@ export function Layout() {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: importedLoader, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' const SIDEBAR_MINI_WIDTH = '80px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@component.tsx index 5bb0ab5451..8fb12f0c6b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@component.tsx @@ -1,3 +1,3 @@ -import * as React from 'react'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@errorComponent.tsx index 5bb0ab5451..8fb12f0c6b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@errorComponent.tsx @@ -1,3 +1,3 @@ -import * as React from 'react'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@notFoundComponent.tsx index 5bb0ab5451..8fb12f0c6b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@notFoundComponent.tsx @@ -1,3 +1,3 @@ -import * as React from 'react'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const.tsx index f256b01a83..d674dbb799 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const.tsx @@ -4,11 +4,9 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export const loaderFn = () => { return importedLoader() } - const Layout = () => { return (
@@ -26,15 +24,12 @@ const Layout = () => {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: loaderFn, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' export const SIDEBAR_MINI_WIDTH = '80px' const ASIDE_WIDTH = '250px' - export default Layout diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@component.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@component.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@errorComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@notFoundComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@notFoundComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured.tsx index 0e3175116f..89c23305a0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured.tsx @@ -1,18 +1,12 @@ import { createFileRoute } from '@tanstack/react-router' - const createBits = () => ({ component: AboutComponentImpl, - loader: () => ({ - message: 'hello', - }), + loader: () => ({ message: 'hello' }), }) - export const { component: AboutComponent, loader } = createBits() - function AboutComponentImpl() { return
About
} - export const Route = createFileRoute('/about')({ component: AboutComponent, loader, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@component.tsx index a6d57afe77..d64b42fdcc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@component.tsx @@ -1,2 +1,2 @@ -import { AboutComponent } from "retain-exports-destructured.tsx?tsr-shared=1"; -export { AboutComponent as component }; \ No newline at end of file +import { AboutComponent } from 'retain-exports-destructured.tsx?tsr-shared=1' +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@shared.tsx index b03a4eb83a..6eff1ff083 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@shared.tsx @@ -1,14 +1,9 @@ const createBits = () => ({ component: AboutComponentImpl, - loader: () => ({ - message: 'hello' - }) -}); -const { - component: AboutComponent, - loader -} = createBits(); + loader: () => ({ message: 'hello' }), +}) +const { component: AboutComponent, loader } = createBits() function AboutComponentImpl() { - return
About
; + return
About
} -export { AboutComponent, AboutComponentImpl, createBits, loader }; \ No newline at end of file +export { AboutComponent, AboutComponentImpl, createBits, loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function.tsx index 298c388e65..83b3dd4eb5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function.tsx @@ -4,11 +4,9 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export function loaderFn() { return importedLoader() } - function Layout() { return (
@@ -26,15 +24,12 @@ function Layout() {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: loaderFn, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' export const SIDEBAR_MINI_WIDTH = '80px' const ASIDE_WIDTH = '250px' - export default Layout diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@component.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@component.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@errorComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@notFoundComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@notFoundComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader.tsx index 88cd35f704..16357edc27 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader.tsx @@ -1,16 +1,15 @@ -const $$splitComponentImporter = () => import('retain-exports-loader.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('retain-exports-loader.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export function loaderFn() { - return { - foo: 'bar' - }; + return { foo: 'bar' } } export const Route = createFileRoute('/_layout')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: loaderFn -}); -export const SIDEBAR_WIDTH = '150px'; -export const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file + loader: loaderFn, +}) +export const SIDEBAR_WIDTH = '150px' +export const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@component.tsx index 9f54ae0dc5..604be4dc69 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@component.tsx @@ -1,11 +1,10 @@ -import * as React from 'react'; -import { Outlet } from '@tanstack/react-router'; -import { importedComponent as ImportedComponent } from '../../shared/imported'; +import * as React from 'react' +import { Outlet } from '@tanstack/react-router' +import { importedComponent as ImportedComponent } from '../../shared/imported' function Layout() { - return
-
+ return ( +
+
-
; +
+ ) } -const HEADER_HEIGHT = '63px'; -const ASIDE_WIDTH = '250px'; -export { Layout as component }; \ No newline at end of file +const HEADER_HEIGHT = '63px' +const ASIDE_WIDTH = '250px' +export { Layout as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@errorComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@notFoundComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@notFoundComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class.tsx index 6e2f0229e4..19509e3bdd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class.tsx @@ -1,10 +1,11 @@ -import { store } from "shared-class.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-class.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { store } from 'shared-class.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-class.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/store')({ loader: async () => { - store.set('items', await fetch('/api')); + store.set('items', await fetch('/api')) }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@component.tsx index 6a38b10ff8..e0e187fb1d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@component.tsx @@ -1,3 +1,3 @@ -import { store } from "shared-class.tsx?tsr-shared=1"; -const SplitComponent = () =>
{store.get('items')}
; -export { SplitComponent as component }; \ No newline at end of file +import { store } from 'shared-class.tsx?tsr-shared=1' +const SplitComponent = () =>
{store.get('items')}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@shared.tsx index 18c40bafb6..0abc282ecc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@shared.tsx @@ -1,11 +1,11 @@ class DataStore { - data = new Map(); + data = new Map() get(k: string) { - return this.data.get(k); + return this.data.get(k) } set(k: string, v: unknown) { - this.data.set(k, v); + this.data.set(k, v) } } -const store = new DataStore(); -export { DataStore, store }; \ No newline at end of file +const store = new DataStore() +export { DataStore, store } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export.tsx index 9453dbfbda..dc4d2d383f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export.tsx @@ -1,9 +1,10 @@ -import { apiUrl } from "shared-destructured-export.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-destructured-export.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { apiUrl } from 'shared-destructured-export.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-destructured-export.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/config')({ loader: async () => fetch(apiUrl), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -export { apiUrl, timeout } from "shared-destructured-export.tsx?tsr-shared=1"; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +export { apiUrl, timeout } from 'shared-destructured-export.tsx?tsr-shared=1' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@component.tsx index 16b288ac5f..8cd0f14a27 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@component.tsx @@ -1,3 +1,3 @@ -import { timeout } from "shared-destructured-export.tsx?tsr-shared=1"; -const SplitComponent = () =>
Timeout: {timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { timeout } from 'shared-destructured-export.tsx?tsr-shared=1' +const SplitComponent = () =>
Timeout: {timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@shared.tsx index f0bfd70add..ae9324acc9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@shared.tsx @@ -1,11 +1,5 @@ -const { - apiUrl, - timeout -} = getConfig(); +const { apiUrl, timeout } = getConfig() function getConfig() { - return { - apiUrl: '/api', - timeout: 5000 - }; + return { apiUrl: '/api', timeout: 5000 } } -export { apiUrl, getConfig, timeout }; \ No newline at end of file +export { apiUrl, getConfig, timeout } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured.tsx index 3019454516..b1d4f96065 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured.tsx @@ -1,8 +1,9 @@ -import { apiUrl } from "shared-destructured.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-destructured.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { apiUrl } from 'shared-destructured.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-destructured.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/config')({ loader: async () => fetch(apiUrl), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@component.tsx index 5c0182e61a..3d7933a573 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@component.tsx @@ -1,3 +1,3 @@ -import { timeout } from "shared-destructured.tsx?tsr-shared=1"; -const SplitComponent = () =>
Timeout: {timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { timeout } from 'shared-destructured.tsx?tsr-shared=1' +const SplitComponent = () =>
Timeout: {timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@shared.tsx index f0bfd70add..ae9324acc9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@shared.tsx @@ -1,11 +1,5 @@ -const { - apiUrl, - timeout -} = getConfig(); +const { apiUrl, timeout } = getConfig() function getConfig() { - return { - apiUrl: '/api', - timeout: 5000 - }; + return { apiUrl: '/api', timeout: 5000 } } -export { apiUrl, getConfig, timeout }; \ No newline at end of file +export { apiUrl, getConfig, timeout } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported.tsx index c2eb8b1012..aa9730bec7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported.tsx @@ -1,13 +1,12 @@ -import { queryOptions } from "shared-exported.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-exported.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { queryOptions } from 'shared-exported.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-exported.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/query')({ loader: async () => { - return { - staleTime: queryOptions.staleTime - }; + return { staleTime: queryOptions.staleTime } }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -export { queryOptions } from "shared-exported.tsx?tsr-shared=1"; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +export { queryOptions } from 'shared-exported.tsx?tsr-shared=1' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@component.tsx index b020b5cadf..9fe61942dd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@component.tsx @@ -1,3 +1,3 @@ -import { queryOptions } from "shared-exported.tsx?tsr-shared=1"; -const SplitComponent = () =>
GC: {queryOptions.gcTime}
; -export { SplitComponent as component }; \ No newline at end of file +import { queryOptions } from 'shared-exported.tsx?tsr-shared=1' +const SplitComponent = () =>
GC: {queryOptions.gcTime}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@shared.tsx index a3f91b85bb..3a1ff108bb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@shared.tsx @@ -1,5 +1,2 @@ -const queryOptions = { - staleTime: 5000, - gcTime: 10000 -}; -export { queryOptions }; \ No newline at end of file +const queryOptions = { staleTime: 5000, gcTime: 10000 } +export { queryOptions } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function.tsx index 7372ff4b07..d4f3d89f2d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function.tsx @@ -1,14 +1,15 @@ -import { getCached, cache } from "shared-function.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { getCached, cache } from 'shared-function.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' function setCached(key: string, val: unknown) { - cache.set(key, val); + cache.set(key, val) } export const Route = createFileRoute('/cached')({ loader: async () => { - setCached('data', await fetch('/api').then(r => r.json())); - return getCached('data'); + setCached('data', await fetch('/api').then((r) => r.json())) + return getCached('data') }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@component.tsx index 571bd9356a..1c327523af 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@component.tsx @@ -1,3 +1,3 @@ -import { getCached } from "shared-function.tsx?tsr-shared=1"; -const SplitComponent = () =>
{JSON.stringify(getCached('data'))}
; -export { SplitComponent as component }; \ No newline at end of file +import { getCached } from 'shared-function.tsx?tsr-shared=1' +const SplitComponent = () =>
{JSON.stringify(getCached('data'))}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@shared.tsx index 27d2cf03f1..243ac23a66 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@shared.tsx @@ -1,5 +1,5 @@ -const cache = new Map(); +const cache = new Map() function getCached(key: string) { - return cache.get(key); + return cache.get(key) } -export { cache, getCached }; \ No newline at end of file +export { cache, getCached } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding.tsx index c3e284c081..da3387c5fd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('shared-imported-binding.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { sharedUtil } from '../utils'; +const $$splitComponentImporter = () => + import('shared-imported-binding.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { sharedUtil } from '../utils' export const Route = createFileRoute('/imported')({ loader: async () => sharedUtil('load'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding@component.tsx index 0a835ae063..e3c8a0f5d8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding@component.tsx @@ -1,3 +1,3 @@ -import { sharedUtil } from '../utils'; -const SplitComponent = () =>
{sharedUtil('render')}
; -export { SplitComponent as component }; \ No newline at end of file +import { sharedUtil } from '../utils' +const SplitComponent = () =>
{sharedUtil('render')}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref.tsx index 889dd57cf0..244f566066 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref.tsx @@ -1,13 +1,12 @@ -import { state, getCount } from "shared-indirect-ref.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-indirect-ref.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { state, getCount } from 'shared-indirect-ref.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-indirect-ref.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/shared-indirect')({ loader: () => { - state.count++; - return { - count: getCount() - }; + state.count++ + return { count: getCount() } }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@component.tsx index 62995e7fd8..64bb6ab567 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@component.tsx @@ -1,7 +1,9 @@ -import { state, getCount } from "shared-indirect-ref.tsx?tsr-shared=1"; +import { state, getCount } from 'shared-indirect-ref.tsx?tsr-shared=1' function SharedComponent() { - return
+ return ( +
{getCount()} - {state.count} -
; +
+ ) } -export { SharedComponent as component }; \ No newline at end of file +export { SharedComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@shared.tsx index 7e7e811ba8..b4910d2fd1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@shared.tsx @@ -1,7 +1,5 @@ -const state = { - count: 0 -}; +const state = { count: 0 } function getCount() { - return state.count; + return state.count } -export { getCount, state }; \ No newline at end of file +export { getCount, state } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref.tsx index 728caca361..6b29c09f33 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref.tsx @@ -1,9 +1,10 @@ -import { shared } from "shared-jsx-component-ref.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-jsx-component-ref.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; +import { shared } from 'shared-jsx-component-ref.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-jsx-component-ref.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' // @ts-nocheck -import { createFileRoute } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/jsx')({ loader: () => shared, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@component.tsx index 52ecb6d474..845e1db45c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@component.tsx @@ -1,5 +1,5 @@ -import { shared } from "shared-jsx-component-ref.tsx?tsr-shared=1"; // @ts-nocheck +import { shared } from 'shared-jsx-component-ref.tsx?tsr-shared=1' // @ts-nocheck function SharedComponent() { - return
{shared}
; + return
{shared}
} -export { SharedComponent as component }; \ No newline at end of file +export { SharedComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@shared.tsx index d5cc2cf990..60ae1006a1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@shared.tsx @@ -1,4 +1,3 @@ // @ts-nocheck - -const shared = 1; -export { shared }; \ No newline at end of file +const shared = 1 +export { shared } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none.tsx index dd352bfc41..6d0ece44ba 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('shared-none.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -const loaderHelper = () => fetch('/api'); +const $$splitComponentImporter = () => + import('shared-none.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +const loaderHelper = () => fetch('/api') export const Route = createFileRoute('/clean')({ loader: async () => loaderHelper(), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none@component.tsx index 701deeedeb..1bfd4eb63f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none@component.tsx @@ -1,5 +1,7 @@ -const ComponentHelper = () => helper; -const SplitComponent = () =>
- -
; -export { SplitComponent as component }; \ No newline at end of file +const ComponentHelper = () => helper +const SplitComponent = () => ( +
+ +
+) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route.tsx index f82ac5b900..1ac3428ebc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route.tsx @@ -1,16 +1,15 @@ -import { HEADER } from "shared-referencing-route.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-referencing-route.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { HEADER } from 'shared-referencing-route.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-referencing-route.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' function usePageTitle() { - return `${HEADER} - ${Route.fullPath}`; + return `${HEADER} - ${Route.fullPath}` } export const Route = createFileRoute('/about')({ loader: async () => { - const title = usePageTitle(); - return { - title - }; + const title = usePageTitle() + return { title } }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@component.tsx index 2cb2cdb68c..b2c4630c90 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@component.tsx @@ -1,10 +1,10 @@ -import { HEADER } from "shared-referencing-route.tsx?tsr-shared=1"; +import { HEADER } from 'shared-referencing-route.tsx?tsr-shared=1' function usePageTitle() { - return `${HEADER} - ${Route.fullPath}`; + return `${HEADER} - ${Route.fullPath}` } -import { Route } from "shared-referencing-route.tsx"; +import { Route } from 'shared-referencing-route.tsx' const SplitComponent = () => { - const title = usePageTitle(); - return
{title}
; -}; -export { SplitComponent as component }; \ No newline at end of file + const title = usePageTitle() + return
{title}
+} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@shared.tsx index cc2d01424c..34b9c4ca41 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@shared.tsx @@ -1,2 +1,2 @@ -const HEADER = 'Page'; -export { HEADER }; \ No newline at end of file +const HEADER = 'Page' +export { HEADER } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime.tsx index c230b4d37f..17d70ca9bd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime.tsx @@ -1,23 +1,25 @@ -import { state, createState, createSeed, increment } from "shared-runtime.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-runtime.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -console.log('shared-runtime:reference'); +import { + state, + createState, + createSeed, + increment, +} from 'shared-runtime.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-runtime.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +console.log('shared-runtime:reference') export const Route = createFileRoute('/shared-runtime')({ beforeLoad: () => state, loader: () => { - increment(); - return state; + increment() + return state }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@component.tsx index fbccf6c90b..5245f6d9eb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@component.tsx @@ -1,23 +1,24 @@ -import { state, createState, createSeed, Labels } from "shared-runtime.tsx?tsr-shared=1"; -const label = createComponentLabel(); -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -function createComponentLabel() { - console.log('shared-runtime:component'); - return Labels.component; +import { + state, + createState, + createSeed, + Labels, +} from 'shared-runtime.tsx?tsr-shared=1' +const label = createComponentLabel() +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number } -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; +function createComponentLabel() { + console.log('shared-runtime:component') + return Labels.component +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed const SplitComponent = () => { if (state.count === 3) { - throw new Error('route source-map contract'); + throw new Error('route source-map contract') } - return `${label}:${state.count}`; -}; -export { SplitComponent as component }; \ No newline at end of file + return `${label}:${state.count}` +} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@errorComponent.tsx index d890a562c9..03cacac5b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@errorComponent.tsx @@ -1,11 +1,7 @@ -import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; \ No newline at end of file +import { state, createState, createSeed } from 'shared-runtime.tsx?tsr-shared=1' +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@notFoundComponent.tsx index d890a562c9..03cacac5b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@notFoundComponent.tsx @@ -1,11 +1,7 @@ -import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; \ No newline at end of file +import { state, createState, createSeed } from 'shared-runtime.tsx?tsr-shared=1' +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@shared.tsx index 54239b6cc5..c53a7e1568 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@shared.tsx @@ -1,28 +1,13 @@ -const Count = { - Initial: 0 -}; -const Labels = { - component: 'count' -}; -const seed = createSeed(); -const { - state, - increment -} = createState(seed); +const Count = { Initial: 0 } +const Labels = { component: 'count' } +const seed = createSeed() +const { state, increment } = createState(seed) function createSeed() { - console.log('shared-runtime:seed'); - return { - count: Count.Initial, - label: Labels.component - }; + console.log('shared-runtime:seed') + return { count: Count.Initial, label: Labels.component } } -function createState(initialState: { - count: number; -}) { - console.log('shared-runtime:state'); - return { - state: initialState, - increment: () => initialState.count++ - }; +function createState(initialState: { count: number }) { + console.log('shared-runtime:state') + return { state: initialState, increment: () => initialState.count++ } } -export { Count, createSeed, createState, increment, Labels, seed, state }; \ No newline at end of file +export { Count, createSeed, createState, increment, Labels, seed, state } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive.tsx index ce5a10c47c..3860bd4688 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive.tsx @@ -1,11 +1,12 @@ -import { config } from "shared-transitive.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-transitive.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -const fetcher = (path: string) => fetch(`${config.url}${path}`); +import { config } from 'shared-transitive.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-transitive.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +const fetcher = (path: string) => fetch(`${config.url}${path}`) export const Route = createFileRoute('/api')({ loader: async () => { - return fetcher('/data'); + return fetcher('/data') }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@component.tsx index 7a3a74048e..c237a03583 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@component.tsx @@ -1,3 +1,3 @@ -import { config } from "shared-transitive.tsx?tsr-shared=1"; -const SplitComponent = () =>
Timeout: {config.timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { config } from 'shared-transitive.tsx?tsr-shared=1' +const SplitComponent = () =>
Timeout: {config.timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@shared.tsx index 8bec4a1d55..ac44498714 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@shared.tsx @@ -1,6 +1,3 @@ -const BASE_URL = 'https://api.example.com'; -const config = { - url: BASE_URL, - timeout: 5000 -}; -export { BASE_URL, config }; \ No newline at end of file +const BASE_URL = 'https://api.example.com' +const config = { url: BASE_URL, timeout: 5000 } +export { BASE_URL, config } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable.tsx index c0c02cec46..f7b7b51f4d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable.tsx @@ -1,13 +1,12 @@ -import { collection } from "shared-variable.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-variable.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { collection } from 'shared-variable.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-variable.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/todos')({ loader: async () => { - await collection.preload(); - return { - data: 'loaded' - }; + await collection.preload() + return { data: 'loaded' } }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@component.tsx index d149922fbc..10325aa95e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@component.tsx @@ -1,3 +1,3 @@ -import { collection } from "shared-variable.tsx?tsr-shared=1"; -const SplitComponent = () =>
{collection.name}
; -export { SplitComponent as component }; \ No newline at end of file +import { collection } from 'shared-variable.tsx?tsr-shared=1' +const SplitComponent = () =>
{collection.name}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@shared.tsx index 8a0560d5b9..10421dac09 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@shared.tsx @@ -1,5 +1,2 @@ -const collection = { - name: 'todos', - preload: async () => {} -}; -export { collection }; \ No newline at end of file +const collection = { name: 'todos', preload: async () => {} } +export { collection } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect.tsx index cba0c7770b..39bbc717d9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect.tsx @@ -1,11 +1,12 @@ -import { registry } from "shared-with-side-effect.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-with-side-effect.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -console.log('registry created'); +import { registry } from 'shared-with-side-effect.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-with-side-effect.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +console.log('registry created') export const Route = createFileRoute('/fx')({ loader: async () => { - registry.set('loaded', true); + registry.set('loaded', true) }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@component.tsx index d953af00fa..3ede22c8be 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@component.tsx @@ -1,3 +1,3 @@ -import { registry } from "shared-with-side-effect.tsx?tsr-shared=1"; -const SplitComponent = () =>
{registry.size}
; -export { SplitComponent as component }; \ No newline at end of file +import { registry } from 'shared-with-side-effect.tsx?tsr-shared=1' +const SplitComponent = () =>
{registry.size}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@shared.tsx index f26c656fdd..a59298f9e0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@shared.tsx @@ -1,2 +1,2 @@ -const registry = new Map(); -export { registry }; \ No newline at end of file +const registry = new Map() +export { registry } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/undefined-literals.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/undefined-literals.tsx index 0c6e4f01aa..88b0bf1ba8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/undefined-literals.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/undefined-literals.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/undefined-test')({ component: undefined, errorComponent: undefined, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure.tsx index d0de09bf8b..b5b3ecade6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure.tsx @@ -1,5 +1,4 @@ import * as React from 'react' - import { CgCornerUpLeft, CgSpinner } from 'react-icons/cg' import { FaBolt, @@ -21,7 +20,6 @@ import { startProject } from '~/projects/start' import { createFileRoute } from '@tanstack/react-router' import { Framework, getBranch } from '~/projects' import { seo } from '~/utils/seo' - const menu = [ { label: ( @@ -72,31 +70,22 @@ const menu = [ to: `https://cottonbureau.com/people/tanstack`, }, ] - export const Route = createFileRoute('/_libraries/start/$version/')({ component: VersionIndex, meta: () => - seo({ - title: startProject.name, - description: startProject.description, - }), + seo({ title: startProject.name, description: startProject.description }), }) - const librariesRouteApi = getRouteApi('/_libraries') - export default function VersionIndex() { const { sponsorsPromise } = librariesRouteApi.useLoaderData() const { version } = Route.useParams() const branch = getBranch(startProject, version) const [framework, setFramework] = React.useState('react') const [isDark, setIsDark] = React.useState(true) - React.useEffect(() => { setIsDark(window.matchMedia?.(`(prefers-color-scheme: dark)`).matches) }, []) - const gradientText = `inline-block text-transparent bg-clip-text bg-gradient-to-r ${startProject.colorFrom} ${startProject.colorTo}` - return (
{item.label}
) - return (
{item.to.startsWith('http') ? ( @@ -269,7 +257,6 @@ Check it out at https://tanstack.com/start/`,
*/} - {/*

@@ -315,7 +302,6 @@ Check it out at https://tanstack.com/start/`, })}

*/} - {/*
Trusted in Production by @@ -358,7 +344,6 @@ Check it out at https://tanstack.com/start/`,
*/} -

Partners @@ -388,16 +373,13 @@ Check it out at https://tanstack.com/start/`,

-

Sponsors

-
@@ -429,7 +410,6 @@ Check it out at https://tanstack.com/start/`, rage-quit OSS. Yay money! 😉
- {/*

@@ -468,7 +448,6 @@ Check it out at https://tanstack.com/start/`,

*/} - {/* {[''].includes(framework) ? (
@@ -503,7 +482,6 @@ Check it out at https://tanstack.com/start/`, >
)} */} - {/*
Wow, you've come a long way! diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@component.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@component.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@errorComponent.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@errorComponent.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@notFoundComponent.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@notFoundComponent.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function.tsx index ad71347222..29a53d433e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('arrow-function.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('arrow-function.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx index 7fe3edee11..e36e48f495 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,27 +1,31 @@ -import * as React from 'react'; -import { Link, Outlet } from '@tanstack/react-router'; -import { Route } from "arrow-function.tsx"; +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { Route } from 'arrow-function.tsx' const PostsComponent = () => { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {[...posts, { - id: 'i-do-not-exist', - title: 'Non-existent Post' - }]?.map(post => { - return
  • - + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }]?.map( + (post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - })} + + ) + }, + )}

-
; -}; -export { PostsComponent as component }; \ No newline at end of file +
+ ) +} +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@loader.tsx index cb195afdd8..1c4fc213ed 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@loader.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; -import { fetchPosts } from '../posts'; -const SplitLoader = fetchPosts; -export { SplitLoader as loader }; \ No newline at end of file +import * as React from 'react' +import { fetchPosts } from '../posts' +const SplitLoader = fetchPosts +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals.tsx index c31ee0e095..05711582b7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals.tsx @@ -1,13 +1,14 @@ -const $$splitLoaderImporter = () => import('boolean-null-literals.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('boolean-null-literals.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/router'; - +const $$splitLoaderImporter = () => + import('boolean-null-literals.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('boolean-null-literals.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/router' // Test errorComponent with false literal export const Route = createFileRoute('/test')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), errorComponent: false, pendingComponent: null, - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@component---errorComponent---notFoundComponent---pendingComponent.tsx index c49c9e93a3..557105b6a3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ // Test errorComponent with false literal -const SplitComponent = () =>
Test Component
; -export { SplitComponent as component }; \ No newline at end of file +const SplitComponent = () =>
Test Component
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@loader.tsx index 666ed1e7ec..0e19f8cafe 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@loader.tsx @@ -1,5 +1,3 @@ // Test errorComponent with false literal -const SplitLoader = async () => ({ - data: 'test' -}); -export { SplitLoader as loader }; \ No newline at end of file +const SplitLoader = async () => ({ data: 'test' }) +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese.tsx index 327e227da4..41db95b98c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese.tsx @@ -1,10 +1,11 @@ -const $$splitComponentImporter = () => import('chinese.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('chinese.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@component---errorComponent---notFoundComponent---pendingComponent.tsx index 003ca944a1..2ac1fa54ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,23 +1,27 @@ -import * as React from 'react'; +import * as React from 'react' function HomeComponent() { - return
+ return ( +
-
; +
+ ) } interface DemoProps { - title: string; + title: string } -function Demo({ - title -}: DemoProps) { - return

+function Demo({ title }: DemoProps) { + return ( +

{title} -

; + + ) } -export { HomeComponent as component }; \ No newline at end of file +export { HomeComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@loader.tsx index b4de370f4e..cbcea8cc40 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@loader.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import * as React from 'react' interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function.tsx index ec4cff827d..38e3239ffd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('circular-reference-arrow-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('circular-reference-arrow-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx index 39ace71ebe..59c5b5eec2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,19 +1,17 @@ function getComponentName(obj: Record): string { - return Object.keys(obj)[0]; + return Object.keys(obj)[0] } const App = () => { - const componentName = getComponentName({ - App - }); - return
+ const componentName = getComponentName({ App }) + return ( +
Component Name is {componentName} -
; -}; -function OtherComponent() { - const componentName = getComponentName({ - App - }); - return
App component name is {componentName}
; +
+ ) } -export { App as component }; \ No newline at end of file +function OtherComponent() { + const componentName = getComponentName({ App }) + return
App component name is {componentName}
+} +export { App as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function.tsx index e4a82d1022..b3bdc6b113 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('circular-reference-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('circular-reference-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function@component---errorComponent---notFoundComponent---pendingComponent.tsx index 96a753ad8a..22fbb8669f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,19 +1,17 @@ function getComponentName(obj: Record): string { - return Object.keys(obj)[0]; + return Object.keys(obj)[0] } function App() { - const componentName = getComponentName({ - App - }); - return
+ const componentName = getComponentName({ App }) + return ( +
Component Name is {componentName} -
; +
+ ) } function OtherComponent() { - const componentName = getComponentName({ - App - }); - return
App component name is {componentName}
; + const componentName = getComponentName({ App }) + return
App component name is {componentName}
} -export { App as component }; \ No newline at end of file +export { App as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties.tsx index c20dcdc135..e8296b890b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('conditional-properties.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('conditional-properties.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('conditional-properties.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('conditional-properties.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@component---errorComponent---notFoundComponent---pendingComponent.tsx index aaf3410c69..e460c54467 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import { isEnabled } from '@features/feature-flags'; -import TrueImport from '@modules/true-component'; -import { FalseComponent } from '@modules/false-component'; -const SplitComponent = isEnabled ? TrueImport.Component : FalseComponent; -export { SplitComponent as component }; \ No newline at end of file +import { isEnabled } from '@features/feature-flags' +import TrueImport from '@modules/true-component' +import { FalseComponent } from '@modules/false-component' +const SplitComponent = isEnabled ? TrueImport.Component : FalseComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@loader.tsx index e10f305ddc..e5872a344c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@loader.tsx @@ -1,5 +1,5 @@ -import { isEnabled } from '@features/feature-flags'; -import TrueImport from '@modules/true-component'; -import { falseLoader } from '@modules/false-component'; -const SplitLoader = isEnabled ? TrueImport.loader : falseLoader; -export { SplitLoader as loader }; \ No newline at end of file +import { isEnabled } from '@features/feature-flags' +import TrueImport from '@modules/true-component' +import { falseLoader } from '@modules/false-component' +const SplitLoader = isEnabled ? TrueImport.loader : falseLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple.tsx index e411fd54d8..f9e740d637 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple.tsx @@ -1,15 +1,13 @@ -const $$splitComponentImporter = () => import('destructured-export-multiple.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export-multiple.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const getConfig = () => ({ baseUrl: 'https://api.example.com', - timeout: 5000 -}); -export const { - baseUrl, - timeout -} = getConfig(); -export const [first, second] = [1, 2]; + timeout: 5000, +}) +export const { baseUrl, timeout } = getConfig() +export const [first, second] = [1, 2] export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple@component---errorComponent---notFoundComponent---pendingComponent.tsx index 9441b5a689..6a15a59c0a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,8 +1,10 @@ -import { baseUrl, timeout } from "destructured-export-multiple.tsx"; +import { baseUrl, timeout } from 'destructured-export-multiple.tsx' function AboutComponent() { - return
+ return ( +

Base URL: {baseUrl}

Timeout: {timeout}

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested.tsx index 076c24b06f..f4fafce158 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested.tsx @@ -1,19 +1,16 @@ -const $$splitComponentImporter = () => import('destructured-export-nested.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export-nested.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' const getConfig = () => ({ - api: { - baseUrl: 'https://api.example.com' - }, + api: { baseUrl: 'https://api.example.com' }, timeout: 5000, - extra: 'data' -}); + extra: 'data', +}) export const { - api: { - baseUrl - }, + api: { baseUrl }, ...rest -} = getConfig(); +} = getConfig() export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested@component---errorComponent---notFoundComponent---pendingComponent.tsx index 8ba46e33e1..9bc538525f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,7 +1,9 @@ -import { baseUrl } from "destructured-export-nested.tsx"; +import { baseUrl } from 'destructured-export-nested.tsx' function AboutComponent() { - return
+ return ( +

Base URL: {baseUrl}

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export.tsx index 3f79ca544b..b56d070279 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export.tsx @@ -1,17 +1,11 @@ -const $$splitComponentImporter = () => import('destructured-export.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; + return { getObject: () => ({ constA: 10, constB: 5 }) } } -export const { - getObject -} = getObjectCallback(); +export const { getObject } = getObjectCallback() export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx index f58942d5af..b0abbd2e6e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,14 +1,11 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; + return { getObject: () => ({ constA: 10, constB: 5 }) } } function AboutComponent() { - return
+ return ( +

About

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@loader.tsx index 45fb19eecd..024e0e620e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@loader.tsx @@ -1,8 +1,3 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; -} \ No newline at end of file + return { getObject: () => ({ constA: 10, constB: 5 }) } +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component.tsx index c27220acce..e914a58628 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('destructured-react-memo-imported-component.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('destructured-react-memo-imported-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('destructured-react-memo-imported-component.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('destructured-react-memo-imported-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index 446d55e26b..88dcdf6e48 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,6 +1,6 @@ -import { memo } from 'react'; +import { memo } from 'react' function Component() { - return
Component
; + return
Component
} -const SplitComponent = memo(Component); -export { SplitComponent as component }; \ No newline at end of file +const SplitComponent = memo(Component) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@loader.tsx index 52e811be53..8691aec6ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@loader.tsx @@ -1,3 +1,3 @@ -import { importedLoader } from '../../shared/imported'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import { importedLoader } from '../../shared/imported' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults.tsx index 1759b05846..bf26704b82 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('destructured-route-options-defaults.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('destructured-route-options-defaults.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('destructured-route-options-defaults.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('destructured-route-options-defaults.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/about')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@component---errorComponent---notFoundComponent---pendingComponent.tsx index c73696ff32..c26d6be33d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import { MyComponent } from "destructured-route-options-defaults.tsx?tsr-shared=1"; -export { MyComponent as component }; \ No newline at end of file +import { MyComponent } from 'destructured-route-options-defaults.tsx?tsr-shared=1' +export { MyComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@loader.tsx index 99d9619b91..3caedc3e55 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@loader.tsx @@ -1,2 +1,2 @@ -import { loader } from "destructured-route-options-defaults.tsx?tsr-shared=1"; -export { loader }; \ No newline at end of file +import { loader } from 'destructured-route-options-defaults.tsx?tsr-shared=1' +export { loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@shared.tsx index fdc9acef5b..a7dee6af52 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@shared.tsx @@ -1,22 +1,23 @@ function defaultLoader() { - return { - message: 'default' - }; + return { message: 'default' } } function DefaultComponent() { - return
Default
; + return
Default
} const createBits = () => ({ component: ActualComponent, - loader: () => ({ - message: 'hello' - }) -}); -const { - component: MyComponent = DefaultComponent, - loader = defaultLoader -} = createBits(); + loader: () => ({ message: 'hello' }), +}) +const { component: MyComponent = DefaultComponent, loader = defaultLoader } = + createBits() function ActualComponent() { - return
About
; + return
About
+} +export { + ActualComponent, + createBits, + DefaultComponent, + defaultLoader, + loader, + MyComponent, } -export { ActualComponent, createBits, DefaultComponent, defaultLoader, loader, MyComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring.tsx index d80f17484f..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring.tsx @@ -1,11 +1,9 @@ import thing from 'thing' - export function test() { const { foo: { bar: { destructured }, }, } = thing - return destructured } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@component---errorComponent---notFoundComponent---pendingComponent.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@loader.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@loader.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue.tsx index 12d3529331..a5bca5a02c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue.tsx @@ -1,8 +1,8 @@ -'use client'; - -const $$splitComponentImporter = () => import('directive-prologue.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +'use client' +const $$splitComponentImporter = () => + import('directive-prologue.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/directive')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue@component---errorComponent---notFoundComponent---pendingComponent.tsx index ce7cd5e5ee..9ee4bd8f4c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,6 +1,5 @@ -'use client'; - +'use client' const SplitComponent = () => { - return
directive preserved
; -}; -export { SplitComponent as component }; \ No newline at end of file + return
directive preserved
+} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component.tsx index 4fdd9d1c68..8109a89624 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component.tsx @@ -1,6 +1,3 @@ import React from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ - component: undefined, -}) +export const Route = createFileRoute('/')({ component: undefined }) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@loader.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@loader.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound.tsx index 0ca25a7017..fc6cef74a4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound.tsx @@ -1,15 +1,23 @@ -console.warn("[tanstack-router] These exports from \"export-default-component-and-normal-notFound.tsx\" will not be code-split and will increase your bundle size:\n- Home\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitNotFoundComponentImporter = () => import('export-default-component-and-normal-notFound.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import React, { useState } from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +console.warn( + '[tanstack-router] These exports from "export-default-component-and-normal-notFound.tsx" will not be code-split and will increase your bundle size:\n- Home\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitNotFoundComponentImporter = () => + import('export-default-component-and-normal-notFound.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import React, { useState } from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/home')({ component: Home, - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); + notFoundComponent: lazyRouteComponent( + $$splitNotFoundComponentImporter, + 'notFoundComponent', + ), +}) export default function Home() { - const [one, setOne] = useState('this is from a state'); - return
+ const [one, setOne] = useState('this is from a state') + return ( +

{one}

-
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@component---errorComponent---notFoundComponent---pendingComponent.tsx index 62cd0a1036..3da924c04c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import React from 'react'; +import React from 'react' function NotFoundComponent() { - return
Not Found
; + return
Not Found
} -export { NotFoundComponent as notFoundComponent }; \ No newline at end of file +export { NotFoundComponent as notFoundComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@loader.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@loader.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component.tsx index c5198b9e00..de2d748c91 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component.tsx @@ -1,13 +1,8 @@ import React, { useState } from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/home')({ - component: Home, -}) - +export const Route = createFileRoute('/home')({ component: Home }) export default function Home() { const [one, setOne] = useState('this is from a state') - return (

{one}

diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@loader.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@loader.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter.tsx index 3ae9710cd5..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter.tsx @@ -1,29 +1,20 @@ import * as React from 'react' // @ts-expect-error import { useMemo } from 'tan-react' - const useUsedVar = 'i-am-unused' - const ReactUseMemoCall1 = React.useMemo(function performAction() { return 'true' }, []) - console.info(ReactUseMemoCall1) - const ReactUseMemoCall2 = React.useMemo(() => { return 'true' }, []) - console.info(ReactUseMemoCall2) - const UseMemoCall1 = useMemo(function performAction() { return 'true' }, []) - console.info(UseMemoCall1) - const UseMemoCall2 = useMemo(() => { return 'true' }, []) - console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@component---errorComponent---notFoundComponent---pendingComponent.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@loader.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@loader.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration.tsx index c191f9fddd..b12490e0a5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('function-declaration.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('function-declaration.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx index 3476c52d54..a0ebf07dee 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,27 +1,31 @@ -import * as React from 'react'; -import { Link, Outlet } from '@tanstack/react-router'; -import { Route } from "function-declaration.tsx"; +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { Route } from 'function-declaration.tsx' function PostsComponent() { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {[...posts, { - id: 'i-do-not-exist', - title: 'Non-existent Post' - }]?.map(post => { - return
  • - + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }]?.map( + (post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - })} + + ) + }, + )}

-
; +
+ ) } -export { PostsComponent as component }; \ No newline at end of file +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@loader.tsx index cb195afdd8..1c4fc213ed 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@loader.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; -import { fetchPosts } from '../posts'; -const SplitLoader = fetchPosts; -export { SplitLoader as loader }; \ No newline at end of file +import * as React from 'react' +import { fetchPosts } from '../posts' +const SplitLoader = fetchPosts +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute.tsx index e2aab465f5..b6b9c182dc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('importAttribute.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('importAttribute.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute@component---errorComponent---notFoundComponent---pendingComponent.tsx index f34d3c6408..88abef0c00 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { test } from './test' with { type: 'macro' }; -const SplitComponent = () => test; -export { SplitComponent as component }; \ No newline at end of file +import { test } from './test' with { type: 'macro' } +const SplitComponent = () => test +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader.tsx index 70d5be8c3f..969129bdf2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('imported-default-component-destructured-loader.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('imported-default-component-destructured-loader.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('imported-default-component-destructured-loader.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('imported-default-component-destructured-loader.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx index d21b198c98..9350cda9e8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import importedComponent from '../../shared/imported'; -const SplitComponent = importedComponent; -export { SplitComponent as component }; \ No newline at end of file +import importedComponent from '../../shared/imported' +const SplitComponent = importedComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@loader.tsx index 52e811be53..8691aec6ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@loader.tsx @@ -1,3 +1,3 @@ -import { importedLoader } from '../../shared/imported'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import { importedLoader } from '../../shared/imported' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component.tsx index 601c1f656a..f793a41de9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('imported-default-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('imported-default-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent.tsx index 4df12c02de..13e87eb7f1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent.tsx @@ -1,8 +1,13 @@ -const $$splitErrorComponentImporter = () => import('imported-errorComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('imported-errorComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitErrorComponentImporter = () => + import('imported-errorComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('imported-errorComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx index d8a0fcf9ff..b5bded20a6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,7 @@ -import ImportedDefaultComponent, { importedErrorComponent } from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; -const SplitErrorComponent = importedErrorComponent; -export { SplitErrorComponent as errorComponent }; \ No newline at end of file +import ImportedDefaultComponent, { + importedErrorComponent, +} from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } +const SplitErrorComponent = importedErrorComponent +export { SplitErrorComponent as errorComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent.tsx index 716ec0ca3a..48b7f7f6bf 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent.tsx @@ -1,8 +1,13 @@ -const $$splitNotFoundComponentImporter = () => import('imported-notFoundComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('imported-notFoundComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitNotFoundComponentImporter = () => + import('imported-notFoundComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('imported-notFoundComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); \ No newline at end of file + notFoundComponent: lazyRouteComponent( + $$splitNotFoundComponentImporter, + 'notFoundComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx index 1273c7c50d..9f904a1a19 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,7 @@ -import ImportedDefaultComponent, { importedNotFoundComponent } from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; -const SplitNotFoundComponent = importedNotFoundComponent; -export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file +import ImportedDefaultComponent, { + importedNotFoundComponent, +} from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } +const SplitNotFoundComponent = importedNotFoundComponent +export { SplitNotFoundComponent as notFoundComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent.tsx index 5a5aa789f7..c22e117560 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent.tsx @@ -1,8 +1,13 @@ -const $$splitPendingComponentImporter = () => import('imported-pendingComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('imported-pendingComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitPendingComponentImporter = () => + import('imported-pendingComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('imported-pendingComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent') -}); \ No newline at end of file + pendingComponent: lazyRouteComponent( + $$splitPendingComponentImporter, + 'pendingComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx index 0368000afa..d24c7b1505 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,7 @@ -import ImportedDefaultComponent, { importedPendingComponent } from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; -const SplitPendingComponent = importedPendingComponent; -export { SplitPendingComponent as pendingComponent }; \ No newline at end of file +import ImportedDefaultComponent, { + importedPendingComponent, +} from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } +const SplitPendingComponent = importedPendingComponent +export { SplitPendingComponent as pendingComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported.tsx index dd3299b1b1..54a7733167 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported.tsx @@ -1,9 +1,10 @@ -const $$splitLoaderImporter = () => import('imported.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('imported.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => import('imported.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('imported.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@component---errorComponent---notFoundComponent---pendingComponent.tsx index 5bc9da8d43..e3c06dbe9e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { importedComponent } from '../../shared'; -const SplitComponent = importedComponent; -export { SplitComponent as component }; \ No newline at end of file +import { importedComponent } from '../../shared' +const SplitComponent = importedComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@loader.tsx index 9b91fafd91..d0418cbce3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@loader.tsx @@ -1,3 +1,3 @@ -import { importedLoader } from '../../shared'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import { importedLoader } from '../../shared' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline.tsx index 960f639c0a..3c27842428 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('inline.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('inline.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -Route.addChildren([]); -export const test = 'test'; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +Route.addChildren([]) +export const test = 'test' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@component---errorComponent---notFoundComponent---pendingComponent.tsx index 58ccfb2903..d28b872634 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,18 +1,18 @@ -import * as React from 'react'; -import * as styles from '../style.css'; -import { TEST_DATA } from '../test.const'; -const Button = (props: { - children: any; -}) => { - return ; -}; -import { Route } from "inline.tsx"; -import { test } from "inline.tsx"; +import * as React from 'react' +import * as styles from '../style.css' +import { TEST_DATA } from '../test.const' +const Button = (props: { children: any }) => { + return +} +import { Route } from 'inline.tsx' +import { test } from 'inline.tsx' const SplitComponent = () => { - return
- {test} -

{TEST_DATA.welcome}

- -
; -}; -export { SplitComponent as component }; \ No newline at end of file + return ( +
+ {test} +

{TEST_DATA.welcome}

+ +
+ ) +} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@loader.tsx index 9236af6021..23fab71edc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@loader.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -import { Route } from "inline.tsx"; \ No newline at end of file +import * as React from 'react' +import { Route } from 'inline.tsx' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration.tsx index 75657cb44a..79ef82a7af 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration.tsx @@ -1,10 +1,19 @@ -const $$splitErrorComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitPendingComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitErrorComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +const $$splitPendingComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + pendingComponent: lazyRouteComponent( + $$splitPendingComponentImporter, + 'pendingComponent', + ), + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx index 86876d616e..ec003091fb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,12 +1,12 @@ function component() { - return
lowercase function declaration
; + return
lowercase function declaration
} function pendingComponent() { - return
lowercase pending function declaration
; + return
lowercase pending function declaration
} function errorComponent() { - return
lowercase error function declaration
; + return
lowercase error function declaration
} -export { component }; -export { pendingComponent }; -export { errorComponent }; \ No newline at end of file +export { component } +export { pendingComponent } +export { errorComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number.tsx index a345d17ae7..440e1f4253 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number.tsx @@ -1,28 +1,41 @@ -const $$splitComponentImporter = () => import('random-number.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('random-number.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { Await, Link, createFileRoute } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -export const textColors = [`text-rose-500`, `text-yellow-500`, `text-teal-500`, `text-blue-500`]; -export const gradients = [`from-rose-500 to-yellow-500`, `from-yellow-500 to-teal-500`, `from-teal-500 to-violet-500`, `from-blue-500 to-pink-500`]; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; +const $$splitComponentImporter = () => + import('random-number.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => import('random-number.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { Await, Link, createFileRoute } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +export const textColors = [ + `text-rose-500`, + `text-yellow-500`, + `text-teal-500`, + `text-blue-500`, +] +export const gradients = [ + `from-rose-500 to-yellow-500`, + `from-yellow-500 to-teal-500`, + `from-teal-500 to-violet-500`, + `from-blue-500 to-pink-500`, +] +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] export const Route = createFileRoute('/')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@component---errorComponent---notFoundComponent---pendingComponent.tsx index 9ed6d15184..26a9f9c142 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,61 +1,48 @@ -import { Await, Link } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import discordImage from '~/images/discord-logo-white.svg'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -import { useMutation } from '~/hooks/useMutation'; -import { sample } from '~/utils/utils'; -import { textColors } from "random-number.tsx"; -import { gradients } from "random-number.tsx"; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; -import { Route } from "random-number.tsx"; -async function bytesSignupServerFn({ - email -}: { - email: string; -}) { - 'use server'; - +import { Await, Link } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import discordImage from '~/images/discord-logo-white.svg' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +import { useMutation } from '~/hooks/useMutation' +import { sample } from '~/utils/utils' +import { textColors } from 'random-number.tsx' +import { gradients } from 'random-number.tsx' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] +import { Route } from 'random-number.tsx' +async function bytesSignupServerFn({ email }: { email: string }) { + 'use server' return fetch(`https://bytes.dev/api/bytes-optin-cors`, { method: 'POST', - body: JSON.stringify({ - email, - influencer: 'tanstack' - }), - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json' - } - }); + body: JSON.stringify({ email, influencer: 'tanstack' }), + headers: { Accept: 'application/json', 'Content-Type': 'application/json' }, + }) } function Index() { - const bytesSignupMutation = useMutation({ - fn: bytesSignupServerFn - }); - const { - sponsorsPromise, - randomNumber, - testing2 - } = Route.useLoaderData(); - const gradient = sample(gradients, randomNumber); - const textColor = sample(textColors, randomNumber); - return <> + const bytesSignupMutation = useMutation({ fn: bytesSignupServerFn }) + const { sponsorsPromise, randomNumber, testing2 } = Route.useLoaderData() + const gradient = sample(gradients, randomNumber) + const textColor = sample(textColors, randomNumber) + return ( + <> {discordImage} {gradient} {textColor} - ; + + ) } -export { Index as component }; \ No newline at end of file +export { Index as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@loader.tsx index 9f854acfb0..0e7d41451e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@loader.tsx @@ -1,26 +1,28 @@ -import { Await, Link, defer } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import { getSponsorsForSponsorPack } from '~/server/sponsors'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; +import { Await, Link, defer } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import { getSponsorsForSponsorPack } from '~/server/sponsors' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] const SplitLoader = () => { return { randomNumber: Math.random(), - sponsorsPromise: defer(getSponsorsForSponsorPack()) - }; -}; -export { SplitLoader as loader }; \ No newline at end of file + sponsorsPromise: defer(getSponsorsForSponsorPack()), + } +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component.tsx index eea3e62996..9be4f76d08 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('react-memo-component.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('react-memo-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('react-memo-component.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('react-memo-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index dfef29c9e3..6bdb537fe9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,6 +1,6 @@ -import React from 'react'; +import React from 'react' function Component() { - return
Component
; + return
Component
} -const SplitComponent = React.memo(Component); -export { SplitComponent as component }; \ No newline at end of file +const SplitComponent = React.memo(Component) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@loader.tsx index 52e811be53..8691aec6ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@loader.tsx @@ -1,3 +1,3 @@ -import { importedLoader } from '../../shared/imported'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import { importedLoader } from '../../shared/imported' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component.tsx index e445bcbb72..2637f8de7a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('react-memo-imported-component.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('react-memo-imported-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('react-memo-imported-component.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('react-memo-imported-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index 540812230e..d162a1aeaf 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,4 +1,4 @@ -import React from 'react'; -import { importedComponent } from '../../shared/imported'; -const SplitComponent = React.memo(importedComponent); -export { SplitComponent as component }; \ No newline at end of file +import React from 'react' +import { importedComponent } from '../../shared/imported' +const SplitComponent = React.memo(importedComponent) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@loader.tsx index 52e811be53..8691aec6ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@loader.tsx @@ -1,3 +1,3 @@ -import { importedLoader } from '../../shared/imported'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import { importedLoader } from '../../shared/imported' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component.tsx index f22aa236e1..1b374dd690 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component.tsx @@ -1,14 +1,16 @@ -console.warn("[tanstack-router] These exports from \"retain-export-component.tsx\" will not be code-split and will increase your bundle size:\n- Layout\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitLoaderImporter = () => import('retain-export-component.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute, Outlet } from '@tanstack/react-router'; -import { importedComponent as ImportedComponent } from '../../shared/imported'; +console.warn( + '[tanstack-router] These exports from "retain-export-component.tsx" will not be code-split and will increase your bundle size:\n- Layout\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitLoaderImporter = () => + import('retain-export-component.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute, Outlet } from '@tanstack/react-router' +import { importedComponent as ImportedComponent } from '../../shared/imported' export function Layout() { - return
-
+ return ( +
+
-
; +
+ ) } export const Route = createFileRoute('/_layout')({ component: Layout, - loader: lazyFn($$splitLoaderImporter, 'loader') -}); -const HEADER_HEIGHT = '63px'; -export const SIDEBAR_WIDTH = '150px'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) +const HEADER_HEIGHT = '63px' +export const SIDEBAR_WIDTH = '150px' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index 5bb0ab5451..8fb12f0c6b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import * as React from 'react'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@loader.tsx index 9787e27ad7..ddeb4d1e6f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@loader.tsx @@ -1,6 +1,6 @@ -import * as React from 'react'; -import { importedLoader } from '../../shared/imported'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import * as React from 'react' +import { importedLoader } from '../../shared/imported' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const.tsx index f256b01a83..d674dbb799 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const.tsx @@ -4,11 +4,9 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export const loaderFn = () => { return importedLoader() } - const Layout = () => { return (
@@ -26,15 +24,12 @@ const Layout = () => {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: loaderFn, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' export const SIDEBAR_MINI_WIDTH = '80px' const ASIDE_WIDTH = '250px' - export default Layout diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@component---errorComponent---notFoundComponent---pendingComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@loader.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@loader.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured.tsx index 0e3175116f..89c23305a0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured.tsx @@ -1,18 +1,12 @@ import { createFileRoute } from '@tanstack/react-router' - const createBits = () => ({ component: AboutComponentImpl, - loader: () => ({ - message: 'hello', - }), + loader: () => ({ message: 'hello' }), }) - export const { component: AboutComponent, loader } = createBits() - function AboutComponentImpl() { return
About
} - export const Route = createFileRoute('/about')({ component: AboutComponent, loader, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx index a6d57afe77..d64b42fdcc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import { AboutComponent } from "retain-exports-destructured.tsx?tsr-shared=1"; -export { AboutComponent as component }; \ No newline at end of file +import { AboutComponent } from 'retain-exports-destructured.tsx?tsr-shared=1' +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@loader.tsx index e8d771ea44..0397569b0f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@loader.tsx @@ -1,2 +1,2 @@ -import { loader } from "retain-exports-destructured.tsx?tsr-shared=1"; -export { loader }; \ No newline at end of file +import { loader } from 'retain-exports-destructured.tsx?tsr-shared=1' +export { loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@shared.tsx index b03a4eb83a..6eff1ff083 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@shared.tsx @@ -1,14 +1,9 @@ const createBits = () => ({ component: AboutComponentImpl, - loader: () => ({ - message: 'hello' - }) -}); -const { - component: AboutComponent, - loader -} = createBits(); + loader: () => ({ message: 'hello' }), +}) +const { component: AboutComponent, loader } = createBits() function AboutComponentImpl() { - return
About
; + return
About
} -export { AboutComponent, AboutComponentImpl, createBits, loader }; \ No newline at end of file +export { AboutComponent, AboutComponentImpl, createBits, loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function.tsx index 298c388e65..83b3dd4eb5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function.tsx @@ -4,11 +4,9 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export function loaderFn() { return importedLoader() } - function Layout() { return (
@@ -26,15 +24,12 @@ function Layout() {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: loaderFn, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' export const SIDEBAR_MINI_WIDTH = '80px' const ASIDE_WIDTH = '250px' - export default Layout diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@component---errorComponent---notFoundComponent---pendingComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@loader.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@loader.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader.tsx index c7d5437729..ef230c47f6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader.tsx @@ -1,17 +1,18 @@ -console.warn("[tanstack-router] These exports from \"retain-exports-loader.tsx\" will not be code-split and will increase your bundle size:\n- loaderFn\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitComponentImporter = () => import('retain-exports-loader.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +console.warn( + '[tanstack-router] These exports from "retain-exports-loader.tsx" will not be code-split and will increase your bundle size:\n- loaderFn\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitComponentImporter = () => + import('retain-exports-loader.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export function loaderFn() { - return { - foo: 'bar' - }; + return { foo: 'bar' } } export const Route = createFileRoute('/_layout')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: loaderFn -}); -export const SIDEBAR_WIDTH = '150px'; -export const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file + loader: loaderFn, +}) +export const SIDEBAR_WIDTH = '150px' +export const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx index 9f54ae0dc5..604be4dc69 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,11 +1,10 @@ -import * as React from 'react'; -import { Outlet } from '@tanstack/react-router'; -import { importedComponent as ImportedComponent } from '../../shared/imported'; +import * as React from 'react' +import { Outlet } from '@tanstack/react-router' +import { importedComponent as ImportedComponent } from '../../shared/imported' function Layout() { - return
-
+ return ( +
+
-
; +
+ ) } -const HEADER_HEIGHT = '63px'; -const ASIDE_WIDTH = '250px'; -export { Layout as component }; \ No newline at end of file +const HEADER_HEIGHT = '63px' +const ASIDE_WIDTH = '250px' +export { Layout as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@loader.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@loader.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class.tsx index da068daa17..96d51c8492 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('shared-class.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-class.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-class.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => import('shared-class.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/store')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@component---errorComponent---notFoundComponent---pendingComponent.tsx index 6a38b10ff8..e0e187fb1d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { store } from "shared-class.tsx?tsr-shared=1"; -const SplitComponent = () =>
{store.get('items')}
; -export { SplitComponent as component }; \ No newline at end of file +import { store } from 'shared-class.tsx?tsr-shared=1' +const SplitComponent = () =>
{store.get('items')}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@loader.tsx index f91799f3c8..96dcaca4a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@loader.tsx @@ -1,5 +1,5 @@ -import { store } from "shared-class.tsx?tsr-shared=1"; +import { store } from 'shared-class.tsx?tsr-shared=1' const SplitLoader = async () => { - store.set('items', await fetch('/api')); -}; -export { SplitLoader as loader }; \ No newline at end of file + store.set('items', await fetch('/api')) +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@shared.tsx index 18c40bafb6..0abc282ecc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@shared.tsx @@ -1,11 +1,11 @@ class DataStore { - data = new Map(); + data = new Map() get(k: string) { - return this.data.get(k); + return this.data.get(k) } set(k: string, v: unknown) { - this.data.set(k, v); + this.data.set(k, v) } } -const store = new DataStore(); -export { DataStore, store }; \ No newline at end of file +const store = new DataStore() +export { DataStore, store } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export.tsx index 7d0f0fcae1..080a19ff45 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('shared-destructured-export.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-destructured-export.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-destructured-export.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-destructured-export.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/config')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -export { apiUrl, timeout } from "shared-destructured-export.tsx?tsr-shared=1"; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +export { apiUrl, timeout } from 'shared-destructured-export.tsx?tsr-shared=1' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx index 16b288ac5f..8cd0f14a27 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { timeout } from "shared-destructured-export.tsx?tsr-shared=1"; -const SplitComponent = () =>
Timeout: {timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { timeout } from 'shared-destructured-export.tsx?tsr-shared=1' +const SplitComponent = () =>
Timeout: {timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@loader.tsx index 33d4b5aa43..d099459c6f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@loader.tsx @@ -1,3 +1,3 @@ -import { apiUrl } from "shared-destructured-export.tsx?tsr-shared=1"; -const SplitLoader = async () => fetch(apiUrl); -export { SplitLoader as loader }; \ No newline at end of file +import { apiUrl } from 'shared-destructured-export.tsx?tsr-shared=1' +const SplitLoader = async () => fetch(apiUrl) +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@shared.tsx index f0bfd70add..ae9324acc9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@shared.tsx @@ -1,11 +1,5 @@ -const { - apiUrl, - timeout -} = getConfig(); +const { apiUrl, timeout } = getConfig() function getConfig() { - return { - apiUrl: '/api', - timeout: 5000 - }; + return { apiUrl: '/api', timeout: 5000 } } -export { apiUrl, getConfig, timeout }; \ No newline at end of file +export { apiUrl, getConfig, timeout } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured.tsx index 8185738e9d..7c46a40bb3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-destructured.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-destructured.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-destructured.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-destructured.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/config')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx index 5c0182e61a..3d7933a573 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { timeout } from "shared-destructured.tsx?tsr-shared=1"; -const SplitComponent = () =>
Timeout: {timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { timeout } from 'shared-destructured.tsx?tsr-shared=1' +const SplitComponent = () =>
Timeout: {timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@loader.tsx index 94b0923079..53e56d748d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@loader.tsx @@ -1,3 +1,3 @@ -import { apiUrl } from "shared-destructured.tsx?tsr-shared=1"; -const SplitLoader = async () => fetch(apiUrl); -export { SplitLoader as loader }; \ No newline at end of file +import { apiUrl } from 'shared-destructured.tsx?tsr-shared=1' +const SplitLoader = async () => fetch(apiUrl) +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@shared.tsx index f0bfd70add..ae9324acc9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@shared.tsx @@ -1,11 +1,5 @@ -const { - apiUrl, - timeout -} = getConfig(); +const { apiUrl, timeout } = getConfig() function getConfig() { - return { - apiUrl: '/api', - timeout: 5000 - }; + return { apiUrl: '/api', timeout: 5000 } } -export { apiUrl, getConfig, timeout }; \ No newline at end of file +export { apiUrl, getConfig, timeout } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported.tsx index ce690311b2..bf6574aaed 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('shared-exported.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-exported.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-exported.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-exported.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/query')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -export { queryOptions } from "shared-exported.tsx?tsr-shared=1"; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +export { queryOptions } from 'shared-exported.tsx?tsr-shared=1' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@component---errorComponent---notFoundComponent---pendingComponent.tsx index b020b5cadf..9fe61942dd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { queryOptions } from "shared-exported.tsx?tsr-shared=1"; -const SplitComponent = () =>
GC: {queryOptions.gcTime}
; -export { SplitComponent as component }; \ No newline at end of file +import { queryOptions } from 'shared-exported.tsx?tsr-shared=1' +const SplitComponent = () =>
GC: {queryOptions.gcTime}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@loader.tsx index 332fa35079..4d4b8fbc5c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@loader.tsx @@ -1,7 +1,5 @@ -import { queryOptions } from "shared-exported.tsx?tsr-shared=1"; +import { queryOptions } from 'shared-exported.tsx?tsr-shared=1' const SplitLoader = async () => { - return { - staleTime: queryOptions.staleTime - }; -}; -export { SplitLoader as loader }; \ No newline at end of file + return { staleTime: queryOptions.staleTime } +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@shared.tsx index a3f91b85bb..3a1ff108bb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@shared.tsx @@ -1,5 +1,2 @@ -const queryOptions = { - staleTime: 5000, - gcTime: 10000 -}; -export { queryOptions }; \ No newline at end of file +const queryOptions = { staleTime: 5000, gcTime: 10000 } +export { queryOptions } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function.tsx index b5bf41235e..ef2e5e57a3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-function.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-function.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/cached')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@component---errorComponent---notFoundComponent---pendingComponent.tsx index 571bd9356a..1c327523af 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { getCached } from "shared-function.tsx?tsr-shared=1"; -const SplitComponent = () =>
{JSON.stringify(getCached('data'))}
; -export { SplitComponent as component }; \ No newline at end of file +import { getCached } from 'shared-function.tsx?tsr-shared=1' +const SplitComponent = () =>
{JSON.stringify(getCached('data'))}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@loader.tsx index f5f72ab014..d8ae45caed 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@loader.tsx @@ -1,9 +1,9 @@ -import { getCached, cache } from "shared-function.tsx?tsr-shared=1"; +import { getCached, cache } from 'shared-function.tsx?tsr-shared=1' function setCached(key: string, val: unknown) { - cache.set(key, val); + cache.set(key, val) } const SplitLoader = async () => { - setCached('data', await fetch('/api').then(r => r.json())); - return getCached('data'); -}; -export { SplitLoader as loader }; \ No newline at end of file + setCached('data', await fetch('/api').then((r) => r.json())) + return getCached('data') +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@shared.tsx index 27d2cf03f1..243ac23a66 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@shared.tsx @@ -1,5 +1,5 @@ -const cache = new Map(); +const cache = new Map() function getCached(key: string) { - return cache.get(key); + return cache.get(key) } -export { cache, getCached }; \ No newline at end of file +export { cache, getCached } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding.tsx index d9ce6828fa..30823e2684 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-imported-binding.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-imported-binding.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-imported-binding.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-imported-binding.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/imported')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@component---errorComponent---notFoundComponent---pendingComponent.tsx index 0a835ae063..e3c8a0f5d8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { sharedUtil } from '../utils'; -const SplitComponent = () =>
{sharedUtil('render')}
; -export { SplitComponent as component }; \ No newline at end of file +import { sharedUtil } from '../utils' +const SplitComponent = () =>
{sharedUtil('render')}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@loader.tsx index 1b27de9093..8b8c645837 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@loader.tsx @@ -1,3 +1,3 @@ -import { sharedUtil } from '../utils'; -const SplitLoader = async () => sharedUtil('load'); -export { SplitLoader as loader }; \ No newline at end of file +import { sharedUtil } from '../utils' +const SplitLoader = async () => sharedUtil('load') +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref.tsx index f4dfce52ba..17ae801b02 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-indirect-ref.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-indirect-ref.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-indirect-ref.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-indirect-ref.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/shared-indirect')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx index 62995e7fd8..64bb6ab567 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,7 +1,9 @@ -import { state, getCount } from "shared-indirect-ref.tsx?tsr-shared=1"; +import { state, getCount } from 'shared-indirect-ref.tsx?tsr-shared=1' function SharedComponent() { - return
+ return ( +
{getCount()} - {state.count} -
; +
+ ) } -export { SharedComponent as component }; \ No newline at end of file +export { SharedComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@loader.tsx index 0625ac53f8..6b4c2c895b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@loader.tsx @@ -1,8 +1,6 @@ -import { state, getCount } from "shared-indirect-ref.tsx?tsr-shared=1"; +import { state, getCount } from 'shared-indirect-ref.tsx?tsr-shared=1' const SplitLoader = () => { - state.count++; - return { - count: getCount() - }; -}; -export { SplitLoader as loader }; \ No newline at end of file + state.count++ + return { count: getCount() } +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@shared.tsx index 7e7e811ba8..b4910d2fd1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@shared.tsx @@ -1,7 +1,5 @@ -const state = { - count: 0 -}; +const state = { count: 0 } function getCount() { - return state.count; + return state.count } -export { getCount, state }; \ No newline at end of file +export { getCount, state } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref.tsx index 8ac24d49cf..fd6b2c69be 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('shared-jsx-component-ref.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-jsx-component-ref.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-jsx-component-ref.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-jsx-component-ref.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' // @ts-nocheck -import { createFileRoute } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/jsx')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx index 52ecb6d474..845e1db45c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import { shared } from "shared-jsx-component-ref.tsx?tsr-shared=1"; // @ts-nocheck +import { shared } from 'shared-jsx-component-ref.tsx?tsr-shared=1' // @ts-nocheck function SharedComponent() { - return
{shared}
; + return
{shared}
} -export { SharedComponent as component }; \ No newline at end of file +export { SharedComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@loader.tsx index f861dda436..348aecd923 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@loader.tsx @@ -1,3 +1,3 @@ -import { shared } from "shared-jsx-component-ref.tsx?tsr-shared=1"; // @ts-nocheck -const SplitLoader = () => shared; -export { SplitLoader as loader }; \ No newline at end of file +import { shared } from 'shared-jsx-component-ref.tsx?tsr-shared=1' // @ts-nocheck +const SplitLoader = () => shared +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@shared.tsx index d5cc2cf990..60ae1006a1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@shared.tsx @@ -1,4 +1,3 @@ // @ts-nocheck - -const shared = 1; -export { shared }; \ No newline at end of file +const shared = 1 +export { shared } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none.tsx index 06e81042d6..5ecfa3b109 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('shared-none.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-none.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-none.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => import('shared-none.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/clean')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@component---errorComponent---notFoundComponent---pendingComponent.tsx index 701deeedeb..1bfd4eb63f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,7 @@ -const ComponentHelper = () => helper; -const SplitComponent = () =>
- -
; -export { SplitComponent as component }; \ No newline at end of file +const ComponentHelper = () => helper +const SplitComponent = () => ( +
+ +
+) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@loader.tsx index d0cfce36ee..0dfbec2515 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@loader.tsx @@ -1,3 +1,3 @@ -const loaderHelper = () => fetch('/api'); -const SplitLoader = async () => loaderHelper(); -export { SplitLoader as loader }; \ No newline at end of file +const loaderHelper = () => fetch('/api') +const SplitLoader = async () => loaderHelper() +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route.tsx index b62568c1fb..5a3509f434 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-referencing-route.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-referencing-route.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-referencing-route.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-referencing-route.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/about')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@component---errorComponent---notFoundComponent---pendingComponent.tsx index 2cb2cdb68c..b2c4630c90 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,10 +1,10 @@ -import { HEADER } from "shared-referencing-route.tsx?tsr-shared=1"; +import { HEADER } from 'shared-referencing-route.tsx?tsr-shared=1' function usePageTitle() { - return `${HEADER} - ${Route.fullPath}`; + return `${HEADER} - ${Route.fullPath}` } -import { Route } from "shared-referencing-route.tsx"; +import { Route } from 'shared-referencing-route.tsx' const SplitComponent = () => { - const title = usePageTitle(); - return
{title}
; -}; -export { SplitComponent as component }; \ No newline at end of file + const title = usePageTitle() + return
{title}
+} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@loader.tsx index baedd53bd7..dbf196f1b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@loader.tsx @@ -1,12 +1,10 @@ -import { HEADER } from "shared-referencing-route.tsx?tsr-shared=1"; +import { HEADER } from 'shared-referencing-route.tsx?tsr-shared=1' function usePageTitle() { - return `${HEADER} - ${Route.fullPath}`; + return `${HEADER} - ${Route.fullPath}` } -import { Route } from "shared-referencing-route.tsx"; +import { Route } from 'shared-referencing-route.tsx' const SplitLoader = async () => { - const title = usePageTitle(); - return { - title - }; -}; -export { SplitLoader as loader }; \ No newline at end of file + const title = usePageTitle() + return { title } +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@shared.tsx index cc2d01424c..34b9c4ca41 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@shared.tsx @@ -1,2 +1,2 @@ -const HEADER = 'Page'; -export { HEADER }; \ No newline at end of file +const HEADER = 'Page' +export { HEADER } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime.tsx index bceb12d39a..944c0b8ca8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime.tsx @@ -1,22 +1,20 @@ -import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-runtime.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-runtime.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -console.log('shared-runtime:reference'); +import { state, createState, createSeed } from 'shared-runtime.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-runtime.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-runtime.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +console.log('shared-runtime:reference') export const Route = createFileRoute('/shared-runtime')({ beforeLoad: () => state, loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@component---errorComponent---notFoundComponent---pendingComponent.tsx index fbccf6c90b..5245f6d9eb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,23 +1,24 @@ -import { state, createState, createSeed, Labels } from "shared-runtime.tsx?tsr-shared=1"; -const label = createComponentLabel(); -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -function createComponentLabel() { - console.log('shared-runtime:component'); - return Labels.component; +import { + state, + createState, + createSeed, + Labels, +} from 'shared-runtime.tsx?tsr-shared=1' +const label = createComponentLabel() +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number } -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; +function createComponentLabel() { + console.log('shared-runtime:component') + return Labels.component +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed const SplitComponent = () => { if (state.count === 3) { - throw new Error('route source-map contract'); + throw new Error('route source-map contract') } - return `${label}:${state.count}`; -}; -export { SplitComponent as component }; \ No newline at end of file + return `${label}:${state.count}` +} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@loader.tsx index 6c797c0226..6c0c88cab7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@loader.tsx @@ -1,16 +1,17 @@ -import { state, createState, createSeed, increment } from "shared-runtime.tsx?tsr-shared=1"; -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; +import { + state, + createState, + createSeed, + increment, +} from 'shared-runtime.tsx?tsr-shared=1' +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed const SplitLoader = () => { - increment(); - return state; -}; -export { SplitLoader as loader }; \ No newline at end of file + increment() + return state +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@shared.tsx index 54239b6cc5..c53a7e1568 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@shared.tsx @@ -1,28 +1,13 @@ -const Count = { - Initial: 0 -}; -const Labels = { - component: 'count' -}; -const seed = createSeed(); -const { - state, - increment -} = createState(seed); +const Count = { Initial: 0 } +const Labels = { component: 'count' } +const seed = createSeed() +const { state, increment } = createState(seed) function createSeed() { - console.log('shared-runtime:seed'); - return { - count: Count.Initial, - label: Labels.component - }; + console.log('shared-runtime:seed') + return { count: Count.Initial, label: Labels.component } } -function createState(initialState: { - count: number; -}) { - console.log('shared-runtime:state'); - return { - state: initialState, - increment: () => initialState.count++ - }; +function createState(initialState: { count: number }) { + console.log('shared-runtime:state') + return { state: initialState, increment: () => initialState.count++ } } -export { Count, createSeed, createState, increment, Labels, seed, state }; \ No newline at end of file +export { Count, createSeed, createState, increment, Labels, seed, state } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive.tsx index 869602e15b..aba85fd14b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-transitive.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-transitive.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-transitive.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-transitive.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/api')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@component---errorComponent---notFoundComponent---pendingComponent.tsx index 7a3a74048e..c237a03583 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { config } from "shared-transitive.tsx?tsr-shared=1"; -const SplitComponent = () =>
Timeout: {config.timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { config } from 'shared-transitive.tsx?tsr-shared=1' +const SplitComponent = () =>
Timeout: {config.timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@loader.tsx index 8472eab295..70faa4c627 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@loader.tsx @@ -1,6 +1,6 @@ -import { config } from "shared-transitive.tsx?tsr-shared=1"; -const fetcher = (path: string) => fetch(`${config.url}${path}`); +import { config } from 'shared-transitive.tsx?tsr-shared=1' +const fetcher = (path: string) => fetch(`${config.url}${path}`) const SplitLoader = async () => { - return fetcher('/data'); -}; -export { SplitLoader as loader }; \ No newline at end of file + return fetcher('/data') +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@shared.tsx index 8bec4a1d55..ac44498714 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@shared.tsx @@ -1,6 +1,3 @@ -const BASE_URL = 'https://api.example.com'; -const config = { - url: BASE_URL, - timeout: 5000 -}; -export { BASE_URL, config }; \ No newline at end of file +const BASE_URL = 'https://api.example.com' +const config = { url: BASE_URL, timeout: 5000 } +export { BASE_URL, config } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable.tsx index 42f68cce48..e06ea2b1d2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-variable.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-variable.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-variable.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-variable.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/todos')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@component---errorComponent---notFoundComponent---pendingComponent.tsx index d149922fbc..10325aa95e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { collection } from "shared-variable.tsx?tsr-shared=1"; -const SplitComponent = () =>
{collection.name}
; -export { SplitComponent as component }; \ No newline at end of file +import { collection } from 'shared-variable.tsx?tsr-shared=1' +const SplitComponent = () =>
{collection.name}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@loader.tsx index 196a8e48a4..b76d00b514 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@loader.tsx @@ -1,8 +1,6 @@ -import { collection } from "shared-variable.tsx?tsr-shared=1"; +import { collection } from 'shared-variable.tsx?tsr-shared=1' const SplitLoader = async () => { - await collection.preload(); - return { - data: 'loaded' - }; -}; -export { SplitLoader as loader }; \ No newline at end of file + await collection.preload() + return { data: 'loaded' } +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@shared.tsx index 8a0560d5b9..10421dac09 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@shared.tsx @@ -1,5 +1,2 @@ -const collection = { - name: 'todos', - preload: async () => {} -}; -export { collection }; \ No newline at end of file +const collection = { name: 'todos', preload: async () => {} } +export { collection } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect.tsx index 943cdf189c..5965d04430 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('shared-with-side-effect.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-with-side-effect.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -console.log('registry created'); +const $$splitComponentImporter = () => + import('shared-with-side-effect.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-with-side-effect.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +console.log('registry created') export const Route = createFileRoute('/fx')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@component---errorComponent---notFoundComponent---pendingComponent.tsx index d953af00fa..3ede22c8be 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { registry } from "shared-with-side-effect.tsx?tsr-shared=1"; -const SplitComponent = () =>
{registry.size}
; -export { SplitComponent as component }; \ No newline at end of file +import { registry } from 'shared-with-side-effect.tsx?tsr-shared=1' +const SplitComponent = () =>
{registry.size}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@loader.tsx index a5f06a0a05..b3b404a8ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@loader.tsx @@ -1,5 +1,5 @@ -import { registry } from "shared-with-side-effect.tsx?tsr-shared=1"; +import { registry } from 'shared-with-side-effect.tsx?tsr-shared=1' const SplitLoader = async () => { - registry.set('loaded', true); -}; -export { SplitLoader as loader }; \ No newline at end of file + registry.set('loaded', true) +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@shared.tsx index f26c656fdd..a59298f9e0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@shared.tsx @@ -1,2 +1,2 @@ -const registry = new Map(); -export { registry }; \ No newline at end of file +const registry = new Map() +export { registry } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/undefined-literals.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/undefined-literals.tsx index 0c6e4f01aa..88b0bf1ba8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/undefined-literals.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/undefined-literals.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/undefined-test')({ component: undefined, errorComponent: undefined, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure.tsx index d0de09bf8b..b5b3ecade6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure.tsx @@ -1,5 +1,4 @@ import * as React from 'react' - import { CgCornerUpLeft, CgSpinner } from 'react-icons/cg' import { FaBolt, @@ -21,7 +20,6 @@ import { startProject } from '~/projects/start' import { createFileRoute } from '@tanstack/react-router' import { Framework, getBranch } from '~/projects' import { seo } from '~/utils/seo' - const menu = [ { label: ( @@ -72,31 +70,22 @@ const menu = [ to: `https://cottonbureau.com/people/tanstack`, }, ] - export const Route = createFileRoute('/_libraries/start/$version/')({ component: VersionIndex, meta: () => - seo({ - title: startProject.name, - description: startProject.description, - }), + seo({ title: startProject.name, description: startProject.description }), }) - const librariesRouteApi = getRouteApi('/_libraries') - export default function VersionIndex() { const { sponsorsPromise } = librariesRouteApi.useLoaderData() const { version } = Route.useParams() const branch = getBranch(startProject, version) const [framework, setFramework] = React.useState('react') const [isDark, setIsDark] = React.useState(true) - React.useEffect(() => { setIsDark(window.matchMedia?.(`(prefers-color-scheme: dark)`).matches) }, []) - const gradientText = `inline-block text-transparent bg-clip-text bg-gradient-to-r ${startProject.colorFrom} ${startProject.colorTo}` - return (
{item.label}
) - return (
{item.to.startsWith('http') ? ( @@ -269,7 +257,6 @@ Check it out at https://tanstack.com/start/`,
*/} - {/*

@@ -315,7 +302,6 @@ Check it out at https://tanstack.com/start/`, })}

*/} - {/*
Trusted in Production by @@ -358,7 +344,6 @@ Check it out at https://tanstack.com/start/`,
*/} -

Partners @@ -388,16 +373,13 @@ Check it out at https://tanstack.com/start/`,

-

Sponsors

-
@@ -429,7 +410,6 @@ Check it out at https://tanstack.com/start/`, rage-quit OSS. Yay money! 😉
- {/*

@@ -468,7 +448,6 @@ Check it out at https://tanstack.com/start/`,

*/} - {/* {[''].includes(framework) ? (
@@ -503,7 +482,6 @@ Check it out at https://tanstack.com/start/`, >
)} */} - {/*
Wow, you've come a long way! diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@component---errorComponent---notFoundComponent---pendingComponent.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@loader.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@loader.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using.tsx index c58f0f663b..811b66a9d3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using.tsx @@ -1,5 +1,5 @@ -const $$splitLoaderImporter = () => import('using.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => import('using.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' export const Route = createFileRoute({ - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using@loader.tsx index 7e4f4fde9b..3b60e73b8d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using@loader.tsx @@ -1,17 +1,9 @@ const DummyPostResource = (postId: string) => ({ - postData: { - id: postId, - title: 'dummy', - body: 'dummy' - }, - [Symbol.dispose]: () => console.log('disposing!') -}); -const SplitLoader = ({ - params: { - postId - } -}) => { - using dummyPost = DummyPostResource(postId); - return dummyPost.postData; -}; -export { SplitLoader as loader }; \ No newline at end of file + postData: { id: postId, title: 'dummy', body: 'dummy' }, + [Symbol.dispose]: () => console.log('disposing!'), +}) +const SplitLoader = ({ params: { postId } }) => { + using dummyPost = DummyPostResource(postId) + return dummyPost.postData +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function.tsx index 380087d43c..19dfb7e3ba 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx index 764043a59c..e2f2a1ccdb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,30 +1,34 @@ -import * as React from 'react'; -import { Link, Outlet } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; -import { Route } from "arrow-function.tsx"; +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { fetchPosts } from '../posts' +import { Route } from 'arrow-function.tsx' const PostsComponent = () => { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {[...posts, { - id: 'i-do-not-exist', - title: 'Non-existent Post' - }]?.map(post => { - return
  • - + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }]?.map( + (post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - })} + + ) + }, + )}

-
; -}; -const SplitLoader = fetchPosts; -export { SplitLoader as loader }; -export { PostsComponent as component }; \ No newline at end of file +
+ ) +} +const SplitLoader = fetchPosts +export { SplitLoader as loader } +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@errorComponent.tsx index 5f67a6fff1..371dc65868 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@errorComponent.tsx @@ -1 +1 @@ -import * as React from 'react'; \ No newline at end of file +import * as React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals.tsx index d3f54dd789..68fd7fc203 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals.tsx @@ -1,13 +1,14 @@ -const $$splitLoaderImporter = () => import('boolean-null-literals.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('boolean-null-literals.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/router'; - +const $$splitLoaderImporter = () => + import('boolean-null-literals.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('boolean-null-literals.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/router' // Test errorComponent with false literal export const Route = createFileRoute('/test')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), errorComponent: false, pendingComponent: null, - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals@component---loader---notFoundComponent---pendingComponent.tsx index 40973b0328..7133d0d77e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,7 +1,5 @@ // Test errorComponent with false literal -const SplitLoader = async () => ({ - data: 'test' -}); -export { SplitLoader as loader }; -const SplitComponent = () =>
Test Component
; -export { SplitComponent as component }; \ No newline at end of file +const SplitLoader = async () => ({ data: 'test' }) +export { SplitLoader as loader } +const SplitComponent = () =>
Test Component
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese.tsx index d08045e238..bfe965067d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese.tsx @@ -1,10 +1,11 @@ -const $$splitComponentImporter = () => import('chinese.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('chinese.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@component---loader---notFoundComponent---pendingComponent.tsx index 003ca944a1..2ac1fa54ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,23 +1,27 @@ -import * as React from 'react'; +import * as React from 'react' function HomeComponent() { - return
+ return ( +
-
; +
+ ) } interface DemoProps { - title: string; + title: string } -function Demo({ - title -}: DemoProps) { - return

+function Demo({ title }: DemoProps) { + return ( +

{title} -

; + + ) } -export { HomeComponent as component }; \ No newline at end of file +export { HomeComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@errorComponent.tsx index b4de370f4e..cbcea8cc40 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@errorComponent.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import * as React from 'react' interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function.tsx index fe221be964..819a4a9bf4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('circular-reference-arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('circular-reference-arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function@component---loader---notFoundComponent---pendingComponent.tsx index 39ace71ebe..59c5b5eec2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,19 +1,17 @@ function getComponentName(obj: Record): string { - return Object.keys(obj)[0]; + return Object.keys(obj)[0] } const App = () => { - const componentName = getComponentName({ - App - }); - return
+ const componentName = getComponentName({ App }) + return ( +
Component Name is {componentName} -
; -}; -function OtherComponent() { - const componentName = getComponentName({ - App - }); - return
App component name is {componentName}
; +
+ ) } -export { App as component }; \ No newline at end of file +function OtherComponent() { + const componentName = getComponentName({ App }) + return
App component name is {componentName}
+} +export { App as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function.tsx index 14d74d432d..d4a70c7341 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('circular-reference-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('circular-reference-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function@component---loader---notFoundComponent---pendingComponent.tsx index 96a753ad8a..22fbb8669f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,19 +1,17 @@ function getComponentName(obj: Record): string { - return Object.keys(obj)[0]; + return Object.keys(obj)[0] } function App() { - const componentName = getComponentName({ - App - }); - return
+ const componentName = getComponentName({ App }) + return ( +
Component Name is {componentName} -
; +
+ ) } function OtherComponent() { - const componentName = getComponentName({ - App - }); - return
App component name is {componentName}
; + const componentName = getComponentName({ App }) + return
App component name is {componentName}
} -export { App as component }; \ No newline at end of file +export { App as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties.tsx index dfb3b09c5e..3b956ec804 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('conditional-properties.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('conditional-properties.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('conditional-properties.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('conditional-properties.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties@component---loader---notFoundComponent---pendingComponent.tsx index 857b130de7..88dcc8e930 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,7 +1,7 @@ -import { isEnabled } from '@features/feature-flags'; -import TrueImport from '@modules/true-component'; -import { FalseComponent, falseLoader } from '@modules/false-component'; -const SplitLoader = isEnabled ? TrueImport.loader : falseLoader; -export { SplitLoader as loader }; -const SplitComponent = isEnabled ? TrueImport.Component : FalseComponent; -export { SplitComponent as component }; \ No newline at end of file +import { isEnabled } from '@features/feature-flags' +import TrueImport from '@modules/true-component' +import { FalseComponent, falseLoader } from '@modules/false-component' +const SplitLoader = isEnabled ? TrueImport.loader : falseLoader +export { SplitLoader as loader } +const SplitComponent = isEnabled ? TrueImport.Component : FalseComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple.tsx index 8b823166e4..e3c598b0b5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple.tsx @@ -1,15 +1,13 @@ -const $$splitComponentImporter = () => import('destructured-export-multiple.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export-multiple.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const getConfig = () => ({ baseUrl: 'https://api.example.com', - timeout: 5000 -}); -export const { - baseUrl, - timeout -} = getConfig(); -export const [first, second] = [1, 2]; + timeout: 5000, +}) +export const { baseUrl, timeout } = getConfig() +export const [first, second] = [1, 2] export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple@component---loader---notFoundComponent---pendingComponent.tsx index 9441b5a689..6a15a59c0a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,8 +1,10 @@ -import { baseUrl, timeout } from "destructured-export-multiple.tsx"; +import { baseUrl, timeout } from 'destructured-export-multiple.tsx' function AboutComponent() { - return
+ return ( +

Base URL: {baseUrl}

Timeout: {timeout}

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested.tsx index 5920a891c0..f1608ec6dd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested.tsx @@ -1,19 +1,16 @@ -const $$splitComponentImporter = () => import('destructured-export-nested.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export-nested.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' const getConfig = () => ({ - api: { - baseUrl: 'https://api.example.com' - }, + api: { baseUrl: 'https://api.example.com' }, timeout: 5000, - extra: 'data' -}); + extra: 'data', +}) export const { - api: { - baseUrl - }, + api: { baseUrl }, ...rest -} = getConfig(); +} = getConfig() export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested@component---loader---notFoundComponent---pendingComponent.tsx index 8ba46e33e1..9bc538525f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,7 +1,9 @@ -import { baseUrl } from "destructured-export-nested.tsx"; +import { baseUrl } from 'destructured-export-nested.tsx' function AboutComponent() { - return
+ return ( +

Base URL: {baseUrl}

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export.tsx index f573764824..397c6400f5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export.tsx @@ -1,17 +1,11 @@ -const $$splitComponentImporter = () => import('destructured-export.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; + return { getObject: () => ({ constA: 10, constB: 5 }) } } -export const { - getObject -} = getObjectCallback(); +export const { getObject } = getObjectCallback() export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@component---loader---notFoundComponent---pendingComponent.tsx index f58942d5af..b0abbd2e6e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,14 +1,11 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; + return { getObject: () => ({ constA: 10, constB: 5 }) } } function AboutComponent() { - return
+ return ( +

About

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@errorComponent.tsx index 45fb19eecd..024e0e620e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@errorComponent.tsx @@ -1,8 +1,3 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; -} \ No newline at end of file + return { getObject: () => ({ constA: 10, constB: 5 }) } +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component.tsx index 1776055cc2..b8053fff9e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('destructured-react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('destructured-react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('destructured-react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('destructured-react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx index 931bed75b4..66f97a20d0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,9 +1,9 @@ -import { memo } from 'react'; -import { importedLoader } from '../../shared/imported'; +import { memo } from 'react' +import { importedLoader } from '../../shared/imported' function Component() { - return
Component
; + return
Component
} -const SplitLoader = importedLoader; -export { SplitLoader as loader }; -const SplitComponent = memo(Component); -export { SplitComponent as component }; \ No newline at end of file +const SplitLoader = importedLoader +export { SplitLoader as loader } +const SplitComponent = memo(Component) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults.tsx index 6cac408c56..636e017a64 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('destructured-route-options-defaults.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('destructured-route-options-defaults.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('destructured-route-options-defaults.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('destructured-route-options-defaults.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/about')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults@component---loader---notFoundComponent---pendingComponent.tsx index 2f8ef91c49..ae1cd17853 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,23 +1,17 @@ function defaultLoader() { - return { - message: 'default' - }; + return { message: 'default' } } function DefaultComponent() { - return
Default
; + return
Default
} const createBits = () => ({ component: ActualComponent, - loader: () => ({ - message: 'hello' - }) -}); -const { - component: MyComponent = DefaultComponent, - loader = defaultLoader -} = createBits(); + loader: () => ({ message: 'hello' }), +}) +const { component: MyComponent = DefaultComponent, loader = defaultLoader } = + createBits() function ActualComponent() { - return
About
; + return
About
} -export { loader }; -export { MyComponent as component }; \ No newline at end of file +export { loader } +export { MyComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring.tsx index d80f17484f..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring.tsx @@ -1,11 +1,9 @@ import thing from 'thing' - export function test() { const { foo: { bar: { destructured }, }, } = thing - return destructured } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@component---loader---notFoundComponent---pendingComponent.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@errorComponent.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@errorComponent.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue.tsx index 178bec9bf7..b807ba9283 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue.tsx @@ -1,8 +1,8 @@ -'use client'; - -const $$splitComponentImporter = () => import('directive-prologue.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +'use client' +const $$splitComponentImporter = () => + import('directive-prologue.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/directive')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue@component---loader---notFoundComponent---pendingComponent.tsx index ce7cd5e5ee..9ee4bd8f4c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,6 +1,5 @@ -'use client'; - +'use client' const SplitComponent = () => { - return
directive preserved
; -}; -export { SplitComponent as component }; \ No newline at end of file + return
directive preserved
+} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component.tsx index 4fdd9d1c68..8109a89624 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component.tsx @@ -1,6 +1,3 @@ import React from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ - component: undefined, -}) +export const Route = createFileRoute('/')({ component: undefined }) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@component---loader---notFoundComponent---pendingComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@errorComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@errorComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound.tsx index a3e020c559..534529220a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound.tsx @@ -1,15 +1,23 @@ -console.warn("[tanstack-router] These exports from \"export-default-component-and-normal-notFound.tsx\" will not be code-split and will increase your bundle size:\n- Home\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitNotFoundComponentImporter = () => import('export-default-component-and-normal-notFound.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import React, { useState } from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +console.warn( + '[tanstack-router] These exports from "export-default-component-and-normal-notFound.tsx" will not be code-split and will increase your bundle size:\n- Home\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitNotFoundComponentImporter = () => + import('export-default-component-and-normal-notFound.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import React, { useState } from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/home')({ component: Home, - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); + notFoundComponent: lazyRouteComponent( + $$splitNotFoundComponentImporter, + 'notFoundComponent', + ), +}) export default function Home() { - const [one, setOne] = useState('this is from a state'); - return
+ const [one, setOne] = useState('this is from a state') + return ( +

{one}

-
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@component---loader---notFoundComponent---pendingComponent.tsx index 62cd0a1036..3da924c04c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import React from 'react'; +import React from 'react' function NotFoundComponent() { - return
Not Found
; + return
Not Found
} -export { NotFoundComponent as notFoundComponent }; \ No newline at end of file +export { NotFoundComponent as notFoundComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@errorComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@errorComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component.tsx index c5198b9e00..de2d748c91 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component.tsx @@ -1,13 +1,8 @@ import React, { useState } from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/home')({ - component: Home, -}) - +export const Route = createFileRoute('/home')({ component: Home }) export default function Home() { const [one, setOne] = useState('this is from a state') - return (

{one}

diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@component---loader---notFoundComponent---pendingComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@errorComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@errorComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter.tsx index 3ae9710cd5..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter.tsx @@ -1,29 +1,20 @@ import * as React from 'react' // @ts-expect-error import { useMemo } from 'tan-react' - const useUsedVar = 'i-am-unused' - const ReactUseMemoCall1 = React.useMemo(function performAction() { return 'true' }, []) - console.info(ReactUseMemoCall1) - const ReactUseMemoCall2 = React.useMemo(() => { return 'true' }, []) - console.info(ReactUseMemoCall2) - const UseMemoCall1 = useMemo(function performAction() { return 'true' }, []) - console.info(UseMemoCall1) - const UseMemoCall2 = useMemo(() => { return 'true' }, []) - console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@component---loader---notFoundComponent---pendingComponent.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@errorComponent.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@errorComponent.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration.tsx index 6076420598..bdef68ad2d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@component---loader---notFoundComponent---pendingComponent.tsx index d453767c20..5289c0c3c4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,30 +1,34 @@ -import * as React from 'react'; -import { Link, Outlet } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; -import { Route } from "function-declaration.tsx"; +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { fetchPosts } from '../posts' +import { Route } from 'function-declaration.tsx' function PostsComponent() { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {[...posts, { - id: 'i-do-not-exist', - title: 'Non-existent Post' - }]?.map(post => { - return
  • - + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }]?.map( + (post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - })} + + ) + }, + )}

-
; +
+ ) } -const SplitLoader = fetchPosts; -export { SplitLoader as loader }; -export { PostsComponent as component }; \ No newline at end of file +const SplitLoader = fetchPosts +export { SplitLoader as loader } +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@errorComponent.tsx index 5f67a6fff1..371dc65868 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@errorComponent.tsx @@ -1 +1 @@ -import * as React from 'react'; \ No newline at end of file +import * as React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute.tsx index cec0324adf..f336e2ff0f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('importAttribute.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('importAttribute.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute@component---loader---notFoundComponent---pendingComponent.tsx index f34d3c6408..88abef0c00 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { test } from './test' with { type: 'macro' }; -const SplitComponent = () => test; -export { SplitComponent as component }; \ No newline at end of file +import { test } from './test' with { type: 'macro' } +const SplitComponent = () => test +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader.tsx index d79c8e0f32..d7c5699549 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('imported-default-component-destructured-loader.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('imported-default-component-destructured-loader.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('imported-default-component-destructured-loader.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('imported-default-component-destructured-loader.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader@component---loader---notFoundComponent---pendingComponent.tsx index d4fc40141e..b7ed94da4a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import importedComponent, { importedLoader } from '../../shared/imported'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; -const SplitComponent = importedComponent; -export { SplitComponent as component }; \ No newline at end of file +import importedComponent, { importedLoader } from '../../shared/imported' +const SplitLoader = importedLoader +export { SplitLoader as loader } +const SplitComponent = importedComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component.tsx index c165f65262..81ec753301 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('imported-default-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('imported-default-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component@component---loader---notFoundComponent---pendingComponent.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent.tsx index 4152c9af17..e2179478b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent.tsx @@ -1,8 +1,13 @@ -const $$splitErrorComponentImporter = () => import('imported-errorComponent.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('imported-errorComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitErrorComponentImporter = () => + import('imported-errorComponent.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('imported-errorComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@component---loader---notFoundComponent---pendingComponent.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@errorComponent.tsx index 7a8654fb94..3f20c3e485 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@errorComponent.tsx @@ -1,3 +1,3 @@ -import { importedErrorComponent } from '../../shared/imported'; -const SplitErrorComponent = importedErrorComponent; -export { SplitErrorComponent as errorComponent }; \ No newline at end of file +import { importedErrorComponent } from '../../shared/imported' +const SplitErrorComponent = importedErrorComponent +export { SplitErrorComponent as errorComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent.tsx index 584c829f37..31812e1e44 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent.tsx @@ -1,8 +1,13 @@ -const $$splitNotFoundComponentImporter = () => import('imported-notFoundComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('imported-notFoundComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitNotFoundComponentImporter = () => + import('imported-notFoundComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('imported-notFoundComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); \ No newline at end of file + notFoundComponent: lazyRouteComponent( + $$splitNotFoundComponentImporter, + 'notFoundComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent@component---loader---notFoundComponent---pendingComponent.tsx index 1273c7c50d..9f904a1a19 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,7 @@ -import ImportedDefaultComponent, { importedNotFoundComponent } from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; -const SplitNotFoundComponent = importedNotFoundComponent; -export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file +import ImportedDefaultComponent, { + importedNotFoundComponent, +} from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } +const SplitNotFoundComponent = importedNotFoundComponent +export { SplitNotFoundComponent as notFoundComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent.tsx index 1be3f8071b..0996abeb6c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent.tsx @@ -1,8 +1,13 @@ -const $$splitPendingComponentImporter = () => import('imported-pendingComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('imported-pendingComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitPendingComponentImporter = () => + import('imported-pendingComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('imported-pendingComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent') -}); \ No newline at end of file + pendingComponent: lazyRouteComponent( + $$splitPendingComponentImporter, + 'pendingComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent@component---loader---notFoundComponent---pendingComponent.tsx index 0368000afa..d24c7b1505 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,7 @@ -import ImportedDefaultComponent, { importedPendingComponent } from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; -const SplitPendingComponent = importedPendingComponent; -export { SplitPendingComponent as pendingComponent }; \ No newline at end of file +import ImportedDefaultComponent, { + importedPendingComponent, +} from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } +const SplitPendingComponent = importedPendingComponent +export { SplitPendingComponent as pendingComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported.tsx index 14356133d6..75c54f18ad 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('imported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('imported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('imported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('imported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported@component---loader---notFoundComponent---pendingComponent.tsx index ecc588688b..1c4d3e909b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import { importedComponent, importedLoader } from '../../shared'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; -const SplitComponent = importedComponent; -export { SplitComponent as component }; \ No newline at end of file +import { importedComponent, importedLoader } from '../../shared' +const SplitLoader = importedLoader +export { SplitLoader as loader } +const SplitComponent = importedComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline.tsx index 3e2ea1f1c2..fbc7185a17 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('inline.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('inline.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -Route.addChildren([]); -export const test = 'test'; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +Route.addChildren([]) +export const test = 'test' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@component---loader---notFoundComponent---pendingComponent.tsx index 58ccfb2903..d28b872634 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,18 +1,18 @@ -import * as React from 'react'; -import * as styles from '../style.css'; -import { TEST_DATA } from '../test.const'; -const Button = (props: { - children: any; -}) => { - return ; -}; -import { Route } from "inline.tsx"; -import { test } from "inline.tsx"; +import * as React from 'react' +import * as styles from '../style.css' +import { TEST_DATA } from '../test.const' +const Button = (props: { children: any }) => { + return +} +import { Route } from 'inline.tsx' +import { test } from 'inline.tsx' const SplitComponent = () => { - return
- {test} -

{TEST_DATA.welcome}

- -
; -}; -export { SplitComponent as component }; \ No newline at end of file + return ( +
+ {test} +

{TEST_DATA.welcome}

+ +
+ ) +} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@errorComponent.tsx index 9236af6021..23fab71edc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -import { Route } from "inline.tsx"; \ No newline at end of file +import * as React from 'react' +import { Route } from 'inline.tsx' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration.tsx index 574c6d4c2b..55c51e878b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration.tsx @@ -1,10 +1,19 @@ -const $$splitErrorComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=errorComponent'); -const $$splitPendingComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitErrorComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=errorComponent') +const $$splitPendingComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + pendingComponent: lazyRouteComponent( + $$splitPendingComponentImporter, + 'pendingComponent', + ), + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@component---loader---notFoundComponent---pendingComponent.tsx index 382621ea9a..3b432397b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,8 +1,8 @@ function component() { - return
lowercase function declaration
; + return
lowercase function declaration
} function pendingComponent() { - return
lowercase pending function declaration
; + return
lowercase pending function declaration
} -export { component }; -export { pendingComponent }; \ No newline at end of file +export { component } +export { pendingComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@errorComponent.tsx index acc1c0be8d..9d411c1f0f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@errorComponent.tsx @@ -1,4 +1,4 @@ function errorComponent() { - return
lowercase error function declaration
; + return
lowercase error function declaration
} -export { errorComponent }; \ No newline at end of file +export { errorComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number.tsx index 5b4cfaaa9b..602ff5c117 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number.tsx @@ -1,28 +1,42 @@ -const $$splitComponentImporter = () => import('random-number.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('random-number.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { Await, Link, createFileRoute } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -export const textColors = [`text-rose-500`, `text-yellow-500`, `text-teal-500`, `text-blue-500`]; -export const gradients = [`from-rose-500 to-yellow-500`, `from-yellow-500 to-teal-500`, `from-teal-500 to-violet-500`, `from-blue-500 to-pink-500`]; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; +const $$splitComponentImporter = () => + import('random-number.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('random-number.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { Await, Link, createFileRoute } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +export const textColors = [ + `text-rose-500`, + `text-yellow-500`, + `text-teal-500`, + `text-blue-500`, +] +export const gradients = [ + `from-rose-500 to-yellow-500`, + `from-yellow-500 to-teal-500`, + `from-teal-500 to-violet-500`, + `from-blue-500 to-pink-500`, +] +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] export const Route = createFileRoute('/')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@component---loader---notFoundComponent---pendingComponent.tsx index c133e05d9e..37649d8606 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,69 +1,56 @@ -import { Await, Link, defer } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import { getSponsorsForSponsorPack } from '~/server/sponsors'; -import discordImage from '~/images/discord-logo-white.svg'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -import { useMutation } from '~/hooks/useMutation'; -import { sample } from '~/utils/utils'; -import { textColors } from "random-number.tsx"; -import { gradients } from "random-number.tsx"; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; -import { Route } from "random-number.tsx"; -async function bytesSignupServerFn({ - email -}: { - email: string; -}) { - 'use server'; - +import { Await, Link, defer } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import { getSponsorsForSponsorPack } from '~/server/sponsors' +import discordImage from '~/images/discord-logo-white.svg' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +import { useMutation } from '~/hooks/useMutation' +import { sample } from '~/utils/utils' +import { textColors } from 'random-number.tsx' +import { gradients } from 'random-number.tsx' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] +import { Route } from 'random-number.tsx' +async function bytesSignupServerFn({ email }: { email: string }) { + 'use server' return fetch(`https://bytes.dev/api/bytes-optin-cors`, { method: 'POST', - body: JSON.stringify({ - email, - influencer: 'tanstack' - }), - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json' - } - }); + body: JSON.stringify({ email, influencer: 'tanstack' }), + headers: { Accept: 'application/json', 'Content-Type': 'application/json' }, + }) } function Index() { - const bytesSignupMutation = useMutation({ - fn: bytesSignupServerFn - }); - const { - sponsorsPromise, - randomNumber, - testing2 - } = Route.useLoaderData(); - const gradient = sample(gradients, randomNumber); - const textColor = sample(textColors, randomNumber); - return <> + const bytesSignupMutation = useMutation({ fn: bytesSignupServerFn }) + const { sponsorsPromise, randomNumber, testing2 } = Route.useLoaderData() + const gradient = sample(gradients, randomNumber) + const textColor = sample(textColors, randomNumber) + return ( + <> {discordImage} {gradient} {textColor} - ; + + ) } const SplitLoader = () => { return { randomNumber: Math.random(), - sponsorsPromise: defer(getSponsorsForSponsorPack()) - }; -}; -export { SplitLoader as loader }; -export { Index as component }; \ No newline at end of file + sponsorsPromise: defer(getSponsorsForSponsorPack()), + } +} +export { SplitLoader as loader } +export { Index as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@errorComponent.tsx index cdf4d37891..8e156eca17 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@errorComponent.tsx @@ -1,18 +1,20 @@ -import { Await, Link } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; \ No newline at end of file +import { Await, Link } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component.tsx index 568c8dc323..9f605effce 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('react-memo-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('react-memo-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('react-memo-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('react-memo-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component@component---loader---notFoundComponent---pendingComponent.tsx index 70d8b0eb42..7c2c8e17de 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,9 +1,9 @@ -import React from 'react'; -import { importedLoader } from '../../shared/imported'; +import React from 'react' +import { importedLoader } from '../../shared/imported' function Component() { - return
Component
; + return
Component
} -const SplitLoader = importedLoader; -export { SplitLoader as loader }; -const SplitComponent = React.memo(Component); -export { SplitComponent as component }; \ No newline at end of file +const SplitLoader = importedLoader +export { SplitLoader as loader } +const SplitComponent = React.memo(Component) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component.tsx index 233eca72a0..7e9467be1b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx index d2671013ef..83e6e4b28c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,6 +1,6 @@ -import React from 'react'; -import { importedLoader, importedComponent } from '../../shared/imported'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; -const SplitComponent = React.memo(importedComponent); -export { SplitComponent as component }; \ No newline at end of file +import React from 'react' +import { importedLoader, importedComponent } from '../../shared/imported' +const SplitLoader = importedLoader +export { SplitLoader as loader } +const SplitComponent = React.memo(importedComponent) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component.tsx index 1b00751ae6..4f14db0832 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component.tsx @@ -1,14 +1,16 @@ -console.warn("[tanstack-router] These exports from \"retain-export-component.tsx\" will not be code-split and will increase your bundle size:\n- Layout\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitLoaderImporter = () => import('retain-export-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute, Outlet } from '@tanstack/react-router'; -import { importedComponent as ImportedComponent } from '../../shared/imported'; +console.warn( + '[tanstack-router] These exports from "retain-export-component.tsx" will not be code-split and will increase your bundle size:\n- Layout\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitLoaderImporter = () => + import('retain-export-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute, Outlet } from '@tanstack/react-router' +import { importedComponent as ImportedComponent } from '../../shared/imported' export function Layout() { - return
-
+ return ( +
+
-
; +
+ ) } export const Route = createFileRoute('/_layout')({ component: Layout, - loader: lazyFn($$splitLoaderImporter, 'loader') -}); -const HEADER_HEIGHT = '63px'; -export const SIDEBAR_WIDTH = '150px'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) +const HEADER_HEIGHT = '63px' +export const SIDEBAR_WIDTH = '150px' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@component---loader---notFoundComponent---pendingComponent.tsx index 9787e27ad7..ddeb4d1e6f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,6 +1,6 @@ -import * as React from 'react'; -import { importedLoader } from '../../shared/imported'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import * as React from 'react' +import { importedLoader } from '../../shared/imported' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@errorComponent.tsx index 5bb0ab5451..8fb12f0c6b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@errorComponent.tsx @@ -1,3 +1,3 @@ -import * as React from 'react'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const.tsx index f256b01a83..d674dbb799 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const.tsx @@ -4,11 +4,9 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export const loaderFn = () => { return importedLoader() } - const Layout = () => { return (
@@ -26,15 +24,12 @@ const Layout = () => {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: loaderFn, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' export const SIDEBAR_MINI_WIDTH = '80px' const ASIDE_WIDTH = '250px' - export default Layout diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@component---loader---notFoundComponent---pendingComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@errorComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured.tsx index 0e3175116f..89c23305a0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured.tsx @@ -1,18 +1,12 @@ import { createFileRoute } from '@tanstack/react-router' - const createBits = () => ({ component: AboutComponentImpl, - loader: () => ({ - message: 'hello', - }), + loader: () => ({ message: 'hello' }), }) - export const { component: AboutComponent, loader } = createBits() - function AboutComponentImpl() { return
About
} - export const Route = createFileRoute('/about')({ component: AboutComponent, loader, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured@component---loader---notFoundComponent---pendingComponent.tsx index 43108700f5..c3ddde13a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured@component---loader---notFoundComponent---pendingComponent.tsx @@ -1 +1 @@ -export { SplitLoader as loader }; \ No newline at end of file +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function.tsx index 298c388e65..83b3dd4eb5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function.tsx @@ -4,11 +4,9 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export function loaderFn() { return importedLoader() } - function Layout() { return (
@@ -26,15 +24,12 @@ function Layout() {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: loaderFn, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' export const SIDEBAR_MINI_WIDTH = '80px' const ASIDE_WIDTH = '250px' - export default Layout diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@component---loader---notFoundComponent---pendingComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@errorComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader.tsx index b36cbc6be2..e805842e0c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader.tsx @@ -1,17 +1,18 @@ -console.warn("[tanstack-router] These exports from \"retain-exports-loader.tsx\" will not be code-split and will increase your bundle size:\n- loaderFn\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitComponentImporter = () => import('retain-exports-loader.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +console.warn( + '[tanstack-router] These exports from "retain-exports-loader.tsx" will not be code-split and will increase your bundle size:\n- loaderFn\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitComponentImporter = () => + import('retain-exports-loader.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export function loaderFn() { - return { - foo: 'bar' - }; + return { foo: 'bar' } } export const Route = createFileRoute('/_layout')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: loaderFn -}); -export const SIDEBAR_WIDTH = '150px'; -export const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file + loader: loaderFn, +}) +export const SIDEBAR_WIDTH = '150px' +export const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@component---loader---notFoundComponent---pendingComponent.tsx index 9f54ae0dc5..604be4dc69 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,11 +1,10 @@ -import * as React from 'react'; -import { Outlet } from '@tanstack/react-router'; -import { importedComponent as ImportedComponent } from '../../shared/imported'; +import * as React from 'react' +import { Outlet } from '@tanstack/react-router' +import { importedComponent as ImportedComponent } from '../../shared/imported' function Layout() { - return
-
+ return ( +
+
-
; +
+ ) } -const HEADER_HEIGHT = '63px'; -const ASIDE_WIDTH = '250px'; -export { Layout as component }; \ No newline at end of file +const HEADER_HEIGHT = '63px' +const ASIDE_WIDTH = '250px' +export { Layout as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@errorComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class.tsx index 48afc3f070..c9bffc92ba 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class.tsx @@ -1,18 +1,20 @@ -const $$splitComponentImporter = () => import('shared-class.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-class.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-class.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-class.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' class DataStore { - data = new Map(); + data = new Map() get(k: string) { - return this.data.get(k); + return this.data.get(k) } set(k: string, v: unknown) { - this.data.set(k, v); + this.data.set(k, v) } } export const Route = createFileRoute('/store')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@component---loader---notFoundComponent---pendingComponent.tsx index 10675b99ed..39593e61e0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,16 +1,16 @@ class DataStore { - data = new Map(); + data = new Map() get(k: string) { - return this.data.get(k); + return this.data.get(k) } set(k: string, v: unknown) { - this.data.set(k, v); + this.data.set(k, v) } } -const store = new DataStore(); +const store = new DataStore() const SplitLoader = async () => { - store.set('items', await fetch('/api')); -}; -export { SplitLoader as loader }; -const SplitComponent = () =>
{store.get('items')}
; -export { SplitComponent as component }; \ No newline at end of file + store.set('items', await fetch('/api')) +} +export { SplitLoader as loader } +const SplitComponent = () =>
{store.get('items')}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@errorComponent.tsx index 0a50638c6a..31a1763b5d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@errorComponent.tsx @@ -1,9 +1,9 @@ class DataStore { - data = new Map(); + data = new Map() get(k: string) { - return this.data.get(k); + return this.data.get(k) } set(k: string, v: unknown) { - this.data.set(k, v); + this.data.set(k, v) } -} \ No newline at end of file +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export.tsx index 73f1b54389..6b770a1cf2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export.tsx @@ -1,19 +1,15 @@ -const $$splitComponentImporter = () => import('shared-destructured-export.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-destructured-export.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -export const { - apiUrl, - timeout -} = getConfig(); +const $$splitComponentImporter = () => + import('shared-destructured-export.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-destructured-export.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +export const { apiUrl, timeout } = getConfig() export const Route = createFileRoute('/config')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) function getConfig() { - return { - apiUrl: '/api', - timeout: 5000 - }; -} \ No newline at end of file + return { apiUrl: '/api', timeout: 5000 } +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export@component---loader---notFoundComponent---pendingComponent.tsx index d48accf910..68114df748 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import { apiUrl, timeout } from "shared-destructured-export.tsx"; -const SplitLoader = async () => fetch(apiUrl); -export { SplitLoader as loader }; -const SplitComponent = () =>
Timeout: {timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { apiUrl, timeout } from 'shared-destructured-export.tsx' +const SplitLoader = async () => fetch(apiUrl) +export { SplitLoader as loader } +const SplitComponent = () =>
Timeout: {timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured.tsx index fbc4272c3e..78bf0b8ceb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-destructured.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-destructured.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-destructured.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-destructured.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/config')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured@component---loader---notFoundComponent---pendingComponent.tsx index e92f7dd7f8..a5c9439324 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,14 +1,8 @@ -const { - apiUrl, - timeout -} = getConfig(); +const { apiUrl, timeout } = getConfig() function getConfig() { - return { - apiUrl: '/api', - timeout: 5000 - }; + return { apiUrl: '/api', timeout: 5000 } } -const SplitLoader = async () => fetch(apiUrl); -export { SplitLoader as loader }; -const SplitComponent = () =>
Timeout: {timeout}
; -export { SplitComponent as component }; \ No newline at end of file +const SplitLoader = async () => fetch(apiUrl) +export { SplitLoader as loader } +const SplitComponent = () =>
Timeout: {timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported.tsx index 76a5d29dc3..887f52978d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported.tsx @@ -1,13 +1,12 @@ -const $$splitComponentImporter = () => import('shared-exported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-exported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -export const queryOptions = { - staleTime: 5000, - gcTime: 10000 -}; +const $$splitComponentImporter = () => + import('shared-exported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-exported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +export const queryOptions = { staleTime: 5000, gcTime: 10000 } export const Route = createFileRoute('/query')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported@component---loader---notFoundComponent---pendingComponent.tsx index f77f81cbdb..f2a32be2bc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,9 +1,7 @@ -import { queryOptions } from "shared-exported.tsx"; +import { queryOptions } from 'shared-exported.tsx' const SplitLoader = async () => { - return { - staleTime: queryOptions.staleTime - }; -}; -export { SplitLoader as loader }; -const SplitComponent = () =>
GC: {queryOptions.gcTime}
; -export { SplitComponent as component }; \ No newline at end of file + return { staleTime: queryOptions.staleTime } +} +export { SplitLoader as loader } +const SplitComponent = () =>
GC: {queryOptions.gcTime}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function.tsx index 8a921d9640..b964d09962 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/cached')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function@component---loader---notFoundComponent---pendingComponent.tsx index cfe519f47a..0f4a23b3fe 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,14 +1,14 @@ -const cache = new Map(); +const cache = new Map() function getCached(key: string) { - return cache.get(key); + return cache.get(key) } function setCached(key: string, val: unknown) { - cache.set(key, val); + cache.set(key, val) } const SplitLoader = async () => { - setCached('data', await fetch('/api').then(r => r.json())); - return getCached('data'); -}; -export { SplitLoader as loader }; -const SplitComponent = () =>
{JSON.stringify(getCached('data'))}
; -export { SplitComponent as component }; \ No newline at end of file + setCached('data', await fetch('/api').then((r) => r.json())) + return getCached('data') +} +export { SplitLoader as loader } +const SplitComponent = () =>
{JSON.stringify(getCached('data'))}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding.tsx index feb46cd789..71082ac702 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-imported-binding.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-imported-binding.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-imported-binding.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-imported-binding.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/imported')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding@component---loader---notFoundComponent---pendingComponent.tsx index 409e8d4023..7718cec94c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import { sharedUtil } from '../utils'; -const SplitLoader = async () => sharedUtil('load'); -export { SplitLoader as loader }; -const SplitComponent = () =>
{sharedUtil('render')}
; -export { SplitComponent as component }; \ No newline at end of file +import { sharedUtil } from '../utils' +const SplitLoader = async () => sharedUtil('load') +export { SplitLoader as loader } +const SplitComponent = () =>
{sharedUtil('render')}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref.tsx index 4275e17e58..913fae8432 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-indirect-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-indirect-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-indirect-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-indirect-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/shared-indirect')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref@component---loader---notFoundComponent---pendingComponent.tsx index 090f3b5c73..90815572f7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,19 +1,17 @@ -const state = { - count: 0 -}; +const state = { count: 0 } function getCount() { - return state.count; + return state.count } function SharedComponent() { - return
+ return ( +
{getCount()} - {state.count} -
; +
+ ) } const SplitLoader = () => { - state.count++; - return { - count: getCount() - }; -}; -export { SplitLoader as loader }; -export { SharedComponent as component }; \ No newline at end of file + state.count++ + return { count: getCount() } +} +export { SplitLoader as loader } +export { SharedComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref.tsx index 130c7ce120..7d5cff0d5f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('shared-jsx-component-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-jsx-component-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-jsx-component-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-jsx-component-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' // @ts-nocheck -import { createFileRoute } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/jsx')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref@component---loader---notFoundComponent---pendingComponent.tsx index c5fd18664e..82b634246f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,9 +1,8 @@ // @ts-nocheck - -const shared = 1; +const shared = 1 function SharedComponent() { - return
{shared}
; + return
{shared}
} -const SplitLoader = () => shared; -export { SplitLoader as loader }; -export { SharedComponent as component }; \ No newline at end of file +const SplitLoader = () => shared +export { SplitLoader as loader } +export { SharedComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none.tsx index eac0f9ab0a..1dd8f7bb0a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-none.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-none.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-none.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-none.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/clean')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none@component---loader---notFoundComponent---pendingComponent.tsx index f9f52ba6be..9f1d1a5ca1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,8 +1,10 @@ -const loaderHelper = () => fetch('/api'); -const ComponentHelper = () => helper; -const SplitLoader = async () => loaderHelper(); -export { SplitLoader as loader }; -const SplitComponent = () =>
- -
; -export { SplitComponent as component }; \ No newline at end of file +const loaderHelper = () => fetch('/api') +const ComponentHelper = () => helper +const SplitLoader = async () => loaderHelper() +export { SplitLoader as loader } +const SplitComponent = () => ( +
+ +
+) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route.tsx index 9aebb45a95..f51ed0c13a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-referencing-route.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-referencing-route.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-referencing-route.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-referencing-route.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/about')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route@component---loader---notFoundComponent---pendingComponent.tsx index 9bcd130ea8..da98398ae1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,17 +1,15 @@ -const HEADER = 'Page'; +const HEADER = 'Page' function usePageTitle() { - return `${HEADER} - ${Route.fullPath}`; + return `${HEADER} - ${Route.fullPath}` } -import { Route } from "shared-referencing-route.tsx"; +import { Route } from 'shared-referencing-route.tsx' const SplitLoader = async () => { - const title = usePageTitle(); - return { - title - }; -}; -export { SplitLoader as loader }; + const title = usePageTitle() + return { title } +} +export { SplitLoader as loader } const SplitComponent = () => { - const title = usePageTitle(); - return
{title}
; -}; -export { SplitComponent as component }; \ No newline at end of file + const title = usePageTitle() + return
{title}
+} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime.tsx index d88eff9d9b..fdc18fa37b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime.tsx @@ -1,22 +1,20 @@ -import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-runtime.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-runtime.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -console.log('shared-runtime:reference'); +import { state, createState, createSeed } from 'shared-runtime.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-runtime.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-runtime.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +console.log('shared-runtime:reference') export const Route = createFileRoute('/shared-runtime')({ beforeLoad: () => state, loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@component---loader---notFoundComponent---pendingComponent.tsx index 0af87c21c5..053cf24d5a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,28 +1,30 @@ -import { state, createState, createSeed, Labels, increment } from "shared-runtime.tsx?tsr-shared=1"; -const label = createComponentLabel(); -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -function createComponentLabel() { - console.log('shared-runtime:component'); - return Labels.component; +import { + state, + createState, + createSeed, + Labels, + increment, +} from 'shared-runtime.tsx?tsr-shared=1' +const label = createComponentLabel() +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number } -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; +function createComponentLabel() { + console.log('shared-runtime:component') + return Labels.component +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed const SplitLoader = () => { - increment(); - return state; -}; -export { SplitLoader as loader }; + increment() + return state +} +export { SplitLoader as loader } const SplitComponent = () => { if (state.count === 3) { - throw new Error('route source-map contract'); + throw new Error('route source-map contract') } - return `${label}:${state.count}`; -}; -export { SplitComponent as component }; \ No newline at end of file + return `${label}:${state.count}` +} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@errorComponent.tsx index d890a562c9..03cacac5b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@errorComponent.tsx @@ -1,11 +1,7 @@ -import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; \ No newline at end of file +import { state, createState, createSeed } from 'shared-runtime.tsx?tsr-shared=1' +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@shared.tsx index 54239b6cc5..c53a7e1568 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@shared.tsx @@ -1,28 +1,13 @@ -const Count = { - Initial: 0 -}; -const Labels = { - component: 'count' -}; -const seed = createSeed(); -const { - state, - increment -} = createState(seed); +const Count = { Initial: 0 } +const Labels = { component: 'count' } +const seed = createSeed() +const { state, increment } = createState(seed) function createSeed() { - console.log('shared-runtime:seed'); - return { - count: Count.Initial, - label: Labels.component - }; + console.log('shared-runtime:seed') + return { count: Count.Initial, label: Labels.component } } -function createState(initialState: { - count: number; -}) { - console.log('shared-runtime:state'); - return { - state: initialState, - increment: () => initialState.count++ - }; +function createState(initialState: { count: number }) { + console.log('shared-runtime:state') + return { state: initialState, increment: () => initialState.count++ } } -export { Count, createSeed, createState, increment, Labels, seed, state }; \ No newline at end of file +export { Count, createSeed, createState, increment, Labels, seed, state } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive.tsx index 67b0631b8e..552cd657e0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-transitive.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-transitive.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-transitive.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-transitive.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/api')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive@component---loader---notFoundComponent---pendingComponent.tsx index 662d7fd7aa..c67ed3c691 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,12 +1,9 @@ -const BASE_URL = 'https://api.example.com'; -const config = { - url: BASE_URL, - timeout: 5000 -}; -const fetcher = (path: string) => fetch(`${config.url}${path}`); +const BASE_URL = 'https://api.example.com' +const config = { url: BASE_URL, timeout: 5000 } +const fetcher = (path: string) => fetch(`${config.url}${path}`) const SplitLoader = async () => { - return fetcher('/data'); -}; -export { SplitLoader as loader }; -const SplitComponent = () =>
Timeout: {config.timeout}
; -export { SplitComponent as component }; \ No newline at end of file + return fetcher('/data') +} +export { SplitLoader as loader } +const SplitComponent = () =>
Timeout: {config.timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable.tsx index 48cdad100e..191b12aa33 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-variable.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-variable.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-variable.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-variable.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/todos')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable@component---loader---notFoundComponent---pendingComponent.tsx index daca782a6f..e96ced1955 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,13 +1,8 @@ -const collection = { - name: 'todos', - preload: async () => {} -}; +const collection = { name: 'todos', preload: async () => {} } const SplitLoader = async () => { - await collection.preload(); - return { - data: 'loaded' - }; -}; -export { SplitLoader as loader }; -const SplitComponent = () =>
{collection.name}
; -export { SplitComponent as component }; \ No newline at end of file + await collection.preload() + return { data: 'loaded' } +} +export { SplitLoader as loader } +const SplitComponent = () =>
{collection.name}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect.tsx index c322746737..5f68cb275d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('shared-with-side-effect.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-with-side-effect.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -console.log('registry created'); +const $$splitComponentImporter = () => + import('shared-with-side-effect.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-with-side-effect.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +console.log('registry created') export const Route = createFileRoute('/fx')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect@component---loader---notFoundComponent---pendingComponent.tsx index 6c77f8b857..542779a26b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,7 +1,7 @@ -const registry = new Map(); +const registry = new Map() const SplitLoader = async () => { - registry.set('loaded', true); -}; -export { SplitLoader as loader }; -const SplitComponent = () =>
{registry.size}
; -export { SplitComponent as component }; \ No newline at end of file + registry.set('loaded', true) +} +export { SplitLoader as loader } +const SplitComponent = () =>
{registry.size}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/undefined-literals.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/undefined-literals.tsx index 0c6e4f01aa..88b0bf1ba8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/undefined-literals.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/undefined-literals.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/undefined-test')({ component: undefined, errorComponent: undefined, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure.tsx index d0de09bf8b..b5b3ecade6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure.tsx @@ -1,5 +1,4 @@ import * as React from 'react' - import { CgCornerUpLeft, CgSpinner } from 'react-icons/cg' import { FaBolt, @@ -21,7 +20,6 @@ import { startProject } from '~/projects/start' import { createFileRoute } from '@tanstack/react-router' import { Framework, getBranch } from '~/projects' import { seo } from '~/utils/seo' - const menu = [ { label: ( @@ -72,31 +70,22 @@ const menu = [ to: `https://cottonbureau.com/people/tanstack`, }, ] - export const Route = createFileRoute('/_libraries/start/$version/')({ component: VersionIndex, meta: () => - seo({ - title: startProject.name, - description: startProject.description, - }), + seo({ title: startProject.name, description: startProject.description }), }) - const librariesRouteApi = getRouteApi('/_libraries') - export default function VersionIndex() { const { sponsorsPromise } = librariesRouteApi.useLoaderData() const { version } = Route.useParams() const branch = getBranch(startProject, version) const [framework, setFramework] = React.useState('react') const [isDark, setIsDark] = React.useState(true) - React.useEffect(() => { setIsDark(window.matchMedia?.(`(prefers-color-scheme: dark)`).matches) }, []) - const gradientText = `inline-block text-transparent bg-clip-text bg-gradient-to-r ${startProject.colorFrom} ${startProject.colorTo}` - return (
{item.label}
) - return (
{item.to.startsWith('http') ? ( @@ -269,7 +257,6 @@ Check it out at https://tanstack.com/start/`,
*/} - {/*

@@ -315,7 +302,6 @@ Check it out at https://tanstack.com/start/`, })}

*/} - {/*
Trusted in Production by @@ -358,7 +344,6 @@ Check it out at https://tanstack.com/start/`,
*/} -

Partners @@ -388,16 +373,13 @@ Check it out at https://tanstack.com/start/`,

-

Sponsors

-
@@ -429,7 +410,6 @@ Check it out at https://tanstack.com/start/`, rage-quit OSS. Yay money! 😉
- {/*

@@ -468,7 +448,6 @@ Check it out at https://tanstack.com/start/`,

*/} - {/* {[''].includes(framework) ? (
@@ -503,7 +482,6 @@ Check it out at https://tanstack.com/start/`, >
)} */} - {/*
Wow, you've come a long way! diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@component---loader---notFoundComponent---pendingComponent.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@errorComponent.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@errorComponent.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using.tsx index 140f394f60..22ad515362 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using.tsx @@ -1,5 +1,6 @@ -const $$splitLoaderImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' export const Route = createFileRoute({ - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using@component---loader---notFoundComponent---pendingComponent.tsx index 7e4f4fde9b..3b60e73b8d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,17 +1,9 @@ const DummyPostResource = (postId: string) => ({ - postData: { - id: postId, - title: 'dummy', - body: 'dummy' - }, - [Symbol.dispose]: () => console.log('disposing!') -}); -const SplitLoader = ({ - params: { - postId - } -}) => { - using dummyPost = DummyPostResource(postId); - return dummyPost.postData; -}; -export { SplitLoader as loader }; \ No newline at end of file + postData: { id: postId, title: 'dummy', body: 'dummy' }, + [Symbol.dispose]: () => console.log('disposing!'), +}) +const SplitLoader = ({ params: { postId } }) => { + using dummyPost = DummyPostResource(postId) + return dummyPost.postData +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function.tsx index b09548da57..10bedc87f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/solid-router'; -import { createFileRoute } from '@tanstack/solid-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/solid-router' +import { createFileRoute } from '@tanstack/solid-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function@component.tsx index fe44a34fe1..c84e6f25d4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function@component.tsx @@ -1,26 +1,31 @@ -import * as Solid from 'solid-js'; -import { Link, Outlet } from '@tanstack/solid-router'; -import { Route } from "arrow-function.tsx"; +import * as Solid from 'solid-js' +import { Link, Outlet } from '@tanstack/solid-router' +import { Route } from 'arrow-function.tsx' const PostsComponent = () => { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {post => { - return
  • - + {(post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - }} + + ) + }}

-
; -}; -export { PostsComponent as component }; \ No newline at end of file +
+ ) +} +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function.tsx index 61c77d73bd..6842e20964 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/solid-router'; -const $$splitLoaderImporter = () => import('arrow-function.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/solid-router'; -import { createFileRoute } from '@tanstack/solid-router'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/solid-router' +const $$splitLoaderImporter = () => + import('arrow-function.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/solid-router' +import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx index fe44a34fe1..c84e6f25d4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,26 +1,31 @@ -import * as Solid from 'solid-js'; -import { Link, Outlet } from '@tanstack/solid-router'; -import { Route } from "arrow-function.tsx"; +import * as Solid from 'solid-js' +import { Link, Outlet } from '@tanstack/solid-router' +import { Route } from 'arrow-function.tsx' const PostsComponent = () => { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {post => { - return
  • - + {(post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - }} + + ) + }}

-
; -}; -export { PostsComponent as component }; \ No newline at end of file +
+ ) +} +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@loader.tsx index d9ed4ea7af..888abc8593 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@loader.tsx @@ -1,3 +1,3 @@ -import { fetchPosts } from '../posts'; -const SplitLoader = fetchPosts; -export { SplitLoader as loader }; \ No newline at end of file +import { fetchPosts } from '../posts' +const SplitLoader = fetchPosts +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function.tsx index a872f13d33..2b7b2caefc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/solid-router'; -const $$splitLoaderImporter = () => import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/solid-router'; -import { createFileRoute } from '@tanstack/solid-router'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/solid-router' +const $$splitLoaderImporter = () => + import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/solid-router' +import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx index 2ea36d2e03..7fdf2dd9d0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,29 +1,34 @@ -import * as Solid from 'solid-js'; -import { Link, Outlet } from '@tanstack/solid-router'; -import { fetchPosts } from '../posts'; -import { Route } from "arrow-function.tsx"; +import * as Solid from 'solid-js' +import { Link, Outlet } from '@tanstack/solid-router' +import { fetchPosts } from '../posts' +import { Route } from 'arrow-function.tsx' const PostsComponent = () => { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {post => { - return
  • - + {(post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - }} + + ) + }}

-
; -}; -const SplitLoader = fetchPosts; -export { SplitLoader as loader }; -export { PostsComponent as component }; \ No newline at end of file +
+ ) +} +const SplitLoader = fetchPosts +export { SplitLoader as loader } +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/delete-nodes.test.ts b/packages/router-plugin/tests/delete-nodes.test.ts index 6bb1d3dc6d..d9b37ce54a 100644 --- a/packages/router-plugin/tests/delete-nodes.test.ts +++ b/packages/router-plugin/tests/delete-nodes.test.ts @@ -4,6 +4,7 @@ import { describe, expect, it } from 'vitest' import { compileCodeSplitReferenceRoute } from '../src/core/code-splitter/compilers' import { frameworks } from './constants' +import { formatSnapshot } from './format-snapshot' import type { DeletableNodes } from '../src/core/config' function getFrameworkDir(framework: string) { @@ -57,7 +58,9 @@ describe('code-splitter delete nodes', () => { targetFramework: framework, }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join(dirs.snapshots, groupName, filename), ) }, diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRoute-ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRoute-ssr-function.tsx index 512e597528..9ddd962b9c 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRoute-ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRoute-ssr-function.tsx @@ -1,6 +1,5 @@ import { createRootRoute } from '@tanstack/react-router' import crypto from 'node:crypto' - export const Route = createRootRoute({ ssr: () => { if (crypto.randomInt(0, 2) === 0) { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRouteWithContext-ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRouteWithContext-ssr-function.tsx index 9a2cac49b3..97521cd051 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRouteWithContext-ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRouteWithContext-ssr-function.tsx @@ -1,6 +1,5 @@ import { createRootRouteWithContext } from '@tanstack/react-router' import crypto from 'node:crypto' - export const Route = createRootRouteWithContext<{}>()({ ssr: () => { if (crypto.randomInt(0, 2) === 0) { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-data-only.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-data-only.tsx index c489be3266..9ab5a1eb7f 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-data-only.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-data-only.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/')({ ssr: 'data-only', component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-false.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-false.tsx index d2409de686..daeb982324 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-false.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-false.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/')({ ssr: false, component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRoute-ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRoute-ssr-function.tsx index 512e597528..9ddd962b9c 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRoute-ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRoute-ssr-function.tsx @@ -1,6 +1,5 @@ import { createRootRoute } from '@tanstack/react-router' import crypto from 'node:crypto' - export const Route = createRootRoute({ ssr: () => { if (crypto.randomInt(0, 2) === 0) { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRouteWithContext-ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRouteWithContext-ssr-function.tsx index 9a2cac49b3..97521cd051 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRouteWithContext-ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRouteWithContext-ssr-function.tsx @@ -1,6 +1,5 @@ import { createRootRouteWithContext } from '@tanstack/react-router' import crypto from 'node:crypto' - export const Route = createRootRouteWithContext<{}>()({ ssr: () => { if (crypto.randomInt(0, 2) === 0) { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-data-only.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-data-only.tsx index c489be3266..9ab5a1eb7f 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-data-only.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-data-only.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/')({ ssr: 'data-only', component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-false.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-false.tsx index d2409de686..daeb982324 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-false.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-false.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/')({ ssr: false, component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRoute-ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRoute-ssr-function.tsx index a442b9ad2f..74e60e59e1 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRoute-ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRoute-ssr-function.tsx @@ -1,6 +1,6 @@ -import { createRootRoute } from '@tanstack/react-router'; +import { createRootRoute } from '@tanstack/react-router' export const Route = createRootRoute({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRouteWithContext-ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRouteWithContext-ssr-function.tsx index 75c818b072..9c4e69445c 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRouteWithContext-ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRouteWithContext-ssr-function.tsx @@ -1,6 +1,6 @@ -import { createRootRouteWithContext } from '@tanstack/react-router'; +import { createRootRouteWithContext } from '@tanstack/react-router' export const Route = createRootRouteWithContext<{}>()({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-data-only.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-data-only.tsx index cd2371ae2e..fd9a7cd090 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-data-only.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-data-only.tsx @@ -1,6 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-false.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-false.tsx index cd2371ae2e..fd9a7cd090 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-false.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-false.tsx @@ -1,6 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-function.tsx index cd2371ae2e..fd9a7cd090 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-function.tsx @@ -1,6 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-data-only.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-data-only.tsx index e6a51d19ea..50cdfdeb49 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-data-only.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-data-only.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/solid-router' - export const Route = createFileRoute('/')({ ssr: 'data-only', component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-false.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-false.tsx index 31eda25da3..178109f8d7 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-false.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-false.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/solid-router' - export const Route = createFileRoute('/')({ ssr: false, component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-function.tsx index a111e03c8d..d16a74bb7a 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-function.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/solid-router' - export const Route = createFileRoute('/')({ ssr: () => { if (typeof window === 'undefined') { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-data-only.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-data-only.tsx index e6a51d19ea..50cdfdeb49 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-data-only.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-data-only.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/solid-router' - export const Route = createFileRoute('/')({ ssr: 'data-only', component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-false.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-false.tsx index 31eda25da3..178109f8d7 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-false.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-false.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/solid-router' - export const Route = createFileRoute('/')({ ssr: false, component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-function.tsx index a111e03c8d..d16a74bb7a 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-function.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/solid-router' - export const Route = createFileRoute('/')({ ssr: () => { if (typeof window === 'undefined') { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-data-only.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-data-only.tsx index 77e05f3b12..7ed1de7be5 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-data-only.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-data-only.tsx @@ -1,6 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router'; +import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/')({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-false.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-false.tsx index 77e05f3b12..7ed1de7be5 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-false.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-false.tsx @@ -1,6 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router'; +import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/')({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-function.tsx index 77e05f3b12..7ed1de7be5 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-function.tsx @@ -1,6 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router'; +import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/')({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/format-snapshot.ts b/packages/router-plugin/tests/format-snapshot.ts new file mode 100644 index 0000000000..d152094bea --- /dev/null +++ b/packages/router-plugin/tests/format-snapshot.ts @@ -0,0 +1,69 @@ +import { format } from 'prettier' +import { parsers } from 'prettier/plugins/typescript' +import type { ParserOptions } from 'prettier' + +/** + * Formats compiler output before it is compared with a file snapshot, so that + * snapshots record the emitted program instead of the layout choices of the + * code generator (object wrapping, blank lines, parentheses around JSX, ...). + * + * Comments are kept: they are part of the output. Output that does not parse + * is returned unchanged. + */ +export async function formatSnapshot(code: string, filepath: string) { + try { + return await format(await removeBlankLines(code, filepath), { + filepath, + parser: 'typescript', + semi: false, + singleQuote: true, + trailingComma: 'all', + // Do not keep an object expanded because the generator printed it + // over several lines. + objectWrap: 'collapse', + }) + } catch { + return code + } +} + +/** + * Prettier keeps single blank lines from its input. Outside template literals, + * line breaks are not significant, so blank lines can be dropped. + */ +async function removeBlankLines(code: string, filepath: string) { + const parser = parsers.typescript + const ast = await parser.parse(code, { filepath } as ParserOptions) + const templateRanges: Array<[number, number]> = [] + const visit = (node: unknown): void => { + if (Array.isArray(node)) { + node.forEach(visit) + return + } + if (!node || typeof node !== 'object') { + return + } + if ((node as { type?: unknown }).type === 'TemplateElement') { + templateRanges.push([parser.locStart(node), parser.locEnd(node)]) + } + for (const [key, value] of Object.entries(node)) { + if (key !== 'loc' && key !== 'range') { + visit(value) + } + } + } + visit(ast) + + const lines: Array = [] + let lineStart = 0 + for (const line of code.split('\n')) { + const isInTemplate = templateRanges.some( + ([start, end]) => start < lineStart && lineStart < end, + ) + if (line.trim() !== '' || isInTemplate) { + lines.push(line) + } + lineStart += line.length + 1 + } + return lines.join('\n') +} diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 6ab02f91e5..677fb18013 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -113,6 +113,7 @@ "@types/babel__core": "^7.20.5", "@types/node": ">=20", "@types/picomatch": "^4.0.2", + "prettier": "^3.9.6", "vite": "*", "@tanstack/vite-config": "catalog:", "vitest": "catalog:", diff --git a/packages/start-plugin-core/tests/clientOnlyJSX/clientOnlyJSX.test.ts b/packages/start-plugin-core/tests/clientOnlyJSX/clientOnlyJSX.test.ts index 4f645d73db..fa48668a38 100644 --- a/packages/start-plugin-core/tests/clientOnlyJSX/clientOnlyJSX.test.ts +++ b/packages/start-plugin-core/tests/clientOnlyJSX/clientOnlyJSX.test.ts @@ -6,6 +6,7 @@ import { detectKindsInCode, StartCompiler, } from '../../src/start-compiler/compiler' +import { formatSnapshot } from '../format-snapshot' // Default test options for StartCompiler function getDefaultTestOptions(env: 'client' | 'server') { @@ -72,9 +73,9 @@ describe('ClientOnlyJSX compiles correctly', async () => { }) if (compiledResult) { - await expect(compiledResult.code).toMatchFileSnapshot( - `./snapshots/server/${filename}`, - ) + await expect( + await formatSnapshot(compiledResult.code, filename), + ).toMatchFileSnapshot(`./snapshots/server/${filename}`) } else { // No transformation - for files where ClientOnly is not from TanStack await expect('no-transform').toMatchFileSnapshot( diff --git a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyBasic.tsx b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyBasic.tsx index 82195ff739..96de7844f6 100644 --- a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyBasic.tsx +++ b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyBasic.tsx @@ -1,6 +1,8 @@ -import { ClientOnly } from '@tanstack/react-router'; +import { ClientOnly } from '@tanstack/react-router' export function MyComponent() { - return
+ return ( +
Loading...
} /> -
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyMultiple.tsx b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyMultiple.tsx index f437f41b05..6b95090d3f 100644 --- a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyMultiple.tsx +++ b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyMultiple.tsx @@ -1,8 +1,10 @@ -import { ClientOnly } from '@tanstack/react-router'; +import { ClientOnly } from '@tanstack/react-router' export function MyComponent() { - return
+ return ( +
Loading video...} />

Some server content

Loading audio...} /> -
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNested.tsx b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNested.tsx index 9d48d6577d..f3d5d3b526 100644 --- a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNested.tsx +++ b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNested.tsx @@ -1,6 +1,8 @@ -import { ClientOnly } from '@tanstack/react-router'; +import { ClientOnly } from '@tanstack/react-router' export function MyComponent() { - return
+ return ( +
Outer loading
} /> -
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNoFallback.tsx b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNoFallback.tsx index 9224aeb1cf..40551a6dad 100644 --- a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNoFallback.tsx +++ b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNoFallback.tsx @@ -1,6 +1,8 @@ -import { ClientOnly } from '@tanstack/react-router'; +import { ClientOnly } from '@tanstack/react-router' export function MyComponent() { - return
+ return ( +
-
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyRenamed.tsx b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyRenamed.tsx index de9e376b63..9a537448b0 100644 --- a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyRenamed.tsx +++ b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyRenamed.tsx @@ -1,7 +1,9 @@ // Test: ClientOnly imported with an alias should still be transformed -import { ClientOnly as CO } from '@tanstack/react-router'; +import { ClientOnly as CO } from '@tanstack/react-router' export function MyComponent() { - return
+ return ( +
Loading...
} /> -
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/createIsomorphicFn.test.ts b/packages/start-plugin-core/tests/createIsomorphicFn/createIsomorphicFn.test.ts index c36c117692..0b6a5aa26a 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/createIsomorphicFn.test.ts +++ b/packages/start-plugin-core/tests/createIsomorphicFn/createIsomorphicFn.test.ts @@ -3,6 +3,7 @@ import path from 'node:path' import { describe, expect, test } from 'vitest' import { StartCompiler } from '../../src/start-compiler/compiler' +import { formatSnapshot } from '../format-snapshot' // Default test options for StartCompiler function getDefaultTestOptions(env: 'client' | 'server') { @@ -68,9 +69,9 @@ describe('createIsomorphicFn compiles correctly', async () => { id: filename, }) - await expect(compiledResult!.code).toMatchFileSnapshot( - `./snapshots/${env}/${filename}`, - ) + await expect( + await formatSnapshot(compiledResult!.code, filename), + ).toMatchFileSnapshot(`./snapshots/${env}/${filename}`) }, ) }) diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/call-at-module-level.ts b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/call-at-module-level.ts index efc23cf31b..7e8ade3201 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/call-at-module-level.ts +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/call-at-module-level.ts @@ -1,5 +1,5 @@ const getEnvironment = () => { - console.log('[CLIENT] getEnvironment called'); - return 'client'; -}; -const moduleLevel = getEnvironment(); \ No newline at end of file + console.log('[CLIENT] getEnvironment called') + return 'client' +} +const moduleLevel = getEnvironment() diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx index 956fe05f98..20fbb3d4dc 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx @@ -1,13 +1,13 @@ -import { createIsomorphicFn } from '@tanstack/react-start'; -const noImpl = createIsomorphicFn(); -const serverOnlyFn = () => {}; -const clientOnlyFn = () => 'client'; -const serverThenClientFn = () => 'client'; -const clientThenServerFn = () => 'client'; -const serverOnlyFnAbstracted = () => {}; +import { createIsomorphicFn } from '@tanstack/react-start' +const noImpl = createIsomorphicFn() +const serverOnlyFn = () => {} +const clientOnlyFn = () => 'client' +const serverThenClientFn = () => 'client' +const clientThenServerFn = () => 'client' +const serverOnlyFnAbstracted = () => {} function abstractedClientFn() { - return 'client'; + return 'client' } -const clientOnlyFnAbstracted = abstractedClientFn; -const serverThenClientFnAbstracted = abstractedClientFn; -const clientThenServerFnAbstracted = abstractedClientFn; \ No newline at end of file +const clientOnlyFnAbstracted = abstractedClientFn +const serverThenClientFnAbstracted = abstractedClientFn +const clientThenServerFnAbstracted = abstractedClientFn diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx index 5e167daeb6..d8f76d94b0 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx @@ -1,13 +1,13 @@ -import { createIsomorphicFn as isomorphicFn } from '@tanstack/react-start'; -const noImpl = isomorphicFn(); -const serverOnlyFn = () => {}; -const clientOnlyFn = () => 'client'; -const serverThenClientFn = () => 'client'; -const clientThenServerFn = () => 'client'; -const serverOnlyFnAbstracted = () => {}; +import { createIsomorphicFn as isomorphicFn } from '@tanstack/react-start' +const noImpl = isomorphicFn() +const serverOnlyFn = () => {} +const clientOnlyFn = () => 'client' +const serverThenClientFn = () => 'client' +const clientThenServerFn = () => 'client' +const serverOnlyFnAbstracted = () => {} function abstractedClientFn() { - return 'client'; + return 'client' } -const clientOnlyFnAbstracted = abstractedClientFn; -const serverThenClientFnAbstracted = abstractedClientFn; -const clientThenServerFnAbstracted = abstractedClientFn; \ No newline at end of file +const clientOnlyFnAbstracted = abstractedClientFn +const serverThenClientFnAbstracted = abstractedClientFn +const clientThenServerFnAbstracted = abstractedClientFn diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnFactory.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnFactory.tsx index b54ad664b1..08772a9178 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnFactory.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnFactory.tsx @@ -1,27 +1,22 @@ -import { createIsomorphicFn } from '@tanstack/react-start'; - +import { createIsomorphicFn } from '@tanstack/react-start' // Isomorphic function factory - returns a createIsomorphicFn with .client() and .server() calls export function createPlatformFn(platform: string) { - return () => `client-${platform}`; + return () => `client-${platform}` } - // Arrow function factory with only server implementation export const createServerImplFn = (name: string) => { - return () => {}; -}; - + return () => {} +} // Arrow function factory with only client implementation export const createClientImplFn = (name: string) => { return () => { - console.log(`Client: ${name}`); - return `client-${name}`; - }; -}; - + console.log(`Client: ${name}`) + return `client-${name}` + } +} // Factory returning no-implementation isomorphic fn export function createNoImplFn() { - return createIsomorphicFn(); + return createIsomorphicFn() } - // Top-level isomorphic fn for comparison -export const topLevelIsomorphicFn = () => 'client'; \ No newline at end of file +export const topLevelIsomorphicFn = () => 'client' diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnInline.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnInline.tsx index 09666623a6..28930701bd 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnInline.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnInline.tsx @@ -1,41 +1,33 @@ // Create and immediately invoke isomorphic fn inside a function export function getPlatformValue() { - const fn = () => 'client-value'; - return fn(); + const fn = () => 'client-value' + return fn() } - // Arrow function that creates and invokes isomorphic fn export const getEnvironment = () => { - const envFn = () => 'running on client'; - return envFn(); -}; - + const envFn = () => 'running on client' + return envFn() +} // Create isomorphic fn inline without assigning to variable export function getDirectValue() { - return (() => 'direct-client')(); + return (() => 'direct-client')() } - // Multiple isomorphic fns created and used in same function export function getMultipleValues() { - const first = () => 'first-client'; - const second = () => 'second-client'; - return { - first: first(), - second: second() - }; + const first = () => 'first-client' + const second = () => 'second-client' + return { first: first(), second: second() } } - // Isomorphic fn with server-only implementation used inline export function getServerOnlyValue() { - const fn = () => {}; - return fn(); + const fn = () => {} + return fn() } - // Isomorphic fn with client-only implementation used inline export function getClientOnlyValue() { const fn = () => { - console.log('client side effect'); - return 'client-only-value'; - }; - return fn(); -} \ No newline at end of file + console.log('client side effect') + return 'client-only-value' + } + return fn() +} diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx index 070f59d901..f8604d9723 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx @@ -1,13 +1,13 @@ -import * as TanStackStart from '@tanstack/react-start'; -const noImpl = TanStackStart.createIsomorphicFn(); -const serverOnlyFn = () => {}; -const clientOnlyFn = () => 'client'; -const serverThenClientFn = () => 'client'; -const clientThenServerFn = () => 'client'; -const serverOnlyFnAbstracted = () => {}; +import * as TanStackStart from '@tanstack/react-start' +const noImpl = TanStackStart.createIsomorphicFn() +const serverOnlyFn = () => {} +const clientOnlyFn = () => 'client' +const serverThenClientFn = () => 'client' +const clientThenServerFn = () => 'client' +const serverOnlyFnAbstracted = () => {} function abstractedClientFn() { - return 'client'; + return 'client' } -const clientOnlyFnAbstracted = abstractedClientFn; -const serverThenClientFnAbstracted = abstractedClientFn; -const clientThenServerFnAbstracted = abstractedClientFn; \ No newline at end of file +const clientOnlyFnAbstracted = abstractedClientFn +const serverThenClientFnAbstracted = abstractedClientFn +const clientThenServerFnAbstracted = abstractedClientFn diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/call-at-module-level.ts b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/call-at-module-level.ts index 2fa99b5686..66c327f562 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/call-at-module-level.ts +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/call-at-module-level.ts @@ -1,5 +1,5 @@ const getEnvironment = () => { - console.log('[SERVER] getEnvironment called'); - return 'server'; -}; -const moduleLevel = getEnvironment(); \ No newline at end of file + console.log('[SERVER] getEnvironment called') + return 'server' +} +const moduleLevel = getEnvironment() diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx index 195cee12a6..ee54120ca1 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx @@ -1,13 +1,13 @@ -import { createIsomorphicFn } from '@tanstack/react-start'; -const noImpl = createIsomorphicFn(); -const serverOnlyFn = () => 'server'; -const clientOnlyFn = () => {}; -const serverThenClientFn = () => 'server'; -const clientThenServerFn = () => 'server'; +import { createIsomorphicFn } from '@tanstack/react-start' +const noImpl = createIsomorphicFn() +const serverOnlyFn = () => 'server' +const clientOnlyFn = () => {} +const serverThenClientFn = () => 'server' +const clientThenServerFn = () => 'server' function abstractedServerFn() { - return 'server'; + return 'server' } -const serverOnlyFnAbstracted = abstractedServerFn; -const clientOnlyFnAbstracted = () => {}; -const serverThenClientFnAbstracted = abstractedServerFn; -const clientThenServerFnAbstracted = abstractedServerFn; \ No newline at end of file +const serverOnlyFnAbstracted = abstractedServerFn +const clientOnlyFnAbstracted = () => {} +const serverThenClientFnAbstracted = abstractedServerFn +const clientThenServerFnAbstracted = abstractedServerFn diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx index c50c274dd6..11289136e9 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx @@ -1,13 +1,13 @@ -import { createIsomorphicFn as isomorphicFn } from '@tanstack/react-start'; -const noImpl = isomorphicFn(); -const serverOnlyFn = () => 'server'; -const clientOnlyFn = () => {}; -const serverThenClientFn = () => 'server'; -const clientThenServerFn = () => 'server'; +import { createIsomorphicFn as isomorphicFn } from '@tanstack/react-start' +const noImpl = isomorphicFn() +const serverOnlyFn = () => 'server' +const clientOnlyFn = () => {} +const serverThenClientFn = () => 'server' +const clientThenServerFn = () => 'server' function abstractedServerFn() { - return 'server'; + return 'server' } -const serverOnlyFnAbstracted = abstractedServerFn; -const clientOnlyFnAbstracted = () => {}; -const serverThenClientFnAbstracted = abstractedServerFn; -const clientThenServerFnAbstracted = abstractedServerFn; \ No newline at end of file +const serverOnlyFnAbstracted = abstractedServerFn +const clientOnlyFnAbstracted = () => {} +const serverThenClientFnAbstracted = abstractedServerFn +const clientThenServerFnAbstracted = abstractedServerFn diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnFactory.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnFactory.tsx index cce206bc8b..c1ec1e79f5 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnFactory.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnFactory.tsx @@ -1,27 +1,22 @@ -import { createIsomorphicFn } from '@tanstack/react-start'; - +import { createIsomorphicFn } from '@tanstack/react-start' // Isomorphic function factory - returns a createIsomorphicFn with .client() and .server() calls export function createPlatformFn(platform: string) { - return () => `server-${platform}`; + return () => `server-${platform}` } - // Arrow function factory with only server implementation export const createServerImplFn = (name: string) => { return () => { - console.log(`Server: ${name}`); - return `server-${name}`; - }; -}; - + console.log(`Server: ${name}`) + return `server-${name}` + } +} // Arrow function factory with only client implementation export const createClientImplFn = (name: string) => { - return () => {}; -}; - + return () => {} +} // Factory returning no-implementation isomorphic fn export function createNoImplFn() { - return createIsomorphicFn(); + return createIsomorphicFn() } - // Top-level isomorphic fn for comparison -export const topLevelIsomorphicFn = () => 'server'; \ No newline at end of file +export const topLevelIsomorphicFn = () => 'server' diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnInline.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnInline.tsx index 9c058dfae8..c2b0d07284 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnInline.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnInline.tsx @@ -1,41 +1,33 @@ // Create and immediately invoke isomorphic fn inside a function export function getPlatformValue() { - const fn = () => 'server-value'; - return fn(); + const fn = () => 'server-value' + return fn() } - // Arrow function that creates and invokes isomorphic fn export const getEnvironment = () => { - const envFn = () => 'running on server'; - return envFn(); -}; - + const envFn = () => 'running on server' + return envFn() +} // Create isomorphic fn inline without assigning to variable export function getDirectValue() { - return (() => 'direct-server')(); + return (() => 'direct-server')() } - // Multiple isomorphic fns created and used in same function export function getMultipleValues() { - const first = () => 'first-server'; - const second = () => 'second-server'; - return { - first: first(), - second: second() - }; + const first = () => 'first-server' + const second = () => 'second-server' + return { first: first(), second: second() } } - // Isomorphic fn with server-only implementation used inline export function getServerOnlyValue() { const fn = () => { - console.log('server side effect'); - return 'server-only-value'; - }; - return fn(); + console.log('server side effect') + return 'server-only-value' + } + return fn() } - // Isomorphic fn with client-only implementation used inline export function getClientOnlyValue() { - const fn = () => {}; - return fn(); -} \ No newline at end of file + const fn = () => {} + return fn() +} diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx index 65e4fc18b1..6a1c429167 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx @@ -1,13 +1,13 @@ -import * as TanStackStart from '@tanstack/react-start'; -const noImpl = TanStackStart.createIsomorphicFn(); -const serverOnlyFn = () => 'server'; -const clientOnlyFn = () => {}; -const serverThenClientFn = () => 'server'; -const clientThenServerFn = () => 'server'; +import * as TanStackStart from '@tanstack/react-start' +const noImpl = TanStackStart.createIsomorphicFn() +const serverOnlyFn = () => 'server' +const clientOnlyFn = () => {} +const serverThenClientFn = () => 'server' +const clientThenServerFn = () => 'server' function abstractedServerFn() { - return 'server'; + return 'server' } -const serverOnlyFnAbstracted = abstractedServerFn; -const clientOnlyFnAbstracted = () => {}; -const serverThenClientFnAbstracted = abstractedServerFn; -const clientThenServerFnAbstracted = abstractedServerFn; \ No newline at end of file +const serverOnlyFnAbstracted = abstractedServerFn +const clientOnlyFnAbstracted = () => {} +const serverThenClientFnAbstracted = abstractedServerFn +const clientThenServerFnAbstracted = abstractedServerFn diff --git a/packages/start-plugin-core/tests/createMiddleware/createMiddleware.test.ts b/packages/start-plugin-core/tests/createMiddleware/createMiddleware.test.ts index 4747cfc848..e4690737ac 100644 --- a/packages/start-plugin-core/tests/createMiddleware/createMiddleware.test.ts +++ b/packages/start-plugin-core/tests/createMiddleware/createMiddleware.test.ts @@ -2,6 +2,7 @@ import { readFile, readdir } from 'node:fs/promises' import path from 'node:path' import { describe, expect, test, vi } from 'vitest' import { StartCompiler } from '../../src/start-compiler/compiler' +import { formatSnapshot } from '../format-snapshot' // Default test options for StartCompiler function getDefaultTestOptions(env: 'client' | 'server') { @@ -69,9 +70,9 @@ describe('createMiddleware compiles correctly', async () => { test(`should compile for ${filename} client`, async () => { const result = await compile({ env: 'client', code, id: filename }) - await expect(result!.code).toMatchFileSnapshot( - `./snapshots/client/${filename}`, - ) + await expect( + await formatSnapshot(result!.code, filename), + ).toMatchFileSnapshot(`./snapshots/client/${filename}`) }) }) @@ -90,11 +91,11 @@ describe('createMiddleware compiles correctly', async () => { id: 'test.ts', }) - expect(result!.code).toMatchInlineSnapshot(` - "import { createMiddleware } from '@tanstack/react-start'; - const myMiddleware = createMiddleware({ - type: 'function' - });" + expect(await formatSnapshot(result!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createMiddleware } from '@tanstack/react-start' + const myMiddleware = createMiddleware({ type: 'function' }) + " `) }) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/create-function-middleware.ts b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/create-function-middleware.ts index b37e25e498..73d5910eef 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/create-function-middleware.ts +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/create-function-middleware.ts @@ -1,6 +1,4 @@ -import { createMiddleware } from '@tanstack/react-start'; -export const fnMw = createMiddleware({ - type: 'function' -}).client(() => { - console.log('client'); -}); \ No newline at end of file +import { createMiddleware } from '@tanstack/react-start' +export const fnMw = createMiddleware({ type: 'function' }).client(() => { + console.log('client') +}) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx index b5cf588a1f..c3497f072b 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx @@ -1,13 +1,5 @@ -import { createMiddleware } from '@tanstack/react-start'; -export const withUseServer = createMiddleware({ - id: 'test' -}); -export const withoutUseServer = createMiddleware({ - id: 'test' -}); -export const withVariable = createMiddleware({ - id: 'test' -}); -export const withZodValidator = createMiddleware({ - id: 'test' -}); \ No newline at end of file +import { createMiddleware } from '@tanstack/react-start' +export const withUseServer = createMiddleware({ id: 'test' }) +export const withoutUseServer = createMiddleware({ id: 'test' }) +export const withVariable = createMiddleware({ id: 'test' }) +export const withZodValidator = createMiddleware({ id: 'test' }) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx index ee06179703..70d3921bda 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx @@ -1,13 +1,5 @@ -import { createMiddleware as middlewareFn } from '@tanstack/react-start'; -export const withUseServer = middlewareFn({ - id: 'test' -}); -export const withoutUseServer = middlewareFn({ - id: 'test' -}); -export const withVariable = middlewareFn({ - id: 'test' -}); -export const withZodValidator = middlewareFn({ - id: 'test' -}); \ No newline at end of file +import { createMiddleware as middlewareFn } from '@tanstack/react-start' +export const withUseServer = middlewareFn({ id: 'test' }) +export const withoutUseServer = middlewareFn({ id: 'test' }) +export const withVariable = middlewareFn({ id: 'test' }) +export const withZodValidator = middlewareFn({ id: 'test' }) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx index 6f2f40a2a3..f997f40fe0 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx @@ -1,13 +1,5 @@ -import * as TanStackStart from '@tanstack/react-start'; -export const withUseServer = TanStackStart.createMiddleware({ - id: 'test' -}); -export const withoutUseServer = TanStackStart.createMiddleware({ - id: 'test' -}); -export const withVariable = TanStackStart.createMiddleware({ - id: 'test' -}); -export const withZodValidator = TanStackStart.createMiddleware({ - id: 'test' -}); \ No newline at end of file +import * as TanStackStart from '@tanstack/react-start' +export const withUseServer = TanStackStart.createMiddleware({ id: 'test' }) +export const withoutUseServer = TanStackStart.createMiddleware({ id: 'test' }) +export const withVariable = TanStackStart.createMiddleware({ id: 'test' }) +export const withZodValidator = TanStackStart.createMiddleware({ id: 'test' }) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx index 3b1beac2c0..773e990702 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx @@ -1,4 +1,2 @@ -import { createMiddleware } from '@tanstack/react-start'; -export const withUseServer = createMiddleware({ - id: 'test' -}); \ No newline at end of file +import { createMiddleware } from '@tanstack/react-start' +export const withUseServer = createMiddleware({ id: 'test' }) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createStart.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createStart.tsx index 8c3a7fc205..b2bde33436 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createStart.tsx +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createStart.tsx @@ -1,13 +1,9 @@ -import { createStart } from '@tanstack/react-start'; -export const startInstance = createStart(() => {}); -export const serverFnMw = startInstance.createMiddleware({ - type: 'function' -}).client(({ - next -}) => { - console.log('client mw'); - return next(); -}); -export const requestMw = startInstance.createMiddleware({ - type: 'request' -}); \ No newline at end of file +import { createStart } from '@tanstack/react-start' +export const startInstance = createStart(() => {}) +export const serverFnMw = startInstance + .createMiddleware({ type: 'function' }) + .client(({ next }) => { + console.log('client mw') + return next() + }) +export const requestMw = startInstance.createMiddleware({ type: 'request' }) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/middleware-factory.ts b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/middleware-factory.ts index 6845bd0ef5..0e51f2f369 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/middleware-factory.ts +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/middleware-factory.ts @@ -1,20 +1,11 @@ -import { createMiddleware } from '@tanstack/react-start'; - +import { createMiddleware } from '@tanstack/react-start' // Middleware factory function - returns a middleware with .server() call export function createPublicRateLimitMiddleware(keySuffix) { - return createMiddleware({ - type: 'function' - }); + return createMiddleware({ type: 'function' }) } - // Arrow function factory -export const createAuthMiddleware = requiredRole => { - return createMiddleware({ - type: 'function' - }); -}; - +export const createAuthMiddleware = (requiredRole) => { + return createMiddleware({ type: 'function' }) +} // Top-level middleware for comparison -export const topLevelMiddleware = createMiddleware({ - id: 'topLevel' -}); \ No newline at end of file +export const topLevelMiddleware = createMiddleware({ id: 'topLevel' }) diff --git a/packages/start-plugin-core/tests/createServerFn/createServerFn.test.ts b/packages/start-plugin-core/tests/createServerFn/createServerFn.test.ts index f5236d8443..a0ba9c4ba6 100644 --- a/packages/start-plugin-core/tests/createServerFn/createServerFn.test.ts +++ b/packages/start-plugin-core/tests/createServerFn/createServerFn.test.ts @@ -2,6 +2,7 @@ import { readFile, readdir } from 'node:fs/promises' import path from 'node:path' import { describe, expect, test, vi } from 'vitest' import { StartCompiler } from '../../src/start-compiler/compiler' +import { formatSnapshot } from '../format-snapshot' // Default test options for StartCompiler function getDefaultTestOptions(env: 'client' | 'server') { @@ -91,9 +92,9 @@ describe('createServerFn compiles correctly', async () => { : env.isProviderFile ? 'server-provider' : 'server-caller' - await expect(result!.code).toMatchFileSnapshot( - `./snapshots/${folder}/${filename}`, - ) + await expect( + await formatSnapshot(result!.code, filename), + ).toMatchFileSnapshot(`./snapshots/${folder}/${filename}`) }) }) @@ -111,11 +112,17 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResultClient!.code).toMatchInlineSnapshot(` - "import { createClientRpc } from '@tanstack/react-start/client-rpc'; - import { createServerFn } from '@tanstack/react-start'; - const myServerFn = createServerFn().handler(createClientRpc(\"2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b\"));" - `) + expect(await formatSnapshot(compiledResultClient!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createClientRpc } from '@tanstack/react-start/client-rpc' + import { createServerFn } from '@tanstack/react-start' + const myServerFn = createServerFn().handler( + createClientRpc( + '2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b', + ), + ) + " + `) }) // Editors count \n, \r\n, a lone \r, U+2028 and U+2029 as line @@ -206,34 +213,54 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResultClient!.code).toMatchInlineSnapshot(` - "import { createClientRpc } from '@tanstack/react-start/client-rpc'; - import { createServerFn } from '@tanstack/react-start'; - const myServerFn = createServerFn().handler(createClientRpc("2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b"));" - `) + expect(await formatSnapshot(compiledResultClient!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createClientRpc } from '@tanstack/react-start/client-rpc' + import { createServerFn } from '@tanstack/react-start' + const myServerFn = createServerFn().handler( + createClientRpc( + '2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b', + ), + ) + " + `) // Server caller: no second argument (implementation from extracted chunk) - expect(compiledResultServerCaller!.code).toMatchInlineSnapshot(` - "import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; - import { createServerFn } from '@tanstack/react-start'; - const myServerFn = createServerFn().handler(createSsrRpc("2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b"));" - `) + expect(await formatSnapshot(compiledResultServerCaller!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' + import { createServerFn } from '@tanstack/react-start' + const myServerFn = createServerFn().handler( + createSsrRpc( + '2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b', + ), + ) + " + `) // Server provider: has second argument (this is the implementation file) - expect(compiledResultServerProvider!.code).toMatchInlineSnapshot(` - "import { createServerRpc } from '@tanstack/react-start/server-rpc'; - import { createServerFn } from '@tanstack/react-start'; - const myFunc = () => { - return 'hello from the server'; - }; - const myServerFn_createServerFn_handler = createServerRpc({ - id: "2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b", - name: "myServerFn", - filename: "src/test.ts" - }, opts => myServerFn.__executeServer(opts)); - const myServerFn = createServerFn().handler(myServerFn_createServerFn_handler, myFunc); - export { myServerFn_createServerFn_handler };" - `) + expect(await formatSnapshot(compiledResultServerProvider!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createServerRpc } from '@tanstack/react-start/server-rpc' + import { createServerFn } from '@tanstack/react-start' + const myFunc = () => { + return 'hello from the server' + } + const myServerFn_createServerFn_handler = createServerRpc( + { + id: '2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b', + name: 'myServerFn', + filename: 'src/test.ts', + }, + (opts) => myServerFn.__executeServer(opts), + ) + const myServerFn = createServerFn().handler( + myServerFn_createServerFn_handler, + myFunc, + ) + export { myServerFn_createServerFn_handler } + " + `) }) test('should remove imports used only as caller handler identifiers', async () => { @@ -251,11 +278,17 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResult!.code).toMatchInlineSnapshot(` - "import { createClientRpc } from '@tanstack/react-start/client-rpc'; - import { createServerFn } from '@tanstack/react-start'; - export const getUsersFn = createServerFn().handler(createClientRpc(\"a78c63d4bb3c0b10a8b70902c73611fbf0b9229e0807b065c03c939f9c0ce100\"));" - `) + expect(await formatSnapshot(compiledResult!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createClientRpc } from '@tanstack/react-start/client-rpc' + import { createServerFn } from '@tanstack/react-start' + export const getUsersFn = createServerFn().handler( + createClientRpc( + 'a78c63d4bb3c0b10a8b70902c73611fbf0b9229e0807b065c03c939f9c0ce100', + ), + ) + " + `) }) test('should not remove handler identifier bindings that are still referenced', async () => { @@ -274,13 +307,19 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResult!.code).toMatchInlineSnapshot(` - "import { createClientRpc } from '@tanstack/react-start/client-rpc'; - import { createServerFn } from '@tanstack/react-start'; - import { getUsers } from './server'; - export const getUsersFn = createServerFn().handler(createClientRpc(\"a78c63d4bb3c0b10a8b70902c73611fbf0b9229e0807b065c03c939f9c0ce100\")); - console.log(getUsers);" - `) + expect(await formatSnapshot(compiledResult!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createClientRpc } from '@tanstack/react-start/client-rpc' + import { createServerFn } from '@tanstack/react-start' + import { getUsers } from './server' + export const getUsersFn = createServerFn().handler( + createClientRpc( + 'a78c63d4bb3c0b10a8b70902c73611fbf0b9229e0807b065c03c939f9c0ce100', + ), + ) + console.log(getUsers) + " + `) }) test('should compile server functions wrapped in TypeScript as expressions', async () => { @@ -341,12 +380,22 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResult!.code).toMatchInlineSnapshot(` - "import { createClientRpc } from '@tanstack/react-start/client-rpc'; - import { createServerFn } from '@tanstack/react-start'; - export const exportedFn = createServerFn().handler(createClientRpc("c306c96e9256c7604f2a6022c4c94eb89f863274c022bc45b03970f067ea9864")); - const nonExportedFn = createServerFn().handler(createClientRpc("f4403dc0b18e216dfe0a9711cab028bc1b9768175daa9236d7115e29c99d76c2"));" - `) + expect(await formatSnapshot(compiledResult!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createClientRpc } from '@tanstack/react-start/client-rpc' + import { createServerFn } from '@tanstack/react-start' + export const exportedFn = createServerFn().handler( + createClientRpc( + 'c306c96e9256c7604f2a6022c4c94eb89f863274c022bc45b03970f067ea9864', + ), + ) + const nonExportedFn = createServerFn().handler( + createClientRpc( + 'f4403dc0b18e216dfe0a9711cab028bc1b9768175daa9236d7115e29c99d76c2', + ), + ) + " + `) // Server caller (route file) - no second argument const compiledResultServerCaller = await compile({ @@ -356,12 +405,22 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResultServerCaller!.code).toMatchInlineSnapshot(` - "import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; - import { createServerFn } from '@tanstack/react-start'; - export const exportedFn = createServerFn().handler(createSsrRpc("c306c96e9256c7604f2a6022c4c94eb89f863274c022bc45b03970f067ea9864")); - const nonExportedFn = createServerFn().handler(createSsrRpc("f4403dc0b18e216dfe0a9711cab028bc1b9768175daa9236d7115e29c99d76c2"));" - `) + expect(await formatSnapshot(compiledResultServerCaller!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' + import { createServerFn } from '@tanstack/react-start' + export const exportedFn = createServerFn().handler( + createSsrRpc( + 'c306c96e9256c7604f2a6022c4c94eb89f863274c022bc45b03970f067ea9864', + ), + ) + const nonExportedFn = createServerFn().handler( + createSsrRpc( + 'f4403dc0b18e216dfe0a9711cab028bc1b9768175daa9236d7115e29c99d76c2', + ), + ) + " + `) // Server provider (extracted file) - has second argument const compiledResultServerProvider = await compile({ @@ -371,29 +430,46 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResultServerProvider!.code).toMatchInlineSnapshot(` - "import { createServerRpc } from '@tanstack/react-start/server-rpc'; - import { createServerFn } from '@tanstack/react-start'; - const exportedVar = 'exported'; - const exportedFn_createServerFn_handler = createServerRpc({ - id: "c306c96e9256c7604f2a6022c4c94eb89f863274c022bc45b03970f067ea9864", - name: "exportedFn", - filename: "src/test.ts" - }, opts => exportedFn.__executeServer(opts)); - const exportedFn = createServerFn().handler(exportedFn_createServerFn_handler, async () => { - return exportedVar; - }); - const nonExportedVar = 'non-exported'; - const nonExportedFn_createServerFn_handler = createServerRpc({ - id: "f4403dc0b18e216dfe0a9711cab028bc1b9768175daa9236d7115e29c99d76c2", - name: "nonExportedFn", - filename: "src/test.ts" - }, opts => nonExportedFn.__executeServer(opts)); - const nonExportedFn = createServerFn().handler(nonExportedFn_createServerFn_handler, async () => { - return nonExportedVar; - }); - export { exportedFn_createServerFn_handler, nonExportedFn_createServerFn_handler };" - `) + expect(await formatSnapshot(compiledResultServerProvider!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createServerRpc } from '@tanstack/react-start/server-rpc' + import { createServerFn } from '@tanstack/react-start' + const exportedVar = 'exported' + const exportedFn_createServerFn_handler = createServerRpc( + { + id: 'c306c96e9256c7604f2a6022c4c94eb89f863274c022bc45b03970f067ea9864', + name: 'exportedFn', + filename: 'src/test.ts', + }, + (opts) => exportedFn.__executeServer(opts), + ) + const exportedFn = createServerFn().handler( + exportedFn_createServerFn_handler, + async () => { + return exportedVar + }, + ) + const nonExportedVar = 'non-exported' + const nonExportedFn_createServerFn_handler = createServerRpc( + { + id: 'f4403dc0b18e216dfe0a9711cab028bc1b9768175daa9236d7115e29c99d76c2', + name: 'nonExportedFn', + filename: 'src/test.ts', + }, + (opts) => nonExportedFn.__executeServer(opts), + ) + const nonExportedFn = createServerFn().handler( + nonExportedFn_createServerFn_handler, + async () => { + return nonExportedVar + }, + ) + export { + exportedFn_createServerFn_handler, + nonExportedFn_createServerFn_handler, + } + " + `) }) test('should use fast path for direct imports from known library (no extra resolveId calls)', async () => { diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx index 2c0e54f9c9..88e8607da2 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx @@ -1,23 +1,39 @@ -import { createClientRpc } from '@tanstack/react-start/client-rpc'; -import { createServerFn } from '@tanstack/react-start'; -export const withUseServer = createServerFn({ - method: 'GET' -}).handler(createClientRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); -export const withArrowFunction = createServerFn({ - method: 'GET' -}).handler(createClientRpc("a311dfd9a6554bc0bb9371ef4fbc72c852d0b5532829a2613a29157b8595a793")); +import { createClientRpc } from '@tanstack/react-start/client-rpc' +import { createServerFn } from '@tanstack/react-start' +export const withUseServer = createServerFn({ method: 'GET' }).handler( + createClientRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) +export const withArrowFunction = createServerFn({ method: 'GET' }).handler( + createClientRpc( + 'a311dfd9a6554bc0bb9371ef4fbc72c852d0b5532829a2613a29157b8595a793', + ), +) export const withArrowFunctionAndFunction = createServerFn({ - method: 'GET' -}).handler(createClientRpc("dbe1f77c6ea7590bce3212a75b06d3cee83b425bcf493014cb47462ef725e36e")); -export const withoutUseServer = createServerFn({ - method: 'GET' -}).handler(createClientRpc("c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2")); -export const withVariable = createServerFn({ - method: 'GET' -}).handler(createClientRpc("7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70")); -export const withZodValidator = createServerFn({ - method: 'GET' -}).handler(createClientRpc("43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3")); -export const withValidatorFn = createServerFn({ - method: 'GET' -}).handler(createClientRpc("5cf922ac733d835fee496964cbf0b4b4067cb43d51f2efa484d072e6bb7dae44")); \ No newline at end of file + method: 'GET', +}).handler( + createClientRpc( + 'dbe1f77c6ea7590bce3212a75b06d3cee83b425bcf493014cb47462ef725e36e', + ), +) +export const withoutUseServer = createServerFn({ method: 'GET' }).handler( + createClientRpc( + 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + ), +) +export const withVariable = createServerFn({ method: 'GET' }).handler( + createClientRpc( + '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + ), +) +export const withZodValidator = createServerFn({ method: 'GET' }).handler( + createClientRpc( + '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + ), +) +export const withValidatorFn = createServerFn({ method: 'GET' }).handler( + createClientRpc( + '5cf922ac733d835fee496964cbf0b4b4067cb43d51f2efa484d072e6bb7dae44', + ), +) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx index e55318337d..34e0c452b6 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx @@ -1,14 +1,22 @@ -import { createClientRpc } from '@tanstack/react-start/client-rpc'; -import { createServerFn as serverFn } from '@tanstack/react-start'; -export const withUseServer = serverFn({ - method: 'GET' -}).handler(createClientRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); -export const withoutUseServer = serverFn({ - method: 'GET' -}).handler(createClientRpc("c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2")); -export const withVariable = serverFn({ - method: 'GET' -}).handler(createClientRpc("7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70")); -export const withZodValidator = serverFn({ - method: 'GET' -}).handler(createClientRpc("43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3")); \ No newline at end of file +import { createClientRpc } from '@tanstack/react-start/client-rpc' +import { createServerFn as serverFn } from '@tanstack/react-start' +export const withUseServer = serverFn({ method: 'GET' }).handler( + createClientRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) +export const withoutUseServer = serverFn({ method: 'GET' }).handler( + createClientRpc( + 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + ), +) +export const withVariable = serverFn({ method: 'GET' }).handler( + createClientRpc( + '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + ), +) +export const withZodValidator = serverFn({ method: 'GET' }).handler( + createClientRpc( + '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + ), +) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx index 5b33829a38..2cea070645 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx @@ -1,14 +1,30 @@ -import { createClientRpc } from '@tanstack/react-start/client-rpc'; -import * as TanStackStart from '@tanstack/react-start'; +import { createClientRpc } from '@tanstack/react-start/client-rpc' +import * as TanStackStart from '@tanstack/react-start' export const withUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createClientRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); + method: 'GET', +}).handler( + createClientRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) export const withoutUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createClientRpc("c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2")); + method: 'GET', +}).handler( + createClientRpc( + 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + ), +) export const withVariable = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createClientRpc("7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70")); + method: 'GET', +}).handler( + createClientRpc( + '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + ), +) export const withZodValidator = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createClientRpc("43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3")); \ No newline at end of file + method: 'GET', +}).handler( + createClientRpc( + '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + ), +) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnValidator.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnValidator.tsx index 056535d0bc..97253672a6 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnValidator.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnValidator.tsx @@ -1,5 +1,7 @@ -import { createClientRpc } from '@tanstack/react-start/client-rpc'; -import { createServerFn } from '@tanstack/react-start'; -export const withUseServer = createServerFn({ - method: 'GET' -}).handler(createClientRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); \ No newline at end of file +import { createClientRpc } from '@tanstack/react-start/client-rpc' +import { createServerFn } from '@tanstack/react-start' +export const withUseServer = createServerFn({ method: 'GET' }).handler( + createClientRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/client/factory.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/factory.tsx index 436b8ab4cb..889c1fbf4e 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/client/factory.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/client/factory.tsx @@ -1,38 +1,34 @@ -import { createClientRpc } from '@tanstack/react-start/client-rpc'; -import { createServerFn, createMiddleware } from '@tanstack/react-start'; -const authMiddleware = createMiddleware({ - type: 'function' -}).server(({ - next -}) => { - return next({ - context: { - auth: 'auth' - } - }); -}); -const adminMiddleware = createMiddleware({ - type: 'function' -}).server(({ - next -}) => { - return next({ - context: { - admin: 'admin' - } - }); -}); -export const createAuthServerFn = createServerFn().middleware([authMiddleware]); -const createAdminServerFn = createAuthServerFn().middleware([adminMiddleware]); -export const myAuthedFn = createAuthServerFn().handler(createClientRpc("3bb88b23926fa224cea3dcfb877026757733d95b42e3b66cf7f06bb89dab06a3")); -export const deleteUserFn = createAdminServerFn().handler(createClientRpc("44d9483a9412daaacaa5a8aee6b02294333a0e61b5d3b17ba6bcb34fd2bdce31")); +import { createClientRpc } from '@tanstack/react-start/client-rpc' +import { createServerFn, createMiddleware } from '@tanstack/react-start' +const authMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { auth: 'auth' } }) + }, +) +const adminMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { admin: 'admin' } }) + }, +) +export const createAuthServerFn = createServerFn().middleware([authMiddleware]) +const createAdminServerFn = createAuthServerFn().middleware([adminMiddleware]) +export const myAuthedFn = createAuthServerFn().handler( + createClientRpc( + '3bb88b23926fa224cea3dcfb877026757733d95b42e3b66cf7f06bb89dab06a3', + ), +) +export const deleteUserFn = createAdminServerFn().handler( + createClientRpc( + '44d9483a9412daaacaa5a8aee6b02294333a0e61b5d3b17ba6bcb34fd2bdce31', + ), +) function createFakeFn() { return { - handler: cb => { - return cb(); - } - }; + handler: (cb) => { + return cb() + }, + } } const x = createFakeFn().handler(() => { - return 'fakeFn'; -}); \ No newline at end of file + return 'fakeFn' +}) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/client/isomorphic-fns.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/isomorphic-fns.tsx index 020d1346e4..8e09a57d37 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/client/isomorphic-fns.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/client/isomorphic-fns.tsx @@ -1,48 +1,49 @@ -import { createClientRpc } from '@tanstack/react-start/client-rpc'; -import { createFileRoute } from '@tanstack/react-router'; -import { createIsomorphicFn, createServerFn } from '@tanstack/react-start'; -import { useState } from 'react'; -const getEnv = createIsomorphicFn().server(() => 'server').client(() => 'client'); -const getServerEnv = createServerFn().handler(createClientRpc("6049dd46bc00e0980e387f3e74924b40e92f37634a3fe74a1a1facda9e9207c2")); -const getEcho = createIsomorphicFn().server((input: string) => 'server received ' + input).client(input => 'client received ' + input); -const getServerEcho = createServerFn().handler(createClientRpc("ebb82e0293952b7b1dde3f664dec4c139471c046d06d4dc4ca172f4f45e386d1")); +import { createClientRpc } from '@tanstack/react-start/client-rpc' +import { createFileRoute } from '@tanstack/react-router' +import { createIsomorphicFn, createServerFn } from '@tanstack/react-start' +import { useState } from 'react' +const getEnv = createIsomorphicFn() + .server(() => 'server') + .client(() => 'client') +const getServerEnv = createServerFn().handler( + createClientRpc( + '6049dd46bc00e0980e387f3e74924b40e92f37634a3fe74a1a1facda9e9207c2', + ), +) +const getEcho = createIsomorphicFn() + .server((input: string) => 'server received ' + input) + .client((input) => 'client received ' + input) +const getServerEcho = createServerFn().handler( + createClientRpc( + 'ebb82e0293952b7b1dde3f664dec4c139471c046d06d4dc4ca172f4f45e386d1', + ), +) export const Route = createFileRoute('/isomorphic-fns')({ component: RouteComponent, loader() { - return { - envOnLoad: getEnv() - }; - } -}); + return { envOnLoad: getEnv() } + }, +}) function RouteComponent() { - const { - envOnLoad - } = Route.useLoaderData(); - const [results, setResults] = useState>>(); + const { envOnLoad } = Route.useLoaderData() + const [results, setResults] = useState>>() async function handleClick() { - const envOnClick = getEnv(); - const echo = getEcho('hello'); - const [serverEnv, serverEcho] = await Promise.all([getServerEnv(), getServerEcho({ - data: 'hello' - })]); - setResults({ - envOnClick, - echo, - serverEnv, - serverEcho - }); + const envOnClick = getEnv() + const echo = getEcho('hello') + const [serverEnv, serverEcho] = await Promise.all([ + getServerEnv(), + getServerEcho({ data: 'hello' }), + ]) + setResults({ envOnClick, echo, serverEnv, serverEcho }) } - const { - envOnClick, - echo, - serverEnv, - serverEcho - } = results || {}; - return
+ const { envOnClick, echo, serverEnv, serverEcho } = results || {} + return ( +
- {!!results &&
+ {!!results && ( +

getEnv

@@ -62,6 +63,8 @@ function RouteComponent() { When we called the function on the client it returned:
{JSON.stringify(echo)}
-
} -
; -} \ No newline at end of file +
+ )} +
+ ) +} diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructured.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructured.tsx index 37c93d5c00..efa8f395d5 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructured.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructured.tsx @@ -1,24 +1,42 @@ -import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; -import { createServerFn } from '@tanstack/react-start'; -import { z } from 'zod'; -export const withUseServer = createServerFn({ - method: 'GET' -}).handler(createSsrRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); -export const withArrowFunction = createServerFn({ - method: 'GET' -}).handler(createSsrRpc("a311dfd9a6554bc0bb9371ef4fbc72c852d0b5532829a2613a29157b8595a793")); +import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' +import { createServerFn } from '@tanstack/react-start' +import { z } from 'zod' +export const withUseServer = createServerFn({ method: 'GET' }).handler( + createSsrRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) +export const withArrowFunction = createServerFn({ method: 'GET' }).handler( + createSsrRpc( + 'a311dfd9a6554bc0bb9371ef4fbc72c852d0b5532829a2613a29157b8595a793', + ), +) export const withArrowFunctionAndFunction = createServerFn({ - method: 'GET' -}).handler(createSsrRpc("dbe1f77c6ea7590bce3212a75b06d3cee83b425bcf493014cb47462ef725e36e")); -export const withoutUseServer = createServerFn({ - method: 'GET' -}).handler(createSsrRpc("c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2")); -export const withVariable = createServerFn({ - method: 'GET' -}).handler(createSsrRpc("7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70")); -export const withZodValidator = createServerFn({ - method: 'GET' -}).handler(createSsrRpc("43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3")); -export const withValidatorFn = createServerFn({ - method: 'GET' -}).validator(z.number()).handler(createSsrRpc("5cf922ac733d835fee496964cbf0b4b4067cb43d51f2efa484d072e6bb7dae44")); \ No newline at end of file + method: 'GET', +}).handler( + createSsrRpc( + 'dbe1f77c6ea7590bce3212a75b06d3cee83b425bcf493014cb47462ef725e36e', + ), +) +export const withoutUseServer = createServerFn({ method: 'GET' }).handler( + createSsrRpc( + 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + ), +) +export const withVariable = createServerFn({ method: 'GET' }).handler( + createSsrRpc( + '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + ), +) +export const withZodValidator = createServerFn({ method: 'GET' }).handler( + createSsrRpc( + '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + ), +) +export const withValidatorFn = createServerFn({ method: 'GET' }) + .validator(z.number()) + .handler( + createSsrRpc( + '5cf922ac733d835fee496964cbf0b4b4067cb43d51f2efa484d072e6bb7dae44', + ), + ) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructuredRename.tsx index 94a351ffa9..7088a4bc69 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructuredRename.tsx @@ -1,14 +1,22 @@ -import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; -import { createServerFn as serverFn } from '@tanstack/react-start'; -export const withUseServer = serverFn({ - method: 'GET' -}).handler(createSsrRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); -export const withoutUseServer = serverFn({ - method: 'GET' -}).handler(createSsrRpc("c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2")); -export const withVariable = serverFn({ - method: 'GET' -}).handler(createSsrRpc("7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70")); -export const withZodValidator = serverFn({ - method: 'GET' -}).handler(createSsrRpc("43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3")); \ No newline at end of file +import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' +import { createServerFn as serverFn } from '@tanstack/react-start' +export const withUseServer = serverFn({ method: 'GET' }).handler( + createSsrRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) +export const withoutUseServer = serverFn({ method: 'GET' }).handler( + createSsrRpc( + 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + ), +) +export const withVariable = serverFn({ method: 'GET' }).handler( + createSsrRpc( + '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + ), +) +export const withZodValidator = serverFn({ method: 'GET' }).handler( + createSsrRpc( + '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + ), +) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnStarImport.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnStarImport.tsx index 74d22a2fc4..899aaf3d0d 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnStarImport.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnStarImport.tsx @@ -1,14 +1,30 @@ -import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; -import * as TanStackStart from '@tanstack/react-start'; +import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' +import * as TanStackStart from '@tanstack/react-start' export const withUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createSsrRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); + method: 'GET', +}).handler( + createSsrRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) export const withoutUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createSsrRpc("c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2")); + method: 'GET', +}).handler( + createSsrRpc( + 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + ), +) export const withVariable = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createSsrRpc("7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70")); + method: 'GET', +}).handler( + createSsrRpc( + '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + ), +) export const withZodValidator = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createSsrRpc("43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3")); \ No newline at end of file + method: 'GET', +}).handler( + createSsrRpc( + '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + ), +) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnValidator.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnValidator.tsx index 59fb4d2fd9..e1d136311b 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnValidator.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnValidator.tsx @@ -1,6 +1,10 @@ -import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; -import { createServerFn } from '@tanstack/react-start'; -import { z } from 'zod'; -export const withUseServer = createServerFn({ - method: 'GET' -}).validator(z.number()).handler(createSsrRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); \ No newline at end of file +import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' +import { createServerFn } from '@tanstack/react-start' +import { z } from 'zod' +export const withUseServer = createServerFn({ method: 'GET' }) + .validator(z.number()) + .handler( + createSsrRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), + ) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/factory.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/factory.tsx index e82ca932e8..ab19c3e1f8 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/factory.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/factory.tsx @@ -1,38 +1,34 @@ -import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; -import { createServerFn, createMiddleware } from '@tanstack/react-start'; -const authMiddleware = createMiddleware({ - type: 'function' -}).server(({ - next -}) => { - return next({ - context: { - auth: 'auth' - } - }); -}); -const adminMiddleware = createMiddleware({ - type: 'function' -}).server(({ - next -}) => { - return next({ - context: { - admin: 'admin' - } - }); -}); -export const createAuthServerFn = createServerFn().middleware([authMiddleware]); -const createAdminServerFn = createAuthServerFn().middleware([adminMiddleware]); -export const myAuthedFn = createAuthServerFn().handler(createSsrRpc("3bb88b23926fa224cea3dcfb877026757733d95b42e3b66cf7f06bb89dab06a3")); -export const deleteUserFn = createAdminServerFn().handler(createSsrRpc("44d9483a9412daaacaa5a8aee6b02294333a0e61b5d3b17ba6bcb34fd2bdce31")); +import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' +import { createServerFn, createMiddleware } from '@tanstack/react-start' +const authMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { auth: 'auth' } }) + }, +) +const adminMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { admin: 'admin' } }) + }, +) +export const createAuthServerFn = createServerFn().middleware([authMiddleware]) +const createAdminServerFn = createAuthServerFn().middleware([adminMiddleware]) +export const myAuthedFn = createAuthServerFn().handler( + createSsrRpc( + '3bb88b23926fa224cea3dcfb877026757733d95b42e3b66cf7f06bb89dab06a3', + ), +) +export const deleteUserFn = createAdminServerFn().handler( + createSsrRpc( + '44d9483a9412daaacaa5a8aee6b02294333a0e61b5d3b17ba6bcb34fd2bdce31', + ), +) function createFakeFn() { return { - handler: cb => { - return cb(); - } - }; + handler: (cb) => { + return cb() + }, + } } const x = createFakeFn().handler(() => { - return 'fakeFn'; -}); \ No newline at end of file + return 'fakeFn' +}) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/isomorphic-fns.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/isomorphic-fns.tsx index d56d81fdda..cfefad2bfb 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/isomorphic-fns.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/isomorphic-fns.tsx @@ -1,48 +1,51 @@ -import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; -import { createFileRoute } from '@tanstack/react-router'; -import { createIsomorphicFn, createServerFn } from '@tanstack/react-start'; -import { useState } from 'react'; -const getEnv = createIsomorphicFn().server(() => 'server').client(() => 'client'); -const getServerEnv = createServerFn().handler(createSsrRpc("6049dd46bc00e0980e387f3e74924b40e92f37634a3fe74a1a1facda9e9207c2")); -const getEcho = createIsomorphicFn().server((input: string) => 'server received ' + input).client(input => 'client received ' + input); -const getServerEcho = createServerFn().validator((input: string) => input).handler(createSsrRpc("ebb82e0293952b7b1dde3f664dec4c139471c046d06d4dc4ca172f4f45e386d1")); +import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' +import { createFileRoute } from '@tanstack/react-router' +import { createIsomorphicFn, createServerFn } from '@tanstack/react-start' +import { useState } from 'react' +const getEnv = createIsomorphicFn() + .server(() => 'server') + .client(() => 'client') +const getServerEnv = createServerFn().handler( + createSsrRpc( + '6049dd46bc00e0980e387f3e74924b40e92f37634a3fe74a1a1facda9e9207c2', + ), +) +const getEcho = createIsomorphicFn() + .server((input: string) => 'server received ' + input) + .client((input) => 'client received ' + input) +const getServerEcho = createServerFn() + .validator((input: string) => input) + .handler( + createSsrRpc( + 'ebb82e0293952b7b1dde3f664dec4c139471c046d06d4dc4ca172f4f45e386d1', + ), + ) export const Route = createFileRoute('/isomorphic-fns')({ component: RouteComponent, loader() { - return { - envOnLoad: getEnv() - }; - } -}); + return { envOnLoad: getEnv() } + }, +}) function RouteComponent() { - const { - envOnLoad - } = Route.useLoaderData(); - const [results, setResults] = useState>>(); + const { envOnLoad } = Route.useLoaderData() + const [results, setResults] = useState>>() async function handleClick() { - const envOnClick = getEnv(); - const echo = getEcho('hello'); - const [serverEnv, serverEcho] = await Promise.all([getServerEnv(), getServerEcho({ - data: 'hello' - })]); - setResults({ - envOnClick, - echo, - serverEnv, - serverEcho - }); + const envOnClick = getEnv() + const echo = getEcho('hello') + const [serverEnv, serverEcho] = await Promise.all([ + getServerEnv(), + getServerEcho({ data: 'hello' }), + ]) + setResults({ envOnClick, echo, serverEnv, serverEcho }) } - const { - envOnClick, - echo, - serverEnv, - serverEcho - } = results || {}; - return
+ const { envOnClick, echo, serverEnv, serverEcho } = results || {} + return ( +
- {!!results &&
+ {!!results && ( +

getEnv

@@ -62,6 +65,8 @@ function RouteComponent() { When we called the function on the client it returned:
{JSON.stringify(echo)}
-
} -
; -} \ No newline at end of file +
+ )} +
+ ) +} diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructured.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructured.tsx index 7459b65cc0..3bc4879c14 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructured.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructured.tsx @@ -1,86 +1,126 @@ -import { createServerRpc } from '@tanstack/react-start/server-rpc'; -import { createServerFn } from '@tanstack/react-start'; -import { z } from 'zod'; -const withUseServer_createServerFn_handler = createServerRpc({ - id: "b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320", - name: "withUseServer", - filename: "src/test.ts" -}, opts => withUseServer.__executeServer(opts)); -const withUseServer = createServerFn({ - method: 'GET' -}).handler(withUseServer_createServerFn_handler, async function () { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -const withArrowFunction_createServerFn_handler = createServerRpc({ - id: "a311dfd9a6554bc0bb9371ef4fbc72c852d0b5532829a2613a29157b8595a793", - name: "withArrowFunction", - filename: "src/test.ts" -}, opts => withArrowFunction.__executeServer(opts)); -const withArrowFunction = createServerFn({ - method: 'GET' -}).handler(withArrowFunction_createServerFn_handler, async () => null); -const withArrowFunctionAndFunction_createServerFn_handler = createServerRpc({ - id: "dbe1f77c6ea7590bce3212a75b06d3cee83b425bcf493014cb47462ef725e36e", - name: "withArrowFunctionAndFunction", - filename: "src/test.ts" -}, opts => withArrowFunctionAndFunction.__executeServer(opts)); -const withArrowFunctionAndFunction = createServerFn({ - method: 'GET' -}).handler(withArrowFunctionAndFunction_createServerFn_handler, async () => test()); -const withoutUseServer_createServerFn_handler = createServerRpc({ - id: "c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2", - name: "withoutUseServer", - filename: "src/test.ts" -}, opts => withoutUseServer.__executeServer(opts)); -const withoutUseServer = createServerFn({ - method: 'GET' -}).handler(withoutUseServer_createServerFn_handler, async () => { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -const withVariable_createServerFn_handler = createServerRpc({ - id: "7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70", - name: "withVariable", - filename: "src/test.ts" -}, opts => withVariable.__executeServer(opts)); -const withVariable = createServerFn({ - method: 'GET' -}).handler(withVariable_createServerFn_handler, abstractedFunction); +import { createServerRpc } from '@tanstack/react-start/server-rpc' +import { createServerFn } from '@tanstack/react-start' +import { z } from 'zod' +const withUseServer_createServerFn_handler = createServerRpc( + { + id: 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + name: 'withUseServer', + filename: 'src/test.ts', + }, + (opts) => withUseServer.__executeServer(opts), +) +const withUseServer = createServerFn({ method: 'GET' }).handler( + withUseServer_createServerFn_handler, + async function () { + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) +const withArrowFunction_createServerFn_handler = createServerRpc( + { + id: 'a311dfd9a6554bc0bb9371ef4fbc72c852d0b5532829a2613a29157b8595a793', + name: 'withArrowFunction', + filename: 'src/test.ts', + }, + (opts) => withArrowFunction.__executeServer(opts), +) +const withArrowFunction = createServerFn({ method: 'GET' }).handler( + withArrowFunction_createServerFn_handler, + async () => null, +) +const withArrowFunctionAndFunction_createServerFn_handler = createServerRpc( + { + id: 'dbe1f77c6ea7590bce3212a75b06d3cee83b425bcf493014cb47462ef725e36e', + name: 'withArrowFunctionAndFunction', + filename: 'src/test.ts', + }, + (opts) => withArrowFunctionAndFunction.__executeServer(opts), +) +const withArrowFunctionAndFunction = createServerFn({ method: 'GET' }).handler( + withArrowFunctionAndFunction_createServerFn_handler, + async () => test(), +) +const withoutUseServer_createServerFn_handler = createServerRpc( + { + id: 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + name: 'withoutUseServer', + filename: 'src/test.ts', + }, + (opts) => withoutUseServer.__executeServer(opts), +) +const withoutUseServer = createServerFn({ method: 'GET' }).handler( + withoutUseServer_createServerFn_handler, + async () => { + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) +const withVariable_createServerFn_handler = createServerRpc( + { + id: '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + name: 'withVariable', + filename: 'src/test.ts', + }, + (opts) => withVariable.__executeServer(opts), +) +const withVariable = createServerFn({ method: 'GET' }).handler( + withVariable_createServerFn_handler, + abstractedFunction, +) async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) } -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { +function zodValidator( + schema: TSchema, + fn: (input: z.output) => TResult, +) { return async (input: unknown) => { - return fn(schema.parse(input)); - }; + return fn(schema.parse(input)) + } +} +const withZodValidator_createServerFn_handler = createServerRpc( + { + id: '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + name: 'withZodValidator', + filename: 'src/test.ts', + }, + (opts) => withZodValidator.__executeServer(opts), +) +const withZodValidator = createServerFn({ method: 'GET' }).handler( + withZodValidator_createServerFn_handler, + zodValidator(z.number(), (input) => { + return { 'you gave': input } + }), +) +const withValidatorFn_createServerFn_handler = createServerRpc( + { + id: '5cf922ac733d835fee496964cbf0b4b4067cb43d51f2efa484d072e6bb7dae44', + name: 'withValidatorFn', + filename: 'src/test.ts', + }, + (opts) => withValidatorFn.__executeServer(opts), +) +const withValidatorFn = createServerFn({ method: 'GET' }) + .validator(z.number()) + .handler(withValidatorFn_createServerFn_handler, async ({ input }) => { + return null + }) +export { + withUseServer_createServerFn_handler, + withArrowFunction_createServerFn_handler, + withArrowFunctionAndFunction_createServerFn_handler, + withoutUseServer_createServerFn_handler, + withVariable_createServerFn_handler, + withZodValidator_createServerFn_handler, + withValidatorFn_createServerFn_handler, } -const withZodValidator_createServerFn_handler = createServerRpc({ - id: "43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3", - name: "withZodValidator", - filename: "src/test.ts" -}, opts => withZodValidator.__executeServer(opts)); -const withZodValidator = createServerFn({ - method: 'GET' -}).handler(withZodValidator_createServerFn_handler, zodValidator(z.number(), input => { - return { - 'you gave': input - }; -})); -const withValidatorFn_createServerFn_handler = createServerRpc({ - id: "5cf922ac733d835fee496964cbf0b4b4067cb43d51f2efa484d072e6bb7dae44", - name: "withValidatorFn", - filename: "src/test.ts" -}, opts => withValidatorFn.__executeServer(opts)); -const withValidatorFn = createServerFn({ - method: 'GET' -}).validator(z.number()).handler(withValidatorFn_createServerFn_handler, async ({ - input -}) => { - return null; -}); -export { withUseServer_createServerFn_handler, withArrowFunction_createServerFn_handler, withArrowFunctionAndFunction_createServerFn_handler, withoutUseServer_createServerFn_handler, withVariable_createServerFn_handler, withZodValidator_createServerFn_handler, withValidatorFn_createServerFn_handler }; \ No newline at end of file diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructuredRename.tsx index fd5a36351b..775c32b645 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructuredRename.tsx @@ -1,58 +1,86 @@ -import { createServerRpc } from '@tanstack/react-start/server-rpc'; -import { createServerFn as serverFn } from '@tanstack/react-start'; -import { z } from 'zod'; -const withUseServer_createServerFn_handler = createServerRpc({ - id: "b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320", - name: "withUseServer", - filename: "src/test.ts" -}, opts => withUseServer.__executeServer(opts)); -const withUseServer = serverFn({ - method: 'GET' -}).handler(withUseServer_createServerFn_handler, async function () { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -const withoutUseServer_createServerFn_handler = createServerRpc({ - id: "c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2", - name: "withoutUseServer", - filename: "src/test.ts" -}, opts => withoutUseServer.__executeServer(opts)); -const withoutUseServer = serverFn({ - method: 'GET' -}).handler(withoutUseServer_createServerFn_handler, async () => { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -const withVariable_createServerFn_handler = createServerRpc({ - id: "7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70", - name: "withVariable", - filename: "src/test.ts" -}, opts => withVariable.__executeServer(opts)); -const withVariable = serverFn({ - method: 'GET' -}).handler(withVariable_createServerFn_handler, abstractedFunction); +import { createServerRpc } from '@tanstack/react-start/server-rpc' +import { createServerFn as serverFn } from '@tanstack/react-start' +import { z } from 'zod' +const withUseServer_createServerFn_handler = createServerRpc( + { + id: 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + name: 'withUseServer', + filename: 'src/test.ts', + }, + (opts) => withUseServer.__executeServer(opts), +) +const withUseServer = serverFn({ method: 'GET' }).handler( + withUseServer_createServerFn_handler, + async function () { + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) +const withoutUseServer_createServerFn_handler = createServerRpc( + { + id: 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + name: 'withoutUseServer', + filename: 'src/test.ts', + }, + (opts) => withoutUseServer.__executeServer(opts), +) +const withoutUseServer = serverFn({ method: 'GET' }).handler( + withoutUseServer_createServerFn_handler, + async () => { + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) +const withVariable_createServerFn_handler = createServerRpc( + { + id: '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + name: 'withVariable', + filename: 'src/test.ts', + }, + (opts) => withVariable.__executeServer(opts), +) +const withVariable = serverFn({ method: 'GET' }).handler( + withVariable_createServerFn_handler, + abstractedFunction, +) async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) } -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { +function zodValidator( + schema: TSchema, + fn: (input: z.output) => TResult, +) { return async (input: unknown) => { - return fn(schema.parse(input)); - }; + return fn(schema.parse(input)) + } +} +const withZodValidator_createServerFn_handler = createServerRpc( + { + id: '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + name: 'withZodValidator', + filename: 'src/test.ts', + }, + (opts) => withZodValidator.__executeServer(opts), +) +const withZodValidator = serverFn({ method: 'GET' }).handler( + withZodValidator_createServerFn_handler, + zodValidator(z.number(), (input) => { + return { 'you gave': input } + }), +) +export { + withUseServer_createServerFn_handler, + withoutUseServer_createServerFn_handler, + withVariable_createServerFn_handler, + withZodValidator_createServerFn_handler, } -const withZodValidator_createServerFn_handler = createServerRpc({ - id: "43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3", - name: "withZodValidator", - filename: "src/test.ts" -}, opts => withZodValidator.__executeServer(opts)); -const withZodValidator = serverFn({ - method: 'GET' -}).handler(withZodValidator_createServerFn_handler, zodValidator(z.number(), input => { - return { - 'you gave': input - }; -})); -export { withUseServer_createServerFn_handler, withoutUseServer_createServerFn_handler, withVariable_createServerFn_handler, withZodValidator_createServerFn_handler }; \ No newline at end of file diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnStarImport.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnStarImport.tsx index e759e35f42..bc18c08855 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnStarImport.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnStarImport.tsx @@ -1,60 +1,88 @@ -import { createServerRpc } from '@tanstack/react-start/server-rpc'; -import * as TanStackStart from '@tanstack/react-start'; -import { z } from 'zod'; -const withUseServer_createServerFn_handler = createServerRpc({ - id: "b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320", - name: "withUseServer", - filename: "src/test.ts" -}, opts => withUseServer.__executeServer(opts)); -const withUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler(withUseServer_createServerFn_handler, async function () { - 'use server'; - - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -const withoutUseServer_createServerFn_handler = createServerRpc({ - id: "c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2", - name: "withoutUseServer", - filename: "src/test.ts" -}, opts => withoutUseServer.__executeServer(opts)); +import { createServerRpc } from '@tanstack/react-start/server-rpc' +import * as TanStackStart from '@tanstack/react-start' +import { z } from 'zod' +const withUseServer_createServerFn_handler = createServerRpc( + { + id: 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + name: 'withUseServer', + filename: 'src/test.ts', + }, + (opts) => withUseServer.__executeServer(opts), +) +const withUseServer = TanStackStart.createServerFn({ method: 'GET' }).handler( + withUseServer_createServerFn_handler, + async function () { + 'use server' + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) +const withoutUseServer_createServerFn_handler = createServerRpc( + { + id: 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + name: 'withoutUseServer', + filename: 'src/test.ts', + }, + (opts) => withoutUseServer.__executeServer(opts), +) const withoutUseServer = TanStackStart.createServerFn({ - method: 'GET' + method: 'GET', }).handler(withoutUseServer_createServerFn_handler, async () => { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -const withVariable_createServerFn_handler = createServerRpc({ - id: "7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70", - name: "withVariable", - filename: "src/test.ts" -}, opts => withVariable.__executeServer(opts)); -const withVariable = TanStackStart.createServerFn({ - method: 'GET' -}).handler(withVariable_createServerFn_handler, abstractedFunction); + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) +}) +const withVariable_createServerFn_handler = createServerRpc( + { + id: '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + name: 'withVariable', + filename: 'src/test.ts', + }, + (opts) => withVariable.__executeServer(opts), +) +const withVariable = TanStackStart.createServerFn({ method: 'GET' }).handler( + withVariable_createServerFn_handler, + abstractedFunction, +) async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) } -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { +function zodValidator( + schema: TSchema, + fn: (input: z.output) => TResult, +) { return async (input: unknown) => { - return fn(schema.parse(input)); - }; + return fn(schema.parse(input)) + } } -const withZodValidator_createServerFn_handler = createServerRpc({ - id: "43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3", - name: "withZodValidator", - filename: "src/test.ts" -}, opts => withZodValidator.__executeServer(opts)); +const withZodValidator_createServerFn_handler = createServerRpc( + { + id: '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + name: 'withZodValidator', + filename: 'src/test.ts', + }, + (opts) => withZodValidator.__executeServer(opts), +) const withZodValidator = TanStackStart.createServerFn({ - method: 'GET' -}).handler(withZodValidator_createServerFn_handler, zodValidator(z.number(), input => { - return { - 'you gave': input - }; -})); -export { withUseServer_createServerFn_handler, withoutUseServer_createServerFn_handler, withVariable_createServerFn_handler, withZodValidator_createServerFn_handler }; \ No newline at end of file + method: 'GET', +}).handler( + withZodValidator_createServerFn_handler, + zodValidator(z.number(), (input) => { + return { 'you gave': input } + }), +) +export { + withUseServer_createServerFn_handler, + withoutUseServer_createServerFn_handler, + withVariable_createServerFn_handler, + withZodValidator_createServerFn_handler, +} diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnValidator.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnValidator.tsx index 66bcb9376e..f62fa718d6 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnValidator.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnValidator.tsx @@ -1,14 +1,15 @@ -import { createServerRpc } from '@tanstack/react-start/server-rpc'; -import { createServerFn } from '@tanstack/react-start'; -import { z } from 'zod'; -const withUseServer_createServerFn_handler = createServerRpc({ - id: "b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320", - name: "withUseServer", - filename: "src/test.ts" -}, opts => withUseServer.__executeServer(opts)); -const withUseServer = createServerFn({ - method: 'GET' -}).validator(z.number()).handler(withUseServer_createServerFn_handler, ({ - input -}) => input + 1); -export { withUseServer_createServerFn_handler }; \ No newline at end of file +import { createServerRpc } from '@tanstack/react-start/server-rpc' +import { createServerFn } from '@tanstack/react-start' +import { z } from 'zod' +const withUseServer_createServerFn_handler = createServerRpc( + { + id: 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + name: 'withUseServer', + filename: 'src/test.ts', + }, + (opts) => withUseServer.__executeServer(opts), +) +const withUseServer = createServerFn({ method: 'GET' }) + .validator(z.number()) + .handler(withUseServer_createServerFn_handler, ({ input }) => input + 1) +export { withUseServer_createServerFn_handler } diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/factory.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/factory.tsx index 5a2c26fe0b..26298edd56 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/factory.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/factory.tsx @@ -1,53 +1,56 @@ -import { createServerRpc } from '@tanstack/react-start/server-rpc'; -import { createServerFn, createMiddleware } from '@tanstack/react-start'; -const authMiddleware = createMiddleware({ - type: 'function' -}).server(({ - next -}) => { - return next({ - context: { - auth: 'auth' - } - }); -}); -const adminMiddleware = createMiddleware({ - type: 'function' -}).server(({ - next -}) => { - return next({ - context: { - admin: 'admin' - } - }); -}); -const createAuthServerFn = createServerFn().middleware([authMiddleware]); -const createAdminServerFn = createAuthServerFn().middleware([adminMiddleware]); -const myAuthedFn_createServerFn_handler = createServerRpc({ - id: "3bb88b23926fa224cea3dcfb877026757733d95b42e3b66cf7f06bb89dab06a3", - name: "myAuthedFn", - filename: "src/test.ts" -}, opts => myAuthedFn.__executeServer(opts)); -const myAuthedFn = createAuthServerFn().handler(myAuthedFn_createServerFn_handler, () => { - return 'myAuthedFn'; -}); -const deleteUserFn_createServerFn_handler = createServerRpc({ - id: "44d9483a9412daaacaa5a8aee6b02294333a0e61b5d3b17ba6bcb34fd2bdce31", - name: "deleteUserFn", - filename: "src/test.ts" -}, opts => deleteUserFn.__executeServer(opts)); -const deleteUserFn = createAdminServerFn().handler(deleteUserFn_createServerFn_handler, () => { - return 'deleteUserFn'; -}); +import { createServerRpc } from '@tanstack/react-start/server-rpc' +import { createServerFn, createMiddleware } from '@tanstack/react-start' +const authMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { auth: 'auth' } }) + }, +) +const adminMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { admin: 'admin' } }) + }, +) +const createAuthServerFn = createServerFn().middleware([authMiddleware]) +const createAdminServerFn = createAuthServerFn().middleware([adminMiddleware]) +const myAuthedFn_createServerFn_handler = createServerRpc( + { + id: '3bb88b23926fa224cea3dcfb877026757733d95b42e3b66cf7f06bb89dab06a3', + name: 'myAuthedFn', + filename: 'src/test.ts', + }, + (opts) => myAuthedFn.__executeServer(opts), +) +const myAuthedFn = createAuthServerFn().handler( + myAuthedFn_createServerFn_handler, + () => { + return 'myAuthedFn' + }, +) +const deleteUserFn_createServerFn_handler = createServerRpc( + { + id: '44d9483a9412daaacaa5a8aee6b02294333a0e61b5d3b17ba6bcb34fd2bdce31', + name: 'deleteUserFn', + filename: 'src/test.ts', + }, + (opts) => deleteUserFn.__executeServer(opts), +) +const deleteUserFn = createAdminServerFn().handler( + deleteUserFn_createServerFn_handler, + () => { + return 'deleteUserFn' + }, +) function createFakeFn() { return { - handler: cb => { - return cb(); - } - }; + handler: (cb) => { + return cb() + }, + } } const x = createFakeFn().handler(() => { - return 'fakeFn'; -}); -export { myAuthedFn_createServerFn_handler, deleteUserFn_createServerFn_handler }; \ No newline at end of file + return 'fakeFn' +}) +export { + myAuthedFn_createServerFn_handler, + deleteUserFn_createServerFn_handler, +} diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/isomorphic-fns.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/isomorphic-fns.tsx index a65629abd0..3ae8622683 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/isomorphic-fns.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/isomorphic-fns.tsx @@ -1,19 +1,35 @@ -import { createServerRpc } from '@tanstack/react-start/server-rpc'; -import { createIsomorphicFn, createServerFn } from '@tanstack/react-start'; -const getEnv = createIsomorphicFn().server(() => 'server').client(() => 'client'); -const getServerEnv_createServerFn_handler = createServerRpc({ - id: "6049dd46bc00e0980e387f3e74924b40e92f37634a3fe74a1a1facda9e9207c2", - name: "getServerEnv", - filename: "src/test.ts" -}, opts => getServerEnv.__executeServer(opts)); -const getServerEnv = createServerFn().handler(getServerEnv_createServerFn_handler, () => getEnv()); -const getEcho = createIsomorphicFn().server((input: string) => 'server received ' + input).client(input => 'client received ' + input); -const getServerEcho_createServerFn_handler = createServerRpc({ - id: "ebb82e0293952b7b1dde3f664dec4c139471c046d06d4dc4ca172f4f45e386d1", - name: "getServerEcho", - filename: "src/test.ts" -}, opts => getServerEcho.__executeServer(opts)); -const getServerEcho = createServerFn().validator((input: string) => input).handler(getServerEcho_createServerFn_handler, ({ - data -}) => getEcho(data)); -export { getServerEnv_createServerFn_handler, getServerEcho_createServerFn_handler }; \ No newline at end of file +import { createServerRpc } from '@tanstack/react-start/server-rpc' +import { createIsomorphicFn, createServerFn } from '@tanstack/react-start' +const getEnv = createIsomorphicFn() + .server(() => 'server') + .client(() => 'client') +const getServerEnv_createServerFn_handler = createServerRpc( + { + id: '6049dd46bc00e0980e387f3e74924b40e92f37634a3fe74a1a1facda9e9207c2', + name: 'getServerEnv', + filename: 'src/test.ts', + }, + (opts) => getServerEnv.__executeServer(opts), +) +const getServerEnv = createServerFn().handler( + getServerEnv_createServerFn_handler, + () => getEnv(), +) +const getEcho = createIsomorphicFn() + .server((input: string) => 'server received ' + input) + .client((input) => 'client received ' + input) +const getServerEcho_createServerFn_handler = createServerRpc( + { + id: 'ebb82e0293952b7b1dde3f664dec4c139471c046d06d4dc4ca172f4f45e386d1', + name: 'getServerEcho', + filename: 'src/test.ts', + }, + (opts) => getServerEcho.__executeServer(opts), +) +const getServerEcho = createServerFn() + .validator((input: string) => input) + .handler(getServerEcho_createServerFn_handler, ({ data }) => getEcho(data)) +export { + getServerEnv_createServerFn_handler, + getServerEcho_createServerFn_handler, +} diff --git a/packages/start-plugin-core/tests/envOnly/envOnly.test.ts b/packages/start-plugin-core/tests/envOnly/envOnly.test.ts index 128e4f4162..4c18f2da81 100644 --- a/packages/start-plugin-core/tests/envOnly/envOnly.test.ts +++ b/packages/start-plugin-core/tests/envOnly/envOnly.test.ts @@ -3,6 +3,7 @@ import path from 'node:path' import { describe, expect, test } from 'vitest' import { StartCompiler } from '../../src/start-compiler/compiler' +import { formatSnapshot } from '../format-snapshot' // Default test options for StartCompiler function getDefaultTestOptions(env: 'client' | 'server') { @@ -73,9 +74,9 @@ describe('envOnly functions compile correctly', async () => { id: filename, }) - await expect(compiledResult!.code).toMatchFileSnapshot( - `./snapshots/${env}/${filename}`, - ) + await expect( + await formatSnapshot(compiledResult!.code, filename), + ).toMatchFileSnapshot(`./snapshots/${env}/${filename}`) }, ) }) diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructured.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructured.tsx index d56ad1f374..8c97577305 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructured.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructured.tsx @@ -1,4 +1,6 @@ const serverFunc = () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); -}; -const clientFunc = () => 'client'; \ No newline at end of file + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) +} +const clientFunc = () => 'client' diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx index d56ad1f374..8c97577305 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx @@ -1,4 +1,6 @@ const serverFunc = () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); -}; -const clientFunc = () => 'client'; \ No newline at end of file + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) +} +const clientFunc = () => 'client' diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyExportedAlias.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyExportedAlias.tsx index ee84019143..cad8d612c9 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyExportedAlias.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyExportedAlias.tsx @@ -1,6 +1,10 @@ export const fn = () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); -}; + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) +} export const wrappedFn = (() => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); -}) as () => string; \ No newline at end of file + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) +}) as () => string diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyFactory.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyFactory.tsx index 6a29fcbfe6..b226e30116 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyFactory.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyFactory.tsx @@ -1,32 +1,34 @@ // Server-only function factory export function createServerFactory(name: string) { return () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); - }; + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) + } } - // Client-only function factory export function createClientFactory(name: string) { return () => { - console.log(`Client only: ${name}`); - return `client-${name}`; - }; + console.log(`Client only: ${name}`) + return `client-${name}` + } } - // Arrow function server factory export const createServerArrowFactory = (prefix: string) => { return () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); - }; -}; - + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) + } +} // Arrow function client factory export const createClientArrowFactory = (prefix: string) => { - return () => `${prefix}-client`; -}; - + return () => `${prefix}-client` +} // Top-level for comparison export const topLevelServerFn = () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); -}; -export const topLevelClientFn = () => 'client'; \ No newline at end of file + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) +} +export const topLevelClientFn = () => 'client' diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyStarImport.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyStarImport.tsx index d56ad1f374..8c97577305 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyStarImport.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyStarImport.tsx @@ -1,4 +1,6 @@ const serverFunc = () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); -}; -const clientFunc = () => 'client'; \ No newline at end of file + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) +} +const clientFunc = () => 'client' diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructured.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructured.tsx index 5373578295..924d8d2442 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructured.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructured.tsx @@ -1,4 +1,6 @@ -const serverFunc = () => 'server'; +const serverFunc = () => 'server' const clientFunc = () => { - throw new Error("createClientOnlyFn() functions can only be called on the client!"); -}; \ No newline at end of file + throw new Error( + 'createClientOnlyFn() functions can only be called on the client!', + ) +} diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx index 5373578295..924d8d2442 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx @@ -1,4 +1,6 @@ -const serverFunc = () => 'server'; +const serverFunc = () => 'server' const clientFunc = () => { - throw new Error("createClientOnlyFn() functions can only be called on the client!"); -}; \ No newline at end of file + throw new Error( + 'createClientOnlyFn() functions can only be called on the client!', + ) +} diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyExportedAlias.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyExportedAlias.tsx index 8f906790b8..078c324406 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyExportedAlias.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyExportedAlias.tsx @@ -1,2 +1,2 @@ -export const fn = () => 'server-only-value'; -export const wrappedFn = (() => 'wrapped-server-only-value') as () => string; \ No newline at end of file +export const fn = () => 'server-only-value' +export const wrappedFn = (() => 'wrapped-server-only-value') as () => string diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyFactory.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyFactory.tsx index 58b2483a48..fdb022bc0d 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyFactory.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyFactory.tsx @@ -1,32 +1,34 @@ // Server-only function factory export function createServerFactory(name: string) { return () => { - console.log(`Server only: ${name}`); - return `server-${name}`; - }; + console.log(`Server only: ${name}`) + return `server-${name}` + } } - // Client-only function factory export function createClientFactory(name: string) { return () => { - throw new Error("createClientOnlyFn() functions can only be called on the client!"); - }; + throw new Error( + 'createClientOnlyFn() functions can only be called on the client!', + ) + } } - // Arrow function server factory export const createServerArrowFactory = (prefix: string) => { - return () => `${prefix}-server`; -}; - + return () => `${prefix}-server` +} // Arrow function client factory export const createClientArrowFactory = (prefix: string) => { return () => { - throw new Error("createClientOnlyFn() functions can only be called on the client!"); - }; -}; - + throw new Error( + 'createClientOnlyFn() functions can only be called on the client!', + ) + } +} // Top-level for comparison -export const topLevelServerFn = () => 'server'; +export const topLevelServerFn = () => 'server' export const topLevelClientFn = () => { - throw new Error("createClientOnlyFn() functions can only be called on the client!"); -}; \ No newline at end of file + throw new Error( + 'createClientOnlyFn() functions can only be called on the client!', + ) +} diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyStarImport.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyStarImport.tsx index 5373578295..924d8d2442 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyStarImport.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyStarImport.tsx @@ -1,4 +1,6 @@ -const serverFunc = () => 'server'; +const serverFunc = () => 'server' const clientFunc = () => { - throw new Error("createClientOnlyFn() functions can only be called on the client!"); -}; \ No newline at end of file + throw new Error( + 'createClientOnlyFn() functions can only be called on the client!', + ) +} diff --git a/packages/start-plugin-core/tests/format-snapshot.ts b/packages/start-plugin-core/tests/format-snapshot.ts new file mode 100644 index 0000000000..d152094bea --- /dev/null +++ b/packages/start-plugin-core/tests/format-snapshot.ts @@ -0,0 +1,69 @@ +import { format } from 'prettier' +import { parsers } from 'prettier/plugins/typescript' +import type { ParserOptions } from 'prettier' + +/** + * Formats compiler output before it is compared with a file snapshot, so that + * snapshots record the emitted program instead of the layout choices of the + * code generator (object wrapping, blank lines, parentheses around JSX, ...). + * + * Comments are kept: they are part of the output. Output that does not parse + * is returned unchanged. + */ +export async function formatSnapshot(code: string, filepath: string) { + try { + return await format(await removeBlankLines(code, filepath), { + filepath, + parser: 'typescript', + semi: false, + singleQuote: true, + trailingComma: 'all', + // Do not keep an object expanded because the generator printed it + // over several lines. + objectWrap: 'collapse', + }) + } catch { + return code + } +} + +/** + * Prettier keeps single blank lines from its input. Outside template literals, + * line breaks are not significant, so blank lines can be dropped. + */ +async function removeBlankLines(code: string, filepath: string) { + const parser = parsers.typescript + const ast = await parser.parse(code, { filepath } as ParserOptions) + const templateRanges: Array<[number, number]> = [] + const visit = (node: unknown): void => { + if (Array.isArray(node)) { + node.forEach(visit) + return + } + if (!node || typeof node !== 'object') { + return + } + if ((node as { type?: unknown }).type === 'TemplateElement') { + templateRanges.push([parser.locStart(node), parser.locEnd(node)]) + } + for (const [key, value] of Object.entries(node)) { + if (key !== 'loc' && key !== 'range') { + visit(value) + } + } + } + visit(ast) + + const lines: Array = [] + let lineStart = 0 + for (const line of code.split('\n')) { + const isInTemplate = templateRanges.some( + ([start, end]) => start < lineStart && lineStart < end, + ) + if (line.trim() !== '' || isInTemplate) { + lines.push(line) + } + lineStart += line.length + 1 + } + return lines.join('\n') +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts b/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts index a027fac505..d47bc3972d 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts +++ b/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts @@ -5,6 +5,7 @@ import { generateFromAst, parseAst } from '@tanstack/router-utils' import path from 'pathe' import { describe, expect, test } from 'vitest' import { createHydrateCompilerPlugin } from '../../src/hydrate-when-transform' +import { formatSnapshot } from '../format-snapshot' const fixtureRoot = path.resolve(import.meta.dirname, './test-files') const errorRoot = path.resolve(import.meta.dirname, './error-files') @@ -13,8 +14,13 @@ function fixtureId(filename: string) { return path.join(fixtureRoot, filename) } -function normalizeSnapshotCode(code: string) { - return code.split(fixtureRoot).join('') +// Replace the fixture root before formatting so that line breaks do not +// depend on where the repository is checked out. +async function normalizeSnapshotCode(code: string, filename: string) { + return await formatSnapshot( + code.split(fixtureRoot).join(''), + filename, + ) } async function readFixture(filename: string) { @@ -136,7 +142,9 @@ describe('Hydrate compiler transform fixtures', async () => { const result = compile({ env: 'client', code, id }) await expect( - normalizeSnapshotCode(result?.code ?? 'no-transform'), + result + ? await normalizeSnapshotCode(result.code, filename) + : 'no-transform', ).toMatchFileSnapshot(`./snapshots/client/${filename}`) }) @@ -144,7 +152,9 @@ describe('Hydrate compiler transform fixtures', async () => { const result = compile({ env: 'server', code, id }) await expect( - normalizeSnapshotCode(result?.code ?? 'no-transform'), + result + ? await normalizeSnapshotCode(result.code, filename) + : 'no-transform', ).toMatchFileSnapshot(`./snapshots/server/${filename}`) }) }) @@ -225,7 +235,9 @@ describe('Hydrate compiler transform fixtures', async () => { }) await expect( - normalizeSnapshotCode(loaded?.code ?? 'no-virtual-module'), + loaded + ? await normalizeSnapshotCode(loaded.code, filename) + : 'no-virtual-module', ).toMatchFileSnapshot( `./snapshots/virtual/${filename}.${boundary.exportName}.tsx`, ) @@ -245,7 +257,9 @@ describe('Hydrate compiler transform fixtures', async () => { }) await expect( - normalizeSnapshotCode(nestedPass?.code ?? 'no-transform'), + nestedPass + ? await normalizeSnapshotCode(nestedPass.code, filename) + : 'no-transform', ).toMatchFileSnapshot(`./snapshots/virtual/${filename}.H0.client.tsx`) }) }) diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenBasic.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenBasic.tsx index f1d2243d68..5f057addab 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenBasic.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenBasic.tsx @@ -1,18 +1,24 @@ -const _H = _lazyRouteComponent(() => import("/hydrateWhenBasic.tsx?tss-hydrate=0_3cf0187f82"), "H0"), - _H0_preload = _H.preload; -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { Hydrate } from '@tanstack/react-start'; -import { idle, visible } from '@tanstack/react-start/hydration'; -import { FallbackPane } from './widgets'; +const _H = _lazyRouteComponent( + () => import('/hydrateWhenBasic.tsx?tss-hydrate=0_3cf0187f82'), + 'H0', + ), + _H0_preload = _H.preload +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { Hydrate } from '@tanstack/react-start' +import { idle, visible } from '@tanstack/react-start/hydration' +import { FallbackPane } from './widgets' export function Page() { - return
- } h="0_3cf0187f82" p={_H0_preload}> -{<_H />} - -
; -} \ No newline at end of file + return ( +
+ } + h="0_3cf0187f82" + p={_H0_preload} + > + {<_H />} + +
+ ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenMultiple.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenMultiple.tsx index 73070a4fe1..34203df6ad 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenMultiple.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenMultiple.tsx @@ -1,19 +1,33 @@ -const _H3 = _lazyRouteComponent(() => import("/hydrateWhenMultiple.tsx?tss-hydrate=2_21aa371e0f"), "H2"); -const _H2 = _lazyRouteComponent(() => import("/hydrateWhenMultiple.tsx?tss-hydrate=1_21aa371e0f"), "H1"); -const _H = _lazyRouteComponent(() => import("/hydrateWhenMultiple.tsx?tss-hydrate=0_21aa371e0f"), "H0"); -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { Hydrate } from '@tanstack/react-start'; -import { load, media, visible } from '@tanstack/react-start/hydration'; +const _H3 = _lazyRouteComponent( + () => + import('/hydrateWhenMultiple.tsx?tss-hydrate=2_21aa371e0f'), + 'H2', +) +const _H2 = _lazyRouteComponent( + () => + import('/hydrateWhenMultiple.tsx?tss-hydrate=1_21aa371e0f'), + 'H1', +) +const _H = _lazyRouteComponent( + () => + import('/hydrateWhenMultiple.tsx?tss-hydrate=0_21aa371e0f'), + 'H0', +) +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { Hydrate } from '@tanstack/react-start' +import { load, media, visible } from '@tanstack/react-start/hydration' export function Page() { - return <> + return ( + <> -{<_H />} - + {<_H />} + -{<_H2 />} - + {<_H2 />} + -{<_H3 />} - - ; -} \ No newline at end of file + {<_H3 />} + + + ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNested.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNested.tsx index 70fe4ce862..adec83789c 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNested.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNested.tsx @@ -1,16 +1,24 @@ -const _H2 = _lazyRouteComponent(() => import("/hydrateWhenNested.tsx?tss-hydrate=2_466696e41d"), "H2"); -const _H = _lazyRouteComponent(() => import("/hydrateWhenNested.tsx?tss-hydrate=0_466696e41d"), "H0"); -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { Hydrate } from '@tanstack/react-start'; -import { idle, visible } from '@tanstack/react-start/hydration'; -const unused = 'remove me from virtual modules'; +const _H2 = _lazyRouteComponent( + () => import('/hydrateWhenNested.tsx?tss-hydrate=2_466696e41d'), + 'H2', +) +const _H = _lazyRouteComponent( + () => import('/hydrateWhenNested.tsx?tss-hydrate=0_466696e41d'), + 'H0', +) +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { Hydrate } from '@tanstack/react-start' +import { idle, visible } from '@tanstack/react-start/hydration' +const unused = 'remove me from virtual modules' export function Page() { - return <> + return ( + <> -{<_H />} - + {<_H />} + -{<_H2 />} - - ; -} \ No newline at end of file + {<_H2 />} + + + ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNever.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNever.tsx index 4d135f70f4..c2af676fa4 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNever.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNever.tsx @@ -1,9 +1,14 @@ -const _H = _lazyRouteComponent(() => import("/hydrateWhenNever.tsx?tss-hydrate=0_b752509d76"), "H0"); -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { Hydrate } from '@tanstack/react-start'; -import { never } from '@tanstack/react-start/hydration'; +const _H = _lazyRouteComponent( + () => import('/hydrateWhenNever.tsx?tss-hydrate=0_b752509d76'), + 'H0', +) +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { Hydrate } from '@tanstack/react-start' +import { never } from '@tanstack/react-start/hydration' export function Page() { - return -{<_H />} -; -} \ No newline at end of file + return ( + + {<_H />} + + ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenObjectFallback.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenObjectFallback.tsx index 1fc3dc39a9..a0353594f2 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenObjectFallback.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenObjectFallback.tsx @@ -1,26 +1,47 @@ -const _H3 = _lazyRouteComponent(() => import("/hydrateWhenObjectFallback.tsx?tss-hydrate=2_7f4dc3aa80"), "H2"); -const _H2 = _lazyRouteComponent(() => import("/hydrateWhenObjectFallback.tsx?tss-hydrate=1_7f4dc3aa80"), "H1"); -const _H = _lazyRouteComponent(() => import("/hydrateWhenObjectFallback.tsx?tss-hydrate=0_7f4dc3aa80"), "H0"); -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { Hydrate } from '@tanstack/react-start'; -import { idle, visible } from '@tanstack/react-start/hydration'; +const _H3 = _lazyRouteComponent( + () => + import('/hydrateWhenObjectFallback.tsx?tss-hydrate=2_7f4dc3aa80'), + 'H2', +) +const _H2 = _lazyRouteComponent( + () => + import('/hydrateWhenObjectFallback.tsx?tss-hydrate=1_7f4dc3aa80'), + 'H1', +) +const _H = _lazyRouteComponent( + () => + import('/hydrateWhenObjectFallback.tsx?tss-hydrate=0_7f4dc3aa80'), + 'H0', +) +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { Hydrate } from '@tanstack/react-start' +import { idle, visible } from '@tanstack/react-start/hydration' const spreadProps = { when: visible(), - fallback:
Bound
-}; + fallback:
Bound
, +} export function Page() { - return <> - Direct
} h="0_7f4dc3aa80"> -{<_H />} - - Inline
- }} h="1_7f4dc3aa80"> -{<_H2 />} - + return ( + <> + Direct
} + h="0_7f4dc3aa80" + > + {<_H />} + + Inline
, + }} + h="1_7f4dc3aa80" + > + {<_H2 />} +
-{<_H3 />} - - ; -} \ No newline at end of file + {<_H3 />} + + + ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenPrefetchState.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenPrefetchState.tsx index 56bc8896ce..05028ec03b 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenPrefetchState.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenPrefetchState.tsx @@ -1,19 +1,30 @@ -const _H = _lazyRouteComponent(() => import("/hydrateWhenPrefetchState.tsx?tss-hydrate=0_24b5f958eb"), "H0"), - _H0_preload = _H.preload; -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { useState } from 'react'; -import { Hydrate } from '@tanstack/react-start'; -import { interaction } from '@tanstack/react-start/hydration'; +const _H = _lazyRouteComponent( + () => + import('/hydrateWhenPrefetchState.tsx?tss-hydrate=0_24b5f958eb'), + 'H0', + ), + _H0_preload = _H.preload +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { useState } from 'react' +import { Hydrate } from '@tanstack/react-start' +import { interaction } from '@tanstack/react-start/hydration' export function Page() { - const [status, setStatus] = useState('idle'); - const [, setUnusedStatus] = useState('idle'); - return
+ const [status, setStatus] = useState('idle') + const [, setUnusedStatus] = useState('idle') + return ( +

{status}

- { - setStatus('prefetched'); - setUnusedStatus('prefetched'); - }} h="0_24b5f958eb" p={_H0_preload}> -{<_H />} - -
; -} \ No newline at end of file + { + setStatus('prefetched') + setUnusedStatus('prefetched') + }} + h="0_24b5f958eb" + p={_H0_preload} + > + {<_H />} + +
+ ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenRenamed.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenRenamed.tsx index 13b86d4d5d..509b2b988b 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenRenamed.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenRenamed.tsx @@ -1,11 +1,14 @@ -const _H = _lazyRouteComponent(() => import("/hydrateWhenRenamed.tsx?tss-hydrate=0_f555ef3ac2"), "H0"); -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { Hydrate as HW } from '@tanstack/react-start'; -import { interaction } from '@tanstack/react-start/hydration'; +const _H = _lazyRouteComponent( + () => import('/hydrateWhenRenamed.tsx?tss-hydrate=0_f555ef3ac2'), + 'H0', +) +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { Hydrate as HW } from '@tanstack/react-start' +import { interaction } from '@tanstack/react-start/hydration' export function Page() { - return -{<_H />} -; -} \ No newline at end of file + return ( + + {<_H />} + + ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenBasic.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenBasic.tsx index 8bcf4099ca..71896aa304 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenBasic.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenBasic.tsx @@ -1,17 +1,18 @@ -import { Hydrate } from '@tanstack/react-start'; -import { idle, visible } from '@tanstack/react-start/hydration'; -import { Chart } from './widgets'; -import { formatValue } from './format'; -const chartTitle = formatValue('Revenue'); +import { Hydrate } from '@tanstack/react-start' +import { idle, visible } from '@tanstack/react-start/hydration' +import { Chart } from './widgets' +import { formatValue } from './format' +const chartTitle = formatValue('Revenue') export function Page() { - return
- + return ( +
+ -
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenMultiple.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenMultiple.tsx index 6959b25b3e..92bb4f9a26 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenMultiple.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenMultiple.tsx @@ -1,16 +1,17 @@ -import { Hydrate } from '@tanstack/react-start'; -import { load, media, visible } from '@tanstack/react-start/hydration'; +import { Hydrate } from '@tanstack/react-start' +import { load, media, visible } from '@tanstack/react-start/hydration' function Summary() { - return
Summary
; + return
Summary
} function Comments() { - return
Comments
; + return
Comments
} function Footer() { - return
Footer
; + return
Footer
} export function Page() { - return <> + return ( + <> @@ -20,5 +21,6 @@ export function Page() {